updated pot file

49 files changed, 27655 insertions, 25498 deletions

diff --git a/po/af.po b/po/af.po
index d9ee8ece..df374956 100644
--- a/po/af.po
+++ b/po/af.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: Fri May 19 2000 13:02:12+0200\n"
 "Last-Translator: Schalk W. Cronjé <schalkc@ntaba.co.za>\n"
 "Language-Team: Afrikaans <mandrake@af.org.za>\n"
@@ -24,27 +24,31 @@ msgid ""
 "You requested installation of package $rpm\n"
 msgstr ""
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Is dit aanvaarbaar?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "OK"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "JjYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (J/n) "
 
@@ -52,618 +56,704 @@ msgstr " (J/n) "
 msgid "$rpm: command not found\n"
 msgstr ""
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr ""
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr ""
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr ""
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "geen pakket het die naam %s nie\n"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "RPM-databasisnavraag het misluk\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "%s word installeer\n"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (J/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, c-format
-msgid "examining synthesis file [%s]"
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "%s word installeer\n"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Slegs een van die volgende pakkette word benodig:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Druk ENTER wanneer u reg is..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr ""
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:1421
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
-msgid "unable to analyse synthesis data of %s"
+msgid "read synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Wat is u keuse (1-%d)"
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "unable to build hdlist: %s"
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Jammer, swak keuse, probeer weer\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unknown data associated with %s"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr ""
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "Alles is alreeds installeer"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Slegs een van die volgende pakkette word benodig:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Installasie het misluk"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Die volgende pakket bevat %s: %s\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:121
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
-#, c-format
-msgid "selecting %s using obsoletes"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr ""
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "Alles is alreeds installeer"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"How afhanklikhede te bevredig, moet die volgende pakkette installeer word (%"
+"d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Slegs een van die volgende pakkette word benodig:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Installasie het misluk"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -672,259 +762,247 @@ msgstr ""
 "How afhanklikhede te bevredig, moet die volgende pakkette installeer word (%"
 "d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr ""
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Wat is u keuse (1-%d)"
-
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Jammer, swak keuse, probeer weer\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "%s word installeer\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Sit asb. die %s getiteld %s in"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr ""
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Die volgende pakket bevat %s: %s\n"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Druk ENTER wanneer u reg is..."
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr ""
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Slegs een van die volgende pakkette word benodig:"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
-#, c-format
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:187
-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"
-"and [options] are from\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
-#: urpmi.addmedia:57
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:211 po/placeholder.h:313
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:296
 #, c-format
 msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:217
+#: po/placeholder.h:348
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:218
+#: po/placeholder.h:359
+#, c-format
 msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
 msgstr ""
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: po/placeholder.h:234
+#: po/placeholder.h:383
 msgid ""
-"  -d             - force complete computation of depslist.ordered file.\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"
+"and [options] are from\n"
 msgstr ""
 
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
+#: urpmi.addmedia:57
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
+#: po/placeholder.h:401 urpmi.addmedia:82
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:408 urpmi.addmedia:84
+#, c-format
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -934,42 +1012,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1012,16 +1060,16 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr ""
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
 msgstr ""
 
 #: urpmq:34
@@ -1035,13 +1083,6 @@ msgstr ""
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "Jammer ek kon nie lêer %s kry nie, totsiens"
 
diff --git a/po/ar.po b/po/ar.po
index f5eaa6cc..a9375006 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-12-20 23:13GMT+3\n"
 "Last-Translator: Mohammed Gamal <f2c2001@yahoo.com>\n"
 "Language-Team: Arabic\n"
@@ -26,27 +26,31 @@ msgstr ""
 "التثبيت الآلي للحزم...\n"
 "لقد طلبت تثبيت الحزمة $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "هل أنت موا�ق؟"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "موا�ق"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "الغاء"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "لا"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "نعم"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (Ù„/Ù†)"
 
@@ -54,760 +58,916 @@ msgstr " (Ù„/Ù†)"
 msgid "$rpm: command not found\n"
 msgstr "$rpm: لم يتم ايجاد الأمر\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf الإصدار %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "حقوق النشر مح�وظة (C) 1999,2000,2001 MandrakeSoft"
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr "هذا برنامج حر و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL"
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "الإستخدام: urpmf [options] <file>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    line, incompatible with interactive mode)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - print all tags."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    command line but without package name)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - print tag group: group."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - print tag size: size."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - print tag serial: serial."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - print tag summary: summary."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   -print tag description: description."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr "  --provides      - print tag provides: all provides (multiple lines)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr "  --requires      - print tag requires: all requires (multiple lines)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files         - print tag files: all files (multiple lines)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "جرب urpmf --help لخيارات أكثر"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr "لم يتم ايجاد قائمة وسائط كاملة"
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "غير قادر على كتابة مل� الإعدادات [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr "جاري استرجاع مل�ات rpm..."
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  -v             - وضع ت�صيلي.\n"
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "جاري استخدام الجهاز الآخر القابل للإزالة [%s] لـ\"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "لم يمكن ايحاد مل� القوائم لـ\"%s\", تم تجاهل الوسيط"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "لا شئ للكتابة �ي مل� القوائم لـ \"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "لم يمكن ايحاد مل� القوائم لـ\"%s\", تم تجاهل الوسيط"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "لم يمكن تحليل مل� hdlist لـ \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "لا شئ تمت كتايته �ي مل� القوائم لـ \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      - اعطاء كل الحزم المصدرية قبل التنزيل (الحذر �قط).\n"
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr "  --auto-select  - اختر الحزم آليا لترقية النظام.\n"
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, fuzzy, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "جاري استرجاع مل� الوص�..."
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "لم يمكن الوصول الى مل� قائمة \"%s\", تم تجاهل الوسيط"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "لم يمكن ايجاد الحزمة %s"
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "جاري ازالة تجهيز %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "removing %d obsolete headers in cache"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "لم يمكن ايجاد مل� hdlist للوسيط \"%s\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr "الويسط \"%s\" يحاول اسنخدام مل� hdlist مستخدم مسبقا, تم تجاهل الوسيط"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "جاري قراءة مل� hdlist [%s]"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "لم يمكن استخدام الإسم \"%s\" لوسيط غير مسمى لأنه مستخدم بال�عل"
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "جاري محاولة ازالة الوسيط غير الموجود \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "جاري قراءة مل� hdlist [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "لم يمكن أخذ الوسيط \"%s\" �ي الحسبان لأنه لا يوجد مل� القوائم [%s]"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "جاري ح�ظ المل�ات المرتجعة �ي المعطيات �قط"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "لم يمكن بناء مل� التخليق للوسيط \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "found %d headers in cache"
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "جاري محاولة اختيار وسيط غير موجود \"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "امتنع عن اختيار %s بما أن لغة الإعداد المحلي الخاصة به غير مختارة"
+msgid "unable to update medium \"%s\"\n"
+msgstr "لم يمكن تحديث الوسيط \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"جاري ازالة %s للترقية الى %s ...\n"
-"  جيث أنه لن تتم الترقية بطريقة أخرى"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - clean headers cache directory.\n"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "الوسيط \"%s\" موجود مسبقا"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "غير قادر على كتابة مل� القوائم لـ \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "اكتب مل� التهيئة [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  الأسماء أو مل�ات rpm المعطاة على سطر الأوامر يتم الاستعلام عنها.\n"
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "لا توجد حزمة بالإسم %s"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "حاول التثبيت بشكل أقوى (--force)؟ (y[نعم]/N[لا])."
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "لم يمكن ايجاد مل� hdlist لـ \"%s\", تم تجاهل الوسيط"
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "تم بناء مل� تخليق hdlist للوسيط \"%s\""
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "لم يمكن بناء مل� التخليق للوسيط \"%s\""
+msgid " (y/N) "
+msgstr " (Ù„/Ù†)"
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "لم يمكن ايجاد مل� hdlist لـ \"%s\", تم تجاهل الوسيط"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - اختر كل التطابقات على سطر الأوامر.\n"
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"بعض الحزم تحتاج الى أن ت�زال لكي يتم ترقيتها, هذا لا يزال غير مدعوم حتى الآن\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "جاري تجهيز %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "جاري قراءة مل� التخليق [%s]"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - قم بالإجبار على توليد مل�ات hdlist.\n"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget �شل: تم الخروج بـ%d أو الإشارة %d\n"
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "لم يمكن استرجاع اسم المسار للويط القابل للإزالة \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "لا شء للإزالة (استخدم urpmi.addmedia لإضا�ة وسيط)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "ادخال مشوه: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr "  -u             - ازالة الحزمة اذا كانت نسخة أ�ضل مثبتة مسبقا.\n"
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "هناك حزم متعددة بن�س اسم مل� rpm \"%s\""
+msgid "One of the following packages is needed to install %s:"
+msgstr "واحد من هذه الحدم ي�حتاج اليه لتثبيت %s:"
 
-#: po/placeholder.h:74
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "اضغط Enter عند الانتهاء..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr "الوسيط \"%s\" يحاول استخدام قائمة مستخدمة مسبقا, تم تجاهل الوسيط"
 
-#: po/placeholder.h:76
-#, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "جاري استرجاع مل�ات rpm..."
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr "  -h             - تطبع رسالة المساعدة هذه.\n"
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "لم يمكن الوصول الى مل� hdlist لـ\"%s\", تم تجاهل الوسيط"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr "  -g             - تطبع المجموعات أيضا مع الأسماء.\n"
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "لم يمكن تسجيل مل� rpm"
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - اختر كل الوسائط غير القابلة للإزالة.\n"
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "لم يمكن الت�تيش عن مل� قائمة \"%s\", تم تجاهل الوسيط"
-
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "نقاط تجهيز كثيرة جدا للوسيط القابل للإزالة \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+#, fuzzy
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  -f             - قم بالإجبار على توليد مل�ات hdlist.\n"
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr ""
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
+msgstr "  -r             - تطبع الإصدار و رقمه أيضا مع الإسم.\n"
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - اعرض معلومات الإصدار و البرنامج مع الإسم.\n"
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "�شل نسخ [%s]"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr "  --auto         - قم باختيار حزمة جيدة �ي الاختيارات.\n"
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "لم يمكن تحليل [%s] بشكل صحيح"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "لا شئ للتحديث (استخدم urpmi.addmedia لإضا�ة وسيط)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
 msgid "read synthesis file [%s]"
 msgstr "اقرأ مل� التخليق [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "لم يمكن تحليل بيانات التخليق لـ %s"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 #, fuzzy
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "لم يمكن ايجاد وسيلة لتنزيل المل�ات (curl أو wget مثلا)\n"
 
-#: po/placeholder.h:89
-#, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "جاري استرجاع hdlist )أو مل� تخليق( المصدر..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
+msgstr ""
+"  -c             - choose complete method for resolving requires closure.\n"
 
-#: po/placeholder.h:90
-#, fuzzy
-msgid "...copying done"
-msgstr "...تم الاسترجاع"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "لم يمكن عمل الوسيط \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, fuzzy, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "جاري استرجاع hdlist )أو مل� تخليق( المصدر..."
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "جاري قراءة مل� hdlist [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "خطأ تركيبي �ي مل� التهيئة عند السطر %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: خيار غير معرو� \"-%s\", تحقق من طريقة الاستخدام بالخيار --help\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "الإستخدام: urpmi.removemedia [-a] <name> ..."
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "جاري بناء hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "لم يمكن قراءة مل� rpm [%s] من الوسيط \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+#, fuzzy
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr "  --update       - قم بتحديث الوسائط �قط.\n"
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "لم يمكن قراءة مل� rpm [%s] من الوسيط \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 #, fuzzy
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "جاري استرجاع hdlist )أو مل� تخليق( المصدر..."
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "خطأ �ي تسجيل الحزم المحلية"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "جاري أخذ الأجهزة القابلة للإزالة كـ\"%s\""
-
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...�شل الإسترجاع: %s"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "incoherent medium \"%s\" marked removable but not really"
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "جاري استرجاع مل� الوص�..."
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "لم يمكن بناء hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "الوسيط \"%s\" غير مختار"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "اسم مل� rpm yير موجود [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "بيانات غير معرو�ة مرتبطة مع %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "trying to bypass existing medium \"%s\", avoiding"
+msgid "What is your choice? (1-%d) "
+msgstr "ما هو اختيارك؟ (1-%d)"
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "لم يمكن الوصول الى مل� قائمة \"%s\", تم تجاهل الوسيط"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - استخدم wget لتنزيل المل�ات .\n"
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "امتنع عن اختيار %s لأنه لا توجد مل�ات كا�ية ست�حدّث"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "لم يمكن الوصول الى مل� rpm [%s]"
 
-#: po/placeholder.h:111
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "المعذرة, اختيار سئ, حاول مرة أخرى\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"جاري ازالة %s للترقية الى %s ...\n"
-"  يم أن الترقية لن تتم بشكل صحيح!"
+msgid "unable to access medium \"%s\""
+msgstr "لم يمكن الوصول الى الوسيط \"%s\""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "تم اعدة %s مدخل �ي depslist"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - استخدم curl لتنزيل المل�ات.\n"
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "لم يمكن الوصول الى الوسيط \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "جاري محاولة اختيار وسيط غير موجود \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr "لم يمكن تحليل [%s] بشكل صحيح على القيمة \"%s\""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "جاري محاولة اختيار وسيط غير موجود \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "لم ي�عثر على مل�ات rpm من [%s]"
+
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr "curl غير موجود\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "الحزم التالية تحتوي على %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "لم يمكن التعر� على الوسيط الخاص بمل� hdlist هذا [%s]"
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - تطبع رسالة المساعدة هذه.\n"
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "كل شئ مثبت مسبقا"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr "جاري استرجاع مل�ات rpm..."
 
-#: po/placeholder.h:120
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "لم ي�عثر على مل�ات rpm من [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "جاري استخدام الجهاز الآخر القابل للإزالة [%s] لـ\"%s\""
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "جاري قراءة مل� hdlist [%s]"
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "أحد الحزم التالية ي�حتاج اليه:"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
-msgstr "لم يتم اعادة مداخل �ي depslist"
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
-msgstr "...تم الاسترجاع"
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: لم يمكن ايجاد مل� rpm \"%s\"\n"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "�شل التثبيت"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr "لم يمكن الوصول الى مل� قائمة \"%s\", تم تجاهل الوسيط"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -p             - السماح بالبحث �ي المعطيات ليجاد حزمة.\n"
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "selecting %s using obsoletes"
+msgid "unmounting %s"
+msgstr "جاري ازالة تجهيز %s"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "�شل curl: تم الخروج بـ %d أو الإشارة %d\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "removing %d obsolete headers in cache"
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "selecting %s by selection on files"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "لم يمكن ايجاد مل� hdlist للوسيط \"%s\""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
-msgstr "curl غير موجود\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - وضع ت�صيلي.\n"
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "جاري استرجاع hdlist )أو مل� تخليق( المصدر..."
+msgid "removing medium \"%s\""
+msgstr "جاري محاولة ازالة الوسيط غير الموجود \"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr "wget غير موجود\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "لم يمكن بناء مل� التخليق للوسيط \"%s\""
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "جاري محاولة اختيار وسيط غير موجود \"%s\""
+
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - اختر كل الوسائط غير القابلة للإزالة.\n"
+
+#: po/placeholder.h:145 po/placeholder.h:354
+#, fuzzy
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr "  الأسماء أو مل�ات rpm المعطاة على سطر الأوامر يتم الاستعلام عنها.\n"
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "لم يمكن التعر� على الوسيط الخاص بمل� hdlist هذا [%s]"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "امتنع عن اختيار %s بما أن لغة الإعداد المحلي الخاصة به غير مختارة"
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - تطبع رسالة المساعدة هذه.\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "كل شئ مثبت مسبقا"
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "اكتب مل� التهيئة [%s]"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "لم يمكن بناء مل� التخليق للوسيط \"%s\""
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "جاري قراءة مل� التخليق [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "لم يمكن استرجاع اسم المسار للويط القابل للإزالة \"%s\""
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "هناك حزم متعددة بن�س اسم مل� rpm \"%s\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "لإرضاء الاعتمادات, سيتم تثبيت الحزم التالية )%d ميغابايت("
+
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "جاري استرجاع مل�ات rpm..."
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi: خيار غير معلوم \"-%s\", تحقَّق من طريقة الإستخدام بـ --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  -v             - وضع ت�صيلي.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "لم يمكن الوصول الى مل� hdlist لـ\"%s\", تم تجاهل الوسيط"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "أحد الحزم التالية ي�حتاج اليه:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "لم يمكن تسجيل مل� rpm"
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "لم يمكن الت�تيش عن مل� قائمة \"%s\", تم تجاهل الوسيط"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "نقاط تجهيز كثيرة جدا للوسيط القابل للإزالة \"%s\""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "incoherent list file for \"%s\", medium ignored"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - قم بتحديث الوسائط �قط.\n"
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-"لقد �شل التثبيت, بعض المل�ات غير موجودة.\n"
-"ربما تريد نحديث �اعدة بيانات urpmi الخاصة بك"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "�شل نسخ [%s]"
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
-msgstr "  --auto         - قم باختيار حزمة جيدة �ي الاختيارات.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - تمديد الاستعلام حتى اعتمادات الحزم.\n"
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "�شل التثبيت"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "لم يمكن تحليل بيانات التخليق لـ %s"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
-msgstr "  --auto-select  - اختر الحزم آليا لترقية النظام.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, fuzzy, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "جاري استرجاع hdlist )أو مل� تخليق( المصدر..."
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - استخدم الواجهة الرسومية.\n"
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+#, fuzzy
+msgid "...copying done"
+msgstr "...تم الاسترجاع"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "لإرضاء الاعتمادات, سيتم تثبيت الحزم التالية )%d ميغابايت("
 
-#: po/placeholder.h:149 po/placeholder.h:273
+#: po/placeholder.h:180 po/placeholder.h:277
 #, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -p             - السماح بالبحث �ي المعطيات ليجاد حزمة.\n"
+msgid "copying hdlists file..."
+msgstr "جاري قراءة مل� hdlist [%s]"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "خطأ تركيبي �ي مل� التهيئة عند السطر %s"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "محاولة التثبيت دون التأكد من الاعتمادات؟ (y[نعم]/N[لا])"
 
-#: po/placeholder.h:151 po/placeholder.h:278
-#, fuzzy
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr "  --update       - قم بتحديث الوسائط �قط.\n"
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - اختر أ�ضل واجهة تبعا لبيئة العمل:\n"
-"                   واجهة رسومية أو نصية.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "خطأ �ي تسجيل الحزم المحلية"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - وضع ت�صيلي.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "جاري أخذ الأجهزة القابلة للإزالة كـ\"%s\""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - السماح بالبحث �ي المعطيات ليجاد حزمة.\n"
 
-#: po/placeholder.h:158
-#, fuzzy
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr "  الأسماء أو مل�ات rpm المعطاة على سطر الأوامر يتم الاستعلام عنها.\n"
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - وضع هادئ.\n"
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "جاري استرجاع مل� الوص�..."
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "ما هو اختيارك؟ (1-%d)"
+msgid "unable to build hdlist: %s"
+msgstr "لم يمكن بناء hdlist: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - استخدم wget لتنزيل المل�ات .\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "الوسيط \"%s\" غير مختار"
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"urpmi الإصدار %s\n"
-" جميع الحقوق مح�وظة 1999, 2000, 2001 MandrakeSoft.\n"
-" هذا برنامج حر ومجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
-"الاستخدام:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "trying to bypass existing medium \"%s\", avoiding"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "حاول التثبيت بشكل أقوى (--force)؟ (y[نعم]/N[لا])."
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - وضع هادئ.\n"
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - قم بالتثبيت اجباريا حتى لو لم تكن بعض الحزم موجودة.\n"
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "المعذرة, اختيار سئ, حاول مرة أخرى\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - اختر كل التطابقات على سطر الأوامر.\n"
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - استخدم curl لتنزيل المل�ات.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "جاري تثبيت %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "يرجى ادخال الوسيط \"%s\" �ي الجهاز [%s]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "الحزم التالية تحتوي على %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "جاري قراءة مل� hdlist [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr "لم يتم اعادة مداخل �ي depslist"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+#, fuzzy
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - قم بتحديث الوسائط �قط.\n"
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "لم يمكن الحصول على الحزمة المصدرية, جاري الإنهاء"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "اضغط Enter عند الانتهاء..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr "...تم الاسترجاع"
+
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "selecting %s using obsoletes"
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "�شل curl: تم الخروج بـ %d أو الإشارة %d\n"
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "selecting %s by selection on files"
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "جاري استرجاع hdlist )أو مل� تخليق( المصدر..."
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 msgid "Only superuser is allowed to install packages"
 msgstr "المستخدم الجذر �قط مسموح له بتثبيت الحزم"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr "wget غير موجود\n"
+
+#: po/placeholder.h:240
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "واحد من هذه الحدم ي�حتاج اليه لتثبيت %s:"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"جاري ازالة %s للترقية الى %s ...\n"
+"  جيث أنه لن تتم الترقية بطريقة أخرى"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"جاري ازالة %s للترقية الى %s ...\n"
+"  يم أن الترقية لن تتم بشكل صحيح!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+"لقد �شل التثبيت, بعض المل�ات غير موجودة.\n"
+"ربما تريد نحديث �اعدة بيانات urpmi الخاصة بك"
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+"  --best-output  - اختر أ�ضل واجهة تبعا لبيئة العمل:\n"
+"                   واجهة رسومية أو نصية.\n"
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"urpmi الإصدار %s\n"
+" جميع الحقوق مح�وظة 1999, 2000, 2001 MandrakeSoft.\n"
+" هذا برنامج حر ومجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
+"الاستخدام:\n"
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -816,7 +976,7 @@ msgstr ""
 "%s\n"
 "<relative path of hdlist> غير موجود\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -838,17 +998,7 @@ msgstr ""
 "       removable://<path>\n"
 "و [options] هم من\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "لم يمكن عمل الوسيط \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "لم يمكن تحديث الوسيط \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -858,11 +1008,7 @@ msgstr ""
 "\n"
 "خيارات غير معرو�ة '%s'\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - clean headers cache directory.\n"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -871,16 +1017,7 @@ msgstr ""
 "%s\n"
 "<relative path of hdlist> غير موجود\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - قم بالإجبار على توليد مل�ات hdlist.\n"
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  -f             - قم بالإجبار على توليد مل�ات hdlist.\n"
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -889,53 +1026,7 @@ msgstr ""
 "%s\n"
 "`with' غير موجود لوسائط ftp\n"
 
-#: po/placeholder.h:216
-#, fuzzy
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - قم بتحديث الوسائط �قط.\n"
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"الاستخدام: urpmi.update [options] <name> ...\n"
-"حيث أن <name> هو اسم الوسيط المطلوب تحديثه.\n"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"المدخل المطلوب تحديثه غير موجود\n"
-")واحد من %s(\n"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "لا شئ للتحديث (استخدم urpmi.addmedia لإضا�ة وسيط)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - اختر كل الوسائط غير القابلة للإزالة.\n"
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "لا شء للإزالة (استخدم urpmi.addmedia لإضا�ة وسيط)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -944,12 +1035,7 @@ msgstr ""
 "المدخل المطلوب ازالته غير موجود\n"
 ")واحد من %s(\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - اختر كل الوسائط غير القابلة للإزالة.\n"
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -958,32 +1044,24 @@ msgstr ""
 "الاستخدام: urpmi.update [options] <name> ...\n"
 "حيث أن <name> هو اسم الوسيط المطلوب تحديثه.\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr "  -h             - تطبع رسالة المساعدة هذه.\n"
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr "  -g             - تطبع المجموعات أيضا مع الأسماء.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"الاستخدام: urpmi.update [options] <name> ...\n"
+"حيث أن <name> هو اسم الوسيط المطلوب تحديثه.\n"
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: لم يمكن ايجاد مل� rpm \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  الأسماء أو مل�ات rpm المعطاة على سطر الأوامر يتم الاستعلام عنها.\n"
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr "  -r             - تطبع الإصدار و رقمه أيضا مع الإسم.\n"
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - اعرض معلومات الإصدار و البرنامج مع الإسم.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr ""
+"المدخل المطلوب تحديثه غير موجود\n"
+")واحد من %s(\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -997,35 +1075,7 @@ msgstr ""
 "هذا برنامج حر و مجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
 "الاستخدام:\n"
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - تمديد الاستعلام حتى اعتمادات الحزم.\n"
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - اعطاء كل الحزم المصدرية قبل التنزيل (الحذر �قط).\n"
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-"  -c             - choose complete method for resolving requires closure.\n"
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"بعض الحزم تحتاج الى أن ت�زال لكي يتم ترقيتها, هذا لا يزال غير مدعوم حتى الآن\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: خيار غير معرو� \"-%s\", تحقق من طريقة الاستخدام بالخيار --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
@@ -1033,11 +1083,6 @@ msgstr ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr "  -u             - ازالة الحزمة اذا كانت نسخة أ�ضل مثبتة مسبقا.\n"
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1081,17 +1126,17 @@ msgstr ") . _("
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "الاستخدام: urpmi.update [options] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "الإستخدام: urpmi.removemedia [-a] <name> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "الإستخدام: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "الاستخدام: urpmi.update [options] <name> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/az.po b/po/az.po
index f527dfaf..30e7fc66 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-11-14 17:06GMT+0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
@@ -26,27 +26,31 @@ msgstr ""
 "Paketlərin öz özünə qurulması...\n"
 "$rpm paketlərininin qurulmasını istədiniz\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Oldu mu?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Oldu"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Ləğv et"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "XxJjNn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "Bb"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (B/x) "
 
@@ -54,651 +58,744 @@ msgstr " (B/x) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: əmr tapılmadı\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf buraxılışı %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Təlif Haqqı (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "istifadə qaydası: [urpmf] <fayl>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - təq adlarını göstərmə (təq əmrə verilməyibsə əsasdır"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    sətir, qarşılıqlı moda uyğun deyil)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - bütün təqləri göstər."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - təq adını göstər: rpm fayladı (heç təq verilməyibsə"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    paket adsız əmr sətiri)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - təq qrupunu göstər: qrup."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - təq böyüklüyünü göstər: böyüklük."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - təq serialını göstər: serial."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - təq icmalını göstər: icmal."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - təq izahatını göstər: izahat."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 "  --provides      - təq gətirənini göstər: bütün gətirənlər (çoxlu sətir)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 "  --requires      - lazımlılar təqini göstər: bütün lazımlılar (çoxlu sətir)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 "  --files         - təq fayllarını göstər: bütün fayllar (çoxlu sətir)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --conflicts     - təq toqquşmalarını göstər: bütün toqquşmalar (çoxlu "
 "sətir)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - təq mütləqlərini göstər: bütün mütləqlər (çoxlu sətir)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 "  --prereqs       - təq ön lazımlılarını göstər: bütün ön lazımlılar (çoxlu "
 "sətir)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "daha təfsilatlı seçənəklər üçün urpmf --help sınayın"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "[%s] quraşdırma faylı yazıla bilmir"
 
-#: po/placeholder.h:30 urpm.pm:1892
-#, fuzzy
-msgid "retrieving rpms files..."
-msgstr "[%s] cəhd edilir"
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  --all           - bütün təqləri göstər."
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "\"%s\" üçün siyahı faylı tapıla bilmir, medya rədd edilir"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "\"%s\" üçün siyahı faylında bir şey yazmağa lüzum yoxdur"
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "\"%s\" üçün siyahı faylı tapıla bilmir, medya rədd edilir"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "\"%s\" hdlist faylı alına bilmir"
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, fuzzy, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "[%s] cəhd edilir"
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "\"%s\" siyahı faylına çatıla bilmədi, medya rədd edildi"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "%s paketi tapılmadı."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "%s ayrılır"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "ön yaddaşdakı %d mütləq başlıqlar çıxardılır"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "\"%s\" medyası hdlist faylı tapılmadı"
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 "\"%s\" medyası onsuz da istifadədə olan hdlist işlətməyə cəhd etdi, medya "
 "rədd edildi"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "[%s] hdlist faylı oxunur"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, 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"
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "mövcud olmayan \"%s\" medyası çıxardılmağa çalışılır"
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "[%s] hdlist faylı oxunur"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, 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"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "təkcə gətirənlərdə yad edilən fayllar saxlanılır"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "\"%s\" medyası sintezi inşa edilə bilmi"
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "ön yaddaşda %d başlıq tapıldı"
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "mövcud olmayan \"%s\" medyası seçilə bilmi"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "%s yerləşdirmə dili seçili olmadığı üçün seçilə bilmir"
+msgid "unable to update medium \"%s\"\n"
+msgstr " \"%s\" medyası güncəllənə bilmir\n"
 
-#: po/placeholder.h:55
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"düzgün aparıla bilməyəcəyindən %s\n"
-" %s olaraq güncəllənmək üçün çıxardılır!"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+#, fuzzy
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  --all           - bütün təqləri göstər."
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "\"%s\" medyası onsuz da vardır"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "\"%s\" fayl siyahısı yazıla bilmi"
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "[%s] quraşdırma faylı yazılır"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "%s adlı paket yoxdur"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "\"%s\" üçün hdlist faylı tapıla bilmir, medya rədd edildi"
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "bütün sintez faylları tapıla bilmir, daranmış hdlist işlədilir"
+msgid " (y/N) "
+msgstr " (B/x) "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "\"%s\" üçün hdlist faylı tapıla bilmir, medya rədd edildi"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"bə'zi paketlər güncəllənmək üçün çıxardılmalıdırlar, bu da hələlik "
+"dəstəklənmir\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "%s bağlanır"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, 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"
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "[%s] asılılıqlar siyahısı faylı oxundu"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+#, fuzzy
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --group         - təq qrupunu göstər: qrup."
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr " \"%s\" medyası yaradıla bilmir\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+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"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "xətalı giriş: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "\"%s\" rpm fayl adlı çoxlu fayl tapıldı"
+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:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Qurtardığında enter düyməsinə basın..."
 
-#: po/placeholder.h:74
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 "\"%s\" medyumu onsuz da istifadədə olan bir siyahını işlətməyə cəhd etdi, "
 "medya rədd edildi"
 
-#: po/placeholder.h:76
+#: po/placeholder.h:74 po/placeholder.h:448
 #, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "[%s] cəhd edilir"
+msgid "  -h             - print this help message.\n"
+msgstr "  --all           - bütün təqləri göstər."
 
-#: po/placeholder.h:77 urpm.pm:253
-#, 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"
+#: po/placeholder.h:75 po/placeholder.h:450
+#, fuzzy
+msgid "  -g             - print groups too with name.\n"
+msgstr "  --group         - təq qrupunu göstər: qrup."
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "rpm faylı qeyd edilə bilmir"
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  --all           - bütün təqləri göstər."
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "\"%s\" faylları siyahısı incələnə bilmir, medya rədd edildi"
+#: po/placeholder.h:78 po/placeholder.h:407
+#, fuzzy
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  --group         - təq qrupunu göstər: qrup."
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
+#: po/placeholder.h:79 po/placeholder.h:454
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr "                    paket adsız əmr sətiri)."
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "\"%s\" üçün inkoherent siyahı faylı, medya rədd edildi"
-
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "[%s] köçürülmə əməliyyatı bacarılmadı"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "[%s] düzgün olaraq darana bilmir"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+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"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "[%s] asılılıqlar siyahısı faylı oxundu"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "\"%s\" hdlist faylı alına bilmir"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-#, fuzzy
-msgid "...copying done"
-msgstr "[%s] cəhd edilir"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr " \"%s\" medyası yaradıla bilmir\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "[%s] hdlist faylı oxunur"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "quraşdırma faylında %s sətirində sintaksis xətası"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "istifadə qaydası: urpmi.removemedia [-a] <ad> ..."
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "[%s] hdlist faylı inşa edilir"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "\"%s\" medyasından [%s] rpm faylı oxuna bilmir"
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "yerli paket qeydiyyat xətası"
-
-#: po/placeholder.h:99
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "\"%s\" medyasından [%s] rpm faylı oxuna bilmir"
+
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "[%s] cəhd edilir"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "\"%s\" inkeherent medyası söküləbilən deyə bildirilib, amma deyil"
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "hdlist inÅŸa edilÉ™ bilmir: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "\"%s\" medyası seçili deyil"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "hökmsüz rpm fayı adı [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "%s ilə naməlum verilən qarşılaşdırılıb"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, 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 "What is your choice? (1-%d) "
+msgstr "Seçkiniz? (1-%d)"
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, 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"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "kifayət qədər fayl güncəllənməyəcəyi üçün %s seçilməsi imtina edildi"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm faylı [%s] çatıla bilmir"
 
-#: po/placeholder.h:111
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"düzgün aparıla bilməyəcəyindən %s\n"
-" %s olaraq güncəllənmək üçün çıxardılır!"
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "asılılıqlar siyahısında %s sahə yenidən yerləşdirildi"
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Xətalı seçənək, təkrar sınayın\n"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "\"%s\" medyasına çatıla bilmir"
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr "[%s] \"%s\" qiymətində düzgün darana bilmədi"
+msgid "relocated %s entries in depslist"
+msgstr "asılılıqlar siyahısında %s sahə yenidən yerləşdirildi"
+
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "mövcud olmayan \"%s\" medyası seçilə bilmi"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "[%s] \"%s\" qiymətində düzgün darana bilmədi"
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] üstündə rpm fayı tapıla bilmədi"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "[%s] hdlist faylı oxunur"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "bu [%s] hdlist faylı medyası tapıla bilmədi"
 
-#: po/placeholder.h:122 urpm.pm:1191
+#: po/placeholder.h:119 po/placeholder.h:328
 #, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "asılılıqlar siyahısında %s sahə yenidən yerləşdirildi"
+msgid "  --help         - print this help message.\n"
+msgstr "  --all           - bütün təqləri göstər."
 
-#: po/placeholder.h:123 urpm.pm:1897
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "hər şey artıq qurulmuşdur"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
 #, fuzzy
-msgid "...retrieving done"
+msgid "retrieving rpms files..."
 msgstr "[%s] cəhd edilir"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "%s mütləqlər işlədilərək seçilir"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Qurulum iflas etdi"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr "\"%s\" siyahı faylına çatıla bilmədi, medya rədd edildi"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  --group         - təq qrupunu göstər: qrup."
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "%s fayllar üstündə seçilərək seçilir"
+msgid "unmounting %s"
+msgstr "%s ayrılır"
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "ön yaddaşdakı %d mütləq başlıqlar çıxardılır"
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "\"%s\" medyası hdlist faylı tapılmadı"
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
+msgid "removing medium \"%s\""
+msgstr "mövcud olmayan \"%s\" medyası çıxardılmağa çalışılır"
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "\"%s\" medyası sintezi inşa edilə bilmi"
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "mövcud olmayan \"%s\" medyası seçilə bilmi"
+
+#: po/placeholder.h:144 po/placeholder.h:447
+#, fuzzy
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --all           - bütün təqləri göstər."
+
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "bu [%s] hdlist faylı medyası tapıla bilmədi"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "%s yerləşdirmə dili seçili olmadığı üçün seçilə bilmir"
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
 
-#: po/placeholder.h:132
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "[%s] quraşdırma faylı yazılır"
+
+#: po/placeholder.h:150 po/placeholder.h:249
 #, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr "  --all           - bütün təqləri göstər."
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "bütün sintez faylları tapıla bilmir, daranmış hdlist işlədilir"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "hər şey artıq qurulmuşdur"
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, 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"
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "[%s] asılılıqlar siyahısı faylı oxundu"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr " \"%s\" medyası yaradıla bilmir\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "\"%s\" rpm fayl adlı çoxlu fayl tapıldı"
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər də qurulmalıdır (%d Mb)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "[%s] cəhd edilir"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 "urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  --all           - bütün təqləri göstər."
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, 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"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "rpm faylı qeyd edilə bilmir"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "\"%s\" faylları siyahısı incələnə bilmir, medya rədd edildi"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "\"%s\" üçün inkoherent siyahı faylı, medya rədd edildi"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Qurulum iflas etdi"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "[%s] köçürülmə əməliyyatı bacarılmadı"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+#, fuzzy
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "                    paket adsız əmr sətiri)."
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "\"%s\" hdlist faylı alına bilmir"
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr "  --all           - bütün təqləri göstər."
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+#, fuzzy
+msgid "...copying done"
+msgstr "[%s] cəhd edilir"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -706,116 +803,189 @@ msgid ""
 msgstr ""
 "Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər də qurulmalıdır (%d Mb)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
+#: po/placeholder.h:180 po/placeholder.h:277
 #, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  --group         - təq qrupunu göstər: qrup."
+msgid "copying hdlists file..."
+msgstr "[%s] hdlist faylı oxunur"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "quraşdırma faylında %s sətirində sintaksis xətası"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 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) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "yerli paket qeydiyyat xətası"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
+
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
+msgstr "hdlist inÅŸa edilÉ™ bilmir: %s"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "\"%s\" medyası seçili deyil"
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "mövcud medya \"%s\" yan keçilməyə çalışıldı, imtina edirəm"
 
-#: po/placeholder.h:159
+#: po/placeholder.h:191 po/placeholder.h:355
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "  --all           - bütün təqləri göstər."
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Seçkiniz? (1-%d)"
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "%s qurulur\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
 #, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
+msgid "examining hdlist file [%s]"
+msgstr "[%s] hdlist faylı oxunur"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "asılılıqlar siyahısında %s sahə yenidən yerləşdirildi"
 
-#: po/placeholder.h:171 po/placeholder.h:269
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Xətalı seçənək, təkrar sınayın\n"
+#: po/placeholder.h:205 po/placeholder.h:445
+#, fuzzy
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  --group         - təq qrupunu göstər: qrup."
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "qaynaq paketi alına bilmir, çıxılır"
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+#, fuzzy
+msgid "...retrieving done"
+msgstr "[%s] cəhd edilir"
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "installing %s\n"
-msgstr "%s qurulur\n"
+msgid "selecting %s using obsoletes"
+msgstr "%s mütləqlər işlədilərək seçilir"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, 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 "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "qaynaq paketi alına bilmir, çıxılır"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "%s fayllar üstündə seçilərək seçilir"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Qurtardığında enter düyməsinə basın..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 "Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir"
 
-#: po/placeholder.h:182 urpmi:216
-#, 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:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"düzgün aparıla bilməyəcəyindən %s\n"
+" %s olaraq güncəllənmək üçün çıxardılır!"
+
+#: po/placeholder.h:296
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"düzgün aparıla bilməyəcəyindən %s\n"
+" %s olaraq güncəllənmək üçün çıxardılır!"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -824,7 +994,7 @@ msgstr ""
 "%s\n"
 "<hdlistin nisbi yolu> mövcud deyildir\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -845,17 +1015,7 @@ msgstr ""
 "      http://<verici>/<cığır> with <nisbi fayl adı və ya hdlist>\n"
 "      removable_<avadanlıq>://<cığır>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr " \"%s\" medyası yaradıla bilmir\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr " \"%s\" medyası güncəllənə bilmir\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -863,12 +1023,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  --all           - bütün təqləri göstər."
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -877,17 +1032,7 @@ msgstr ""
 "%s\n"
 "<hdlistin nisbi yolu> mövcud deyildir\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --group         - təq qrupunu göstər: qrup."
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  --group         - təq qrupunu göstər: qrup."
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -896,60 +1041,7 @@ msgstr ""
 "%s\n"
 "əksik ftp medyası ilə 'with'\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"istifadə qaydası urpmi.removemedia [-a] <ad> ...\n"
-" <ad> çıxardılacaq medya adı.\n"
-"   -a    medya seç.\n"
-"\n"
-"namə'lum seçənəklər '%s' \n"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, 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"
-
-#: po/placeholder.h:234
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  --group         - təq qrupunu göstər: qrup."
-
-#: po/placeholder.h:235 urpmi.update:57
-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"
-
-#: po/placeholder.h:236
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --all           - bütün təqləri göstər."
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-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"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -958,12 +1050,7 @@ msgstr ""
 "çıxardılacaq giriş mövcud deyildir\n"
 "(%s dan (dən) biri)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  --all           - bütün təqləri göstər."
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -975,35 +1062,28 @@ msgstr ""
 "\n"
 "namə'lum seçənəklər '%s' \n"
 
-#: po/placeholder.h:252
-#, fuzzy
-msgid "  -h             - print this help message.\n"
-msgstr "  --all           - bütün təqləri göstər."
-
-#: po/placeholder.h:254
+#: po/placeholder.h:429
 #, fuzzy
-msgid "  -g             - print groups too with name.\n"
-msgstr "  --group         - təq qrupunu göstər: qrup."
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"istifadə qaydası urpmi.removemedia [-a] <ad> ...\n"
+" <ad> çıxardılacaq medya adı.\n"
+"   -a    medya seç.\n"
+"\n"
+"namə'lum seçənəklər '%s' \n"
 
-#: po/placeholder.h:258
-#, fuzzy
-msgid "  -r             - print version and release too with name.\n"
-msgstr "                    paket adsız əmr sətiri)."
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, 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"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1013,46 +1093,12 @@ msgid ""
 "usage:\n"
 msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
 
-#: po/placeholder.h:266
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                    paket adsız əmr sətiri)."
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"bə'zi paketlər güncəllənmək üçün çıxardılmalıdırlar, bu da hələlik "
-"dəstəklənmir\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1096,18 +1142,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "istifadə qaydası: urpmi.update [-a] <ad> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "istifadə qaydası: urpmi.removemedia [-a] <ad> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "istifadə qaydası: urpmi.removemedia [-a] <ad> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "istifadə qaydası: urpmi.update [-a] <ad> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/bg.po b/po/bg.po
index d6b75612..1dd75640 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2000-01-30 17:59+0100\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team:  Bulgarian\n"
@@ -25,27 +25,31 @@ msgstr ""
 "Àâòîìàòè÷íà èíñòàëàöèÿ íà ïàêåòè ...\n"
 "Âèå ïîæåëàõòå èíñòàëàöèÿ íà ïàêåò $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Òîâà äîáðå ëè å"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Äîáðå"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Îòêàç"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "ÍíNn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "ÄäYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (Ä/í) "
 
@@ -53,619 +57,705 @@ msgstr " (Ä/í) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: êîìàíäàòà íå å íàìåðåíà\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr ""
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 #, fuzzy
 msgid "usage: urpmf [options] <file>"
 msgstr "íà÷èí íà èçïîëçâàíå: rpmf [<ôàéë>]"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr ""
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "íÿìà ïàêåò íàðå÷åí %s\n"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Îïèò çà èíñòàëèðàíå äàæå ïî-ñèëíî (--force)? (ä/Í) "
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "äîíàñÿíå,rpm áàçà äàííè,ïðîâàëåíî\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "èíñòàëèðàíå %s\n"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (Ä/í) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, c-format
-msgid "examining synthesis file [%s]"
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "èíñòàëèðàíå %s\n"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Åäèí îò òåçè ïàêåòè å íåîáõîäèì:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Íàòèñíåòå enter,êîãàòî ñòå ãîòîâè"
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr ""
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:1421
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
-msgid "unable to analyse synthesis data of %s"
+msgid "read synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"èçïîëçâàíå: urpmi [-h] [--auto] [--force] [-a] èìå_íà_ïàêåò "
+"[èìåíà_íà_ïàêåòè...]\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Êàêúâ å âàøèÿò èçáîð? (1-%d) "
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "unable to build hdlist: %s"
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Ñúæàëÿâàì,ëîø èçáîð, îïèòàéòå îòíîâî\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unknown data associated with %s"
+msgid "relocated %s entries in depslist"
+msgstr ""
+
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "âñè÷êî å èíñòàëèðàíî âå÷å"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Åäèí îò òåçè ïàêåòè å íåîáõîäèì:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Èíñòàëàöèÿòà ïðîâàëåíà"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr ""
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Òåçè ïàêåòè ñúäúðæàò %s: %s\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:121
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
-#, c-format
-msgid "selecting %s using obsoletes"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "âñè÷êî å èíñòàëèðàíî âå÷å"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Çà äà ñå çàïàçÿò çàâèñèìîñòèòå,òåçè ïàêåòè ùå áúäàò èíñòàëèðàíè (%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Åäèí îò òåçè ïàêåòè å íåîáõîäèì:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Èíñòàëàöèÿòà ïðîâàëåíà"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -673,259 +763,247 @@ msgid ""
 msgstr ""
 "Çà äà ñå çàïàçÿò çàâèñèìîñòèòå,òåçè ïàêåòè ùå áúäàò èíñòàëèðàíè (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr ""
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Îïèò çà èíñòàëèðàíå áåç ïðîâåðêà íà çàâèñèìîñòè? (ä/Í) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Êàêúâ å âàøèÿò èçáîð? (1-%d) "
-
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Îïèò çà èíñòàëèðàíå äàæå ïî-ñèëíî (--force)? (ä/Í) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Ñúæàëÿâàì,ëîø èçáîð, îïèòàéòå îòíîâî\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "èíñòàëèðàíå %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Ìîëÿ ñëîæåòå %s íàðå÷åí %s"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr ""
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Òåçè ïàêåòè ñúäúðæàò %s: %s\n"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Íàòèñíåòå enter,êîãàòî ñòå ãîòîâè"
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Ñàìî superuser-à èìà ïðàâîòî äà èíñòàëèðà ëîêàëíè ïàêåòè"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr ""
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Åäèí îò òåçè ïàêåòè å íåîáõîäèì:"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
-#, c-format
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:187
-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"
-"and [options] are from\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
-#: urpmi.addmedia:57
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:211 po/placeholder.h:313
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Ñàìî superuser-à èìà ïðàâîòî äà èíñòàëèðà ëîêàëíè ïàêåòè"
+
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:296
 #, c-format
 msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:217
+#: po/placeholder.h:348
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:218
+#: po/placeholder.h:359
+#, c-format
 msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
 msgstr ""
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: po/placeholder.h:234
+#: po/placeholder.h:383
 msgid ""
-"  -d             - force complete computation of depslist.ordered file.\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"
+"and [options] are from\n"
 msgstr ""
 
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
+#: urpmi.addmedia:57
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
+#: po/placeholder.h:401 urpmi.addmedia:82
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:408 urpmi.addmedia:84
+#, c-format
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -935,42 +1013,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1014,18 +1062,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "íà÷èí íà ïîëçâàíå: urpmi.addmedia [-a] <èìå> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr ""
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr ""
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "íà÷èí íà ïîëçâàíå: urpmi.addmedia [-a] <èìå> ..."
 
 #: urpmq:34
 #, c-format
@@ -1086,13 +1134,6 @@ msgstr ""
 #~ "  -q               - òèõ ðåæèì.\n"
 #~ "  -v               - øóìåí ðåæèì.\n"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "èçïîëçâàíå: urpmi [-h] [--auto] [--force] [-a] èìå_íà_ïàêåò "
-#~ "[èìåíà_íà_ïàêåòè...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "Ñúæàëÿâàì,íåìîãà äà íàìåðÿ ôàéë %s, èçëèçàì"
 
diff --git a/po/bs.po b/po/bs.po
index 7e432bdb..e27e7d72 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-09-19 13:34GMT\n"
 "Last-Translator: Amila Akagiæ <bono@lugbih.org>\n"
 "Language-Team: Bosnian <lokal-subscribe@lugbih.org>\n"
@@ -25,27 +25,31 @@ msgstr ""
 "Automatska instalacija paketa..\n"
 "Zahtjevali ste instalaciju paketa $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Je li u redu?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "U redu"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Odustani"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "DdYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (D/n) "
 
@@ -53,624 +57,709 @@ msgstr " (D/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: komanda nije pronaðena\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf verzija %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Autorska prava (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 "Ovo je slobodan software i mo¾e biti distribuiran pod uslovima GNU GPL-e."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "upotreba: urpmf [opcije] <datoteka>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "poku¹ajte urpmf --help za vi¹e opcija"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "nisam u moguænosti da zapi¹em konf. datoteku [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
+#: po/placeholder.h:30 po/placeholder.h:216
+msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:31
-msgid "examining whole urpmi database"
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, fuzzy, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, fuzzy, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "ne mogu update-irati medij \"%s\"\n"
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "ne mogu kreirati medij \"%s\"\n"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, fuzzy, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "ne mogu update-irati medij \"%s\"\n"
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "ne mogu kreirati medij \"%s\"\n"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr ""
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Poku¹aj instalaciju jo¹ jaèe (--force opcija)? (d/N) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "ne mogu update-irati medij \"%s\"\n"
+msgid " (y/N) "
+msgstr " (D/n) "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"neki paketi trebaju biti uklonjeni da bi mogli biti nadograðeni, ovo jo¹ "
+"nije podr¾ano\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, fuzzy, c-format
 msgid "mounting %s"
 msgstr "instaliram %s\n"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "ne mogu kreirati medij \"%s\"\n"
-
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne mogu kreirati medij \"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ni¹ta za uklanjanje (koristi urpmi.addmedia da doda¹ medij)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Jedan od sljedeæih paketa je potreban:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Pritisnite enter kada zavr¹i..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-#, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "ne mogu kreirati medij \"%s\"\n"
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "ne mogu kreirati medij \"%s\"\n"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, fuzzy, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ni¹ta za update (koriti urpmi.addmedia da doda¹ medij)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "ne mogu update-irati medij \"%s\"\n"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr ""
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "ne mogu kreirati medij \"%s\"\n"
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nepoznata opcija \"-$1\", provjeri upotrebu sa --help\n"
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
-msgstr ""
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "koristi: urpmi.removemedia [-a] <ime> ..."
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, fuzzy, c-format
 msgid "building hdlist [%s]"
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: po/placeholder.h:95 urpm.pm:1822
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
+
+#: po/placeholder.h:95 po/placeholder.h:281
+#, c-format
+msgid "added medium %s"
+msgstr ""
+
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, fuzzy, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: po/placeholder.h:96
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr ""
+
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
-msgid "added medium %s"
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
+#, c-format
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "What is your choice? (1-%d) "
+msgstr "Va¹ izbor je? (1-%d) "
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
+msgid "unable to access rpm file [%s]"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: po/placeholder.h:103
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "®ao mi je, lo¹ izbor, probaj kasnije\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, fuzzy, c-format
-msgid "unable to build hdlist: %s"
+msgid "unable to access medium \"%s\""
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
-#, c-format
-msgid "invalid rpm file name [%s]"
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:114 po/placeholder.h:303
+#, fuzzy, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "ne mogu kreirati medij \"%s\"\n"
+
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unknown data associated with %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
-#, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
-#, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ne mogu kreirati medij \"%s\"\n"
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
 
-#: po/placeholder.h:111
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "sve je veæ instalirano"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Jedan od sljedeæih paketa je potreban:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu proèitati rpm datoteku \"$_\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Instalacija nije uspjela"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "unmounting %s"
+msgstr ""
+
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr ""
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "removing medium \"%s\""
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:142 po/placeholder.h:236
 #, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Jedan od sljedeæih paketa je potreban:"
-
-#: po/placeholder.h:120
-#, c-format
-msgid "no rpm files found from [%s]"
-msgstr ""
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: po/placeholder.h:121
+#: po/placeholder.h:143 po/placeholder.h:238
 #, fuzzy, c-format
-msgid "examining hdlist file [%s]"
+msgid "trying to select multiple medium: %s"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "ne mogu update-irati medij \"%s\"\n"
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+
+#: po/placeholder.h:156 po/placeholder.h:254
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
+msgid "examining synthesis file [%s]"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr ""
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"Da bi zadovoljili dependencies, sljedeæi paketi æe biti instalirani (%d MB)"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "sve je veæ instalirano"
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: nepoznata opcija \"-$1\", provjeri upotrebu sa --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Jedan od sljedeæih paketa je potreban:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+#, fuzzy
+msgid "unable to register rpm file"
+msgstr "ne mogu kreirati medij \"%s\"\n"
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Instalacija nije uspjela"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -678,114 +767,181 @@ msgid ""
 msgstr ""
 "Da bi zadovoljili dependencies, sljedeæi paketi æe biti instalirani (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+#, fuzzy
+msgid "copying hdlists file..."
+msgstr "ne mogu kreirati medij \"%s\"\n"
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Poku¹aj instalaciju bez provjere dependencies? (d/N)"
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
-msgid "  -p             - allow search in provides to find package.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "ne mogu kreirati medij \"%s\"\n"
+
+#: po/placeholder.h:188 po/placeholder.h:288
+#, fuzzy, c-format
+msgid "unable to build hdlist: %s"
+msgstr "ne mogu update-irati medij \"%s\"\n"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:191 po/placeholder.h:355
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Va¹ izbor je? (1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "instaliram %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Molim ubacite medij sa imenom \"%s\" u ureðaj [%s]"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
 #, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "The following packages contain %s: %s"
+msgstr "Jedan od sljedeæih paketa je potreban:"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "ne mogu kreirati medij \"%s\"\n"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
 msgstr ""
-"Ovo je slobodan software i mo¾e biti distribuiran pod uslovima GNU GPL-e."
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Poku¹aj instalaciju jo¹ jaèe (--force opcija)? (d/N) "
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "®ao mi je, lo¹ izbor, probaj kasnije\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "ne mogu dobiti izvorni paket, prekidam"
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "installing %s\n"
-msgstr "instaliram %s\n"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Molim ubacite medij sa imenom \"%s\" u ureðaj [%s]"
-
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "ne mogu dobiti izvorni paket, prekidam"
+msgid "selecting %s by selection on files"
+msgstr ""
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Pritisnite enter kada zavr¹i..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "Jedino super korisnik (root) mo¾e instalirati lokalne pakete"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
 #, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Jedan od sljedeæih paketa je potreban:"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"Ovo je slobodan software i mo¾e biti distribuiran pod uslovima GNU GPL-e."
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -794,7 +950,7 @@ msgstr ""
 "%s\n"
 "<relativna putanja do datoteke hdlist> nedostaje\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -816,17 +972,7 @@ msgstr ""
 "       http://<host>/<path> with <relativnim nazivom datoteke hdlist>\n"
 "       removable_<ureðaj>://<putanja>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ne mogu kreirati medij \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ne mogu update-irati medij \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -834,11 +980,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -847,15 +989,7 @@ msgstr ""
 "%s\n"
 "<relativna putanja do datoteke hdlist> nedostaje\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -864,17 +998,28 @@ msgstr ""
 "%s\n"
 "`with' nedostaje za ftp medij\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"stavka za brisanje nedostaje\n"
+"(jedan od %s)\n"
 
-#: po/placeholder.h:217
+#: po/placeholder.h:425
+#, fuzzy
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"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"
+"   -a    izabrat æe sve medije.\n"
+"\n"
+"nepoznate opcije '%s'\n"
 
-#: po/placeholder.h:218
+#: po/placeholder.h:429
 #, fuzzy
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -886,7 +1031,7 @@ msgstr ""
 "\n"
 "nepoznate opcije '%s'\n"
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -895,74 +1040,7 @@ msgstr ""
 "stavka za update nedostaje\n"
 "(jedan od %s)\n"
 
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ni¹ta za update (koriti urpmi.addmedia da doda¹ medij)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ni¹ta za uklanjanje (koristi urpmi.addmedia da doda¹ medij)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
-#, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"stavka za brisanje nedostaje\n"
-"(jedan od %s)\n"
-
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
-#, fuzzy
-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"
-"   -a    izabrat æe sve medije.\n"
-"\n"
-"nepoznate opcije '%s'\n"
-
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:255 urpmq:90
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne mogu proèitati rpm datoteku \"$_\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -973,44 +1051,12 @@ msgid ""
 msgstr ""
 "Ovo je slobodan software i mo¾e biti distribuiran pod uslovima GNU GPL-e."
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"neki paketi trebaju biti uklonjeni da bi mogli biti nadograðeni, ovo jo¹ "
-"nije podr¾ano\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nepoznata opcija \"-$1\", provjeri upotrebu sa --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1055,19 +1101,19 @@ msgstr ""
 msgid ");"
 msgstr "));"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "koristi: urpmi.update [-a] <ime> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "koristi: urpmi.removemedia [-a] <ime> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 #, fuzzy
 msgid ", $_);"
 msgstr "), $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "koristi: urpmi.removemedia [-a] <ime> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "koristi: urpmi.update [-a] <ime> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/ca.po b/po/ca.po
index 7de8b8fe..34ade29b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-05-07 22:25+0200\n"
 "Last-Translator: Softcatalà <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <info@softcatala.org>\n"
@@ -25,27 +25,31 @@ msgstr ""
 "Instal·lació automàtica dels paquets...\n"
 "Heu demanat la instal·lació del paquet $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "És correcte?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "D'acord"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "SsYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (S/n) "
 
@@ -53,622 +57,712 @@ msgstr " (S/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: no s'ha trobat l'ordre\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, fuzzy, c-format
 msgid "urpmf version %s"
 msgstr "urpmi versió %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 #, fuzzy
 msgid "usage: urpmf [options] <file>"
 msgstr "sintaxi: rpmf [<fitxer>]"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "no es pot actualitzar el suport \"%s\"\n"
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "no es pot actualitzar el suport \"%s\"\n"
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr ""
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "no es pot crear el suport \"%s\"\n"
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, fuzzy, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "no es pot actualitzar el suport \"%s\"\n"
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "no es pot crear el suport \"%s\"\n"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "no es pot actualitzar el suport \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "no es pot crear el suport \"%s\"\n"
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "no hi cap paquet anomenat %s\n"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Voleu intentar la insta·lació encara amb més força (--force)? (s/N) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:64
-#, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "no es pot actualitzar el suport \"%s\"\n"
-
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "La consulta de la base de dades de l'rpm ha fallat\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "s'està instal·lant %s\n"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (S/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"s'han d'eliminar alguns paquets per poder actualitzar-los, això encara no es "
+"pot fer\n"
 
-#: po/placeholder.h:69
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "no es pot crear el suport \"%s\"\n"
+msgid "mounting %s"
+msgstr "s'està instal·lant %s\n"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr ""
+
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "no es pot crear el suport \"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"no hi ha res per eliminar (utilitzeu urpmi.addmedia per afegir un suport)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Cal un dels paquets següents:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Premeu Intro quan estigui fet..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "no es pot crear el suport \"%s\"\n"
-
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, fuzzy, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "no es pot actualitzar el suport \"%s\"\n"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"no hi ha res per actualitzar (utilitzeu urpmi.addmedia per afegir un "
+"suport)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "no es pot crear el suport \"%s\"\n"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "no es pot actualitzar el suport \"%s\"\n"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr ""
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "no es pot crear el suport \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opció desconeguda \"-$1\", comproveu-ne la sintaxi amb --help\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"sintaxi: urpmi [-h] [--auto] [--force] [-a] nom_paquet [noms_paquets...]\n"
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
-msgid "syntax error in config file at line %s"
+msgid "building hdlist [%s]"
+msgstr ""
+
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:94
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
-msgid "building hdlist [%s]"
+msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, fuzzy, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "no es pot crear el suport \"%s\"\n"
 
-#: po/placeholder.h:96
-#, c-format
-msgid "added medium %s"
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "What is your choice? (1-%d) "
+msgstr "Quina és la vostra elecció? (1-%d) "
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, fuzzy, c-format
-msgid "unable to build hdlist: %s"
+msgid "unable to access rpm file [%s]"
+msgstr "no es pot crear el suport \"%s\"\n"
+
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Elecció incorrecta, torneu-ho a provar\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\""
 msgstr "no es pot actualitzar el suport \"%s\"\n"
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
-#, c-format
-msgid "invalid rpm file name [%s]"
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:114 po/placeholder.h:303
+#, fuzzy, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "no es pot crear el suport \"%s\"\n"
+
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unknown data associated with %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
-#, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
-#, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "no es pot crear el suport \"%s\"\n"
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
 
-#: po/placeholder.h:111
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "ja està tot instal·lat"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Cal un dels paquets següents:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: no es pot llegir el fitxer rpm \"$_\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "La instal·lació ha fallat"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
 msgstr "no es pot actualitzar el suport \"%s\"\n"
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "unmounting %s"
+msgstr ""
+
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr ""
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "removing medium \"%s\""
 msgstr "no es pot crear el suport \"%s\"\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:142 po/placeholder.h:236
 #, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Els paquets següents contenen %s: %s\n"
-
-#: po/placeholder.h:120
-#, c-format
-msgid "no rpm files found from [%s]"
-msgstr ""
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "no es pot actualitzar el suport \"%s\"\n"
 
-#: po/placeholder.h:121
+#: po/placeholder.h:143 po/placeholder.h:238
 #, fuzzy, c-format
-msgid "examining hdlist file [%s]"
+msgid "trying to select multiple medium: %s"
 msgstr "no es pot crear el suport \"%s\"\n"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "no es pot actualitzar el suport \"%s\"\n"
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr ""
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "no es pot crear el suport \"%s\"\n"
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "no es pot crear el suport \"%s\"\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"Per complir les dependències, s'instal·laran els paquets següents (%d MB)"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "ja està tot instal·lat"
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: opció desconeguda \"-$1\", comproveu-ne la sintaxi amb --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Cal un dels paquets següents:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+#, fuzzy
+msgid "unable to register rpm file"
+msgstr "no es pot crear el suport \"%s\"\n"
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "La instal·lació ha fallat"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "no es pot actualitzar el suport \"%s\"\n"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -676,114 +770,180 @@ msgid ""
 msgstr ""
 "Per complir les dependències, s'instal·laran els paquets següents (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr ""
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 "Voleu intentar la instal·lació sense comprovar les dependències? (s/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
-msgid "  -p             - allow search in provides to find package.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, fuzzy, c-format
+msgid "unable to build hdlist: %s"
+msgstr "no es pot actualitzar el suport \"%s\"\n"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr ""
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:191 po/placeholder.h:355
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Quina és la vostra elecció? (1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "s'està instal·lant %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Si us plau, inseriu el suport anomenat \"%s\" al dispositiu [%s]"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Els paquets següents contenen %s: %s\n"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "no es pot crear el suport \"%s\"\n"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Voleu intentar la insta·lació encara amb més força (--force)? (s/N) "
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Elecció incorrecta, torneu-ho a provar\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "no es poden recuperar els paquets font. S'està interrompent"
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "installing %s\n"
-msgstr "s'està instal·lant %s\n"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Si us plau, inseriu el suport anomenat \"%s\" al dispositiu [%s]"
-
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "no es poden recuperar els paquets font. S'està interrompent"
+msgid "selecting %s by selection on files"
+msgstr ""
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Premeu Intro quan estigui fet..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "El superusuari és l'únic autoritzat per instal·lar paquets locals"
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Cal un dels paquets següents:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -792,7 +952,7 @@ msgstr ""
 "%s\n"
 "falta el <camí relatiu de l'hdlist>\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -816,17 +976,7 @@ msgstr ""
 "d'hdlist>\n"
 "       removable_<dispositiu>://<camí>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "no es pot crear el suport \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "no es pot actualitzar el suport \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, fuzzy, c-format
 msgid ""
@@ -834,11 +984,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr "opcions desconegudes \"%s\"\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -847,15 +993,7 @@ msgstr ""
 "%s\n"
 "falta el <camí relatiu de l'hdlist>\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -864,17 +1002,28 @@ msgstr ""
 "%s\n"
 "falta el `with' per als suports FTP\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"falta l'entrada per eliminar\n"
+"(una de %s)\n"
 
-#: po/placeholder.h:217
+#: po/placeholder.h:425
+#, fuzzy
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
+"sintaxi: urpmi.removemedia [-a] <nom> ...\n"
+"on <nom> és el nom del suport a eliminar.\n"
+"   -a    selecciona tots els suports.\n"
+"\n"
+"opcions desconegudes '%s'\n"
 
-#: po/placeholder.h:218
+#: po/placeholder.h:429
 #, fuzzy
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -886,7 +1035,7 @@ msgstr ""
 "\n"
 "opcions desconegudes '%s'\n"
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -895,77 +1044,7 @@ msgstr ""
 "falta l'entrada per actualitzar\n"
 "(una de %s)\n"
 
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"no hi ha res per actualitzar (utilitzeu urpmi.addmedia per afegir un "
-"suport)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"no hi ha res per eliminar (utilitzeu urpmi.addmedia per afegir un suport)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
-#, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"falta l'entrada per eliminar\n"
-"(una de %s)\n"
-
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
-#, fuzzy
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"sintaxi: urpmi.removemedia [-a] <nom> ...\n"
-"on <nom> és el nom del suport a eliminar.\n"
-"   -a    selecciona tots els suports.\n"
-"\n"
-"opcions desconegudes '%s'\n"
-
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:255 urpmq:90
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: no es pot llegir el fitxer rpm \"$_\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -975,44 +1054,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"s'han d'eliminar alguns paquets per poder actualitzar-los, això encara no es "
-"pot fer\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opció desconeguda \"-$1\", comproveu-ne la sintaxi amb --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1056,18 +1103,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "sintaxi: urpmi.update [-a] <nom> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "sintaxi: urpmi.removemedia [-a] <nom> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "sintaxi: urpmi.removemedia [-a] <nom> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "sintaxi: urpmi.update [-a] <nom> ..."
 
 #: urpmq:34
 #, c-format
@@ -1198,12 +1245,6 @@ msgstr "urpmq versió %s"
 #~ "  s'instal·len els noms dels fitxers rpm (només per al superusuari) que "
 #~ "s'indiquen a la línia d'ordres.\n"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "sintaxi: urpmi [-h] [--auto] [--force] [-a] nom_paquet [noms_paquets...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "No es pot trobar el fitxer %s, s'està sortint"
 
diff --git a/po/cs.po b/po/cs.po
index 9e220140..0b2f27fc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2002-01-23 18:56GMT+0200\n"
 "Last-Translator: Radek Vybíral <Radek.Vybiral@vsb.cz>\n"
 "Language-Team: czech <cs@li.org>\n"
@@ -27,27 +27,31 @@ msgstr ""
 "Automatická instalace balíèkù....\n"
 "Zadal jste instalaci balíèku $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Je to správnì?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ok"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Zru¹it"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "AaYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (A/n) "
 
@@ -55,16 +59,16 @@ msgstr " (A/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: pøíkaz nenalezen\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf verze %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
@@ -72,627 +76,717 @@ msgstr ""
 "Toto je svobodný software a je volnì ¹iøitelný podle podmínek licence GNU "
 "GPL."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "pou¾ití: urpmf [volby] <soubor>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet        - nevypí¹e jméno tagu (výchozí chování, pokud není jméno "
 "tagu"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 "                      zadáno na pøíkazové øádce, opak interaktivního re¾imu)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - vypí¹e v¹echny tagy."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - vypí¹e tag: jméno rpm souboru (pøedpokládané, pokud není"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    zadán na pøíkazové øádce ale bez jména balíèku)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - vypí¹e tag skupina: group."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - vypí¹e tag velikost: size."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - vypí¹e tag sériové èíslo: serial."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - vypí¹e tag souhrn: summary."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - vypí¹e tag popis: description."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 "  --provides      - vypí¹e tag poskytuje: all provides (na více øádek)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr "  --requires      - vypí¹e tag vy¾aduje: all requires (na více øádek)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files         - vypí¹e tag soubory: all files (na více øádek)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --conflicts     - vypí¹e tag konflikty: all conflicts (na více øádek)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - vypí¹e tag nahrazuje: all obsoletes (na více øádek)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 "  --prereqs       - vypí¹e tag prerekvizity: all prereqs (na více øádek)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "zadejte urpmf --help pro získání více voleb"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr "nebyl nalezen ¾ádný popis zdroje"
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "nelze zapsat konfiguraèní soubor [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr "naèítám rpm soubory..."
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr "zpracovávím celou urpmi databázi"
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  -v             - re¾im s výpisy.\n"
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "pro \"%s\" pou¾iju jiné vyjímatelné médium [%s]"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "nelze najít seznam souborù pro \"%s\", zdroj se ignoruje"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "není co zapisovat do seznamu souborù pro \"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"nelze naèíst první instalaèní médium (chybí soubor Mandrake/base/hdlists)"
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "nelze najít seznam souborù pro \"%s\", zdroj se ignoruje"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "nelze zpracovat soubor hdlist pro zdroj \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "není co zapisovat v seznamu souborù pro \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+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"
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+"  --auto-select  - automaticky vybere balíèky pro aktualizaci systému.\n"
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "naèítám soubor s popisy pro \"%s\"..."
 
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr "nelze pøistoupit na první instalaèní médium"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "balíèek %s nenalezen"
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "odpojuji %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "odebírám %d starých hlavièek"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nebyl nalezen soubor hdlist pro zdroj \"%s\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 "zdroj \"%s\" bude ignorován, proto¾e se pokou¹í pou¾ít pou¾itý soubor hdlist"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr "<nezobrazitelné znaky>"
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr "problém s naètením souboru hdlist, zkou¹ím to znovu"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
+msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 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"
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "odebírám zdroj \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr "problém s naètením souboru hdlist, zkou¹ím to znovu"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, 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é"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "ponechávám pouze soubory uvedené v sekci poskytujících"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "nelze vytvoøit soubor syntézy pro zdroj \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "nalezeno %d hlavièek"
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "pokou¹ím se vybrat více zdrojù: %s"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
-"vyhnìte se výbìru %s, pokud také není vybrána podpora pro lokální jazyk"
+msgid "unable to update medium \"%s\"\n"
+msgstr "nelze aktualizovat zdroj \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"odebírám %s pro aktualizaci %s ...\n"
-" jinak nebude úspì¹nì aktualizován"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c           - sma¾e doèasný adresáø.\n"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "zdroj \"%s\" ji¾ existuje"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "nelze zapsat seznam souborù pro zdroj \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "zapisuji konfiguraèní soubor [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+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"
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "¾ádný balíèek nemá jméno %s"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "vytváøím syntézu pro hdlist pro zdroj \"%s\""
-
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "nelze vytvoøit syntézu pro hdlist, pou¾iju metodu parsehdlist"
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Mám zkusit instalaci je¹tì razantnìji (--force)? (a/N) "
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "nelze nalézt soubor hdlist pro \"%s\", zdroj bude ignorován"
 
-#: po/placeholder.h:66
+#: po/placeholder.h:58 po/placeholder.h:248
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "vytváøím syntézu pro hdlist pro zdroj \"%s\""
+
+#: po/placeholder.h:59 po/placeholder.h:251
 msgid "urpmi database locked"
 msgstr "databáze pro urpmi je zamknutá"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, c-format
-msgid "mounting %s"
-msgstr "pøipojuji %s"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (A/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - vybere v¹echny vyhovující z pøíkazové øádky.\n"
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
-"nelze pracovat se zdrojem \"%s\", pokud je seznam souborù vyu¾íván jiným"
+"nìkteré balíèky pro upgrade se musí odebrat, toto je zatím nepodporováno\n"
 
-#: po/placeholder.h:69
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "zpracovávám soubor syntézy [%s]"
+msgid "mounting %s"
+msgstr "pøipojuji %s"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f         - provede generování hdlist souborù.\n"
+
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "pøíkaz wget selhal: skonèil s kódem %d nebo signálem %d\n"
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nelze naèíst cestu pro výmìnné médium \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+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"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "nesprávný vstup: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+"  -u          - odebere balíèek pokud je ji¾ instalována novìj¹í verze.\n"
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "více balíèkù má stejné jméno rpm souboru \"%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ù:"
 
-#: po/placeholder.h:74
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "A potom stisknìte Enter..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr "...kopírování selhalo"
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 "zdroj \"%s\" bude ignorován, proto¾e se pokou¹í pou¾ít ji¾ pou¾itý seznam"
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr "naèítám soubor hdlists..."
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr ""
-"zdroj \"%s\" bude ignorován, proto¾e nelze naèíst soubor hdlist pro zdroj"
-
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "nelze zaregistrovat rpm soubor"
-
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr "  -h           - vypí¹e tuto nápovìdu.\n"
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "nelze prozkoumat seznam souborù pro \"%s\", zdroj bude ignorován"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr "  -g         - vypí¹e tag skupina spoleènì se jménem.\n"
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "výmìnné médium \"%s\" má více pøípojnách bodù"
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
+msgstr "  -a           - vybere v¹echna média.\n"
 
-#: po/placeholder.h:82
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "¹patný popis \"%s\" v souboru hdlists"
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "nesouvislý seznam souborù pro \"%s\", zdroj bude ignorován"
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr ""
+"  -h        - provede pokus o nalezení souboru hdlist nebo synthesis.\n"
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "kopírování [%s] selhalo"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
+msgstr "  -r              - spoleènì se jménem vypí¹e verzi a vydání.\n"
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f        - spoleènì se jménem vypí¹e verzi, vydání a architekturu.\n"
+
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr "  --auto       - automaticky vybere správný balíèek z výbìru.\n"
+
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "nelze správnì zpracovat [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+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"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
 msgid "read synthesis file [%s]"
 msgstr "naèítám soubor syntézy [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "nelze zpracovat data ze syntézy pro zdroj %s"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "nebyl nalezen program webfetch (nebo curl èi wget)\n"
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "naèítám zdrojový hdlist (nebo synthesis) pro \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
+msgstr "  -c             - vybere kompletní metodu pro vyøe¹ení závislostí.\n"
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr "...kopírování ukonèeno"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "nelze vytvoøit zdroj \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopíruji zdrojový hdlist (nebo systhesis) pro \"%s\"..."
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
-msgstr "kopíruji soubor hdlists..."
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "syntaktická chyba v konfiguraèním souboru na øádku %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: neznámá volba \"%s\", zpùsob pou¾ití vyvoláte s --help\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "pou¾ití: urpmi.removemedia [-a] <jméno> ..."
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "vytváøím hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nelze naèíst rpm soubor [%s] pro zdroj \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr "  --media         - pou¾ít pouze zdroje oddìlené èárkou.\n"
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr "pøidán zdroj %s"
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nelze naèíst rpm soubor [%s] pro zdroj \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "naèítání zdrojového souboru hdlist (nebo systhesis) selhalo"
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "chyba pøi registraci lokálních balíèkù"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "beru vyjímatelné médium jako \"%s\""
-
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...naèítání selhalo: %s"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "nesouvislé médium \"%s\" je oznaèeno jako vyjímatelné"
 
-#: po/placeholder.h:102
-#, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopíruji soubor s popisy pro \"%s\"..."
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "nelze vytvoøit hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "zdroj \"%s\" není vybrán"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nesprávné jméno rpm souboru [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "neznámá data asociována s %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "pokus o vynechání existujícího zdroje \"%s\""
+msgid "What is your choice? (1-%d) "
+msgstr "Jaká je va¹e volba? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "nelze získat seznam souborù pro \"%s\", zdroj bude ignorován"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget          - pou¾ije program wget pro naètení souborù.\n"
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "vyvarujte se vybrat %s dokud nebude dost souborù aktualizováno"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nelze zpøístupnit rpm soubor [%s]"
 
-#: po/placeholder.h:111
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Je mi líto, to je ¹patná volba. Zkuste to znovu\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"odebírám %s pro aktualizaci %s...\n"
-" proto¾e jinak by se aktualizace nezdaøila!"
+msgid "unable to access medium \"%s\""
+msgstr "nelze pøistoupit na zdroj \"%s\""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "pøesunuté polo¾ky %s v souboru depslist"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - pou¾ije program curl pro naètení souborù.\n"
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nelze pøistoupit na zdroj \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "nelze vybrat neexistující zdroj \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr "nelze korektnì zpracovat [%s] kvùli hodnotì \"%s\""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "nelze vybrat neexistující zdroj \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "nebyl nalezen ¾ádný rpm soubor na [%s]"
+
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr "chybí program curl\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Následující balíèky obsahují: %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "nelze zjistit zdroj pro tento soubor hdlist [%s]"
 
-#: po/placeholder.h:120
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr "  --help           - vypí¹e tuto nápovìdu.\n"
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "v¹e je ji¾ nainstalováno"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr "naèítám rpm soubory..."
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nebyl nalezen ¾ádný rpm soubor na [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "pro \"%s\" pou¾iju jiné vyjímatelné médium [%s]"
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Je zapotøebí jeden z následujících balíèkù:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"nelze naèíst první instalaèní médium (chybí soubor Mandrake/base/hdlists)"
 
-#: po/placeholder.h:121
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "zpracovávám soubor hdlist [%s]"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nemohu pøeèíst rpm soubor \"%s\"\n"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
-msgstr "v souboru depslist nejsou ¾ádné pøesunuté polo¾ky"
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
-msgstr "...naèítání ukonèeno"
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Chyba pøi instalaci"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr "nelze pøistoupit na první instalaèní médium"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -p           - pokusí se najít balíèek v polo¾kách provides.\n"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "vybírám %s za pou¾ití vlastnosti nahrazení"
+msgid "unmounting %s"
+msgstr "odpojuji %s"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "pøíkaz curl selhal: skonèil s kódem %d nebo signálem %d\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "odebírám %d starých hlavièek"
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "vybírám %s na základì výbìru souborù"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nebyl nalezen soubor hdlist pro zdroj \"%s\""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
-msgstr "chybí program curl\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr "<nezobrazitelné znaky>"
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - re¾im s výpisy.\n"
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "kopíruji zdrojový seznam pro \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "odebírám zdroj \"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr "chybí program wget\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "nelze vytvoøit soubor syntézy pro zdroj \"%s\""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:143 po/placeholder.h:238
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "nelze zjistit zdroj pro tento soubor hdlist [%s]"
+msgid "trying to select multiple medium: %s"
+msgstr "pokou¹ím se vybrat více zdrojù: %s"
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
-msgstr "  --help           - vypí¹e tuto nápovìdu.\n"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a           - vybere v¹echna nevýjimatelná média.\n"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "v¹e je ji¾ nainstalováno"
+#: po/placeholder.h:145 po/placeholder.h:354
+#, fuzzy
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr ""
+"  jméno nebo rpm soubory zadané na pøíkazové øádce, které jsou dotazovány.\n"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: neznámá volba \"%s\", zpùsob pou¾ití vyvoláte zadáním --help\n"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
+"vyhnìte se výbìru %s, pokud také není vybrána podpora pro lokální jazyk"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  -v             - re¾im s výpisy.\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr "  --comlete      - pou¾ít parsehdlist server pro dokonèení výbìru.\n"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Je zapotøebí jeden z následujících balíèkù:"
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "zapisuji konfiguraèní soubor [%s]"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - pou¾ít pouze aktualizaci zdroje.\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "nelze vytvoøit syntézu pro hdlist, pou¾iju metodu parsehdlist"
 
-#: po/placeholder.h:138 urpmi:321
+#: po/placeholder.h:151 po/placeholder.h:413
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
-"Instalace selhala, nìkteré soubory chybí.\n"
-"Bude nutné aktualizovat databázi urpmi"
+"  --distrib      - automaticky vytvoøí v¹echny zdroje z instalaèních médií.\n"
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
-msgstr "  --auto       - automaticky vybere správný balíèek z výbìru.\n"
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, 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"
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Chyba pøi instalaci"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
+msgstr "zpracovávám soubor syntézy [%s]"
 
-#: po/placeholder.h:145 po/placeholder.h:270
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "nelze naèíst cestu pro výmìnné médium \"%s\""
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "více balíèkù má stejné jméno rpm souboru \"%s\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
 msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --auto-select  - automaticky vybere balíèky pro aktualizaci systému.\n"
+"Aby byly splnìny závislosti, budou nainstalovány následující balíèky (%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr "naèítám soubor hdlists..."
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: neznámá volba \"%s\", zpùsob pou¾ití vyvoláte zadáním --help\n"
+
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
+"zdroj \"%s\" bude ignorován, proto¾e nelze naèíst soubor hdlist pro zdroj"
+
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "nelze zaregistrovat rpm soubor"
 
-#: po/placeholder.h:147
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "nelze prozkoumat seznam souborù pro \"%s\", zdroj bude ignorován"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "výmìnné médium \"%s\" má více pøípojnách bodù"
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "nesouvislý seznam souborù pro \"%s\", zdroj bude ignorován"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - pou¾ít pouze aktualizaci zdroje.\n"
+
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "kopírování [%s] selhalo"
+
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d               - roz¹íøený dotaz na závislosti balíèku.\n"
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "nelze zpracovat data ze syntézy pro zdroj %s"
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "naèítám zdrojový hdlist (nebo synthesis) pro \"%s\"..."
+
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr "  --X           - pou¾ije X prostøedí.\n"
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr "...kopírování ukonèeno"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -700,124 +794,193 @@ msgid ""
 msgstr ""
 "Aby byly splnìny závislosti, budou nainstalovány následující balíèky (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-#, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -p           - pokusí se najít balíèek v polo¾kách provides.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr "kopíruji soubor hdlists..."
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "syntaktická chyba v konfiguraèním souboru na øádku %s"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Mám zkusit instalaci bez kontroly závislostí? (a/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr "  --media         - pou¾ít pouze zdroje oddìlené èárkou.\n"
-
-#: po/placeholder.h:152
-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"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "chyba pøi registraci lokálních balíèkù"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - re¾im s výpisy.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "beru vyjímatelné médium jako \"%s\""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p           - pokusí se najít balíèek v polo¾kách provides.\n"
 
-#: po/placeholder.h:158
-#, fuzzy
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-"  jméno nebo rpm soubory zadané na pøíkazové øádce, které jsou dotazovány.\n"
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q           - re¾im bez výpisù.\n"
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr "  --comlete      - pou¾ít parsehdlist server pro dokonèení výbìru.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "kopíruji soubor s popisy pro \"%s\"..."
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Jaká je va¹e volba? (1-%d) "
+msgid "unable to build hdlist: %s"
+msgstr "nelze vytvoøit hdlist: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget          - pou¾ije program wget pro naètení souborù.\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "zdroj \"%s\" není vybrán"
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"urpmi verze %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Toto je svobodný software a je volnì ¹iøitelný podle podmínek licence GNU "
-"GPL.\n"
-"pou¾ití:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "pokus o vynechání existujícího zdroje \"%s\""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Mám zkusit instalaci je¹tì razantnìji (--force)? (a/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q           - re¾im bez výpisù.\n"
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 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"
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Je mi líto, to je ¹patná volba. Zkuste to znovu\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - vybere v¹echny vyhovující z pøíkazové øádky.\n"
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - pou¾ije program curl pro naètení souborù.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "instaluji %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, 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]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Následující balíèky obsahují: %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr "zpracovávám soubor hdlist [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr "v souboru depslist nejsou ¾ádné pøesunuté polo¾ky"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - vytvoøí zdroj pro aktualizaci.\n"
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+"  -d           - provede kompletní generování souboru depslists.ordered.\n"
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "nelze získat zdrojový balíèek, konèím"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "A potom stisknìte Enter..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr "...naèítání ukonèeno"
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "vybírám %s za pou¾ití vlastnosti nahrazení"
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "pøíkaz curl selhal: skonèil s kódem %d nebo signálem %d\n"
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "vybírám %s na základì výbìru souborù"
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "kopíruji zdrojový seznam pro \"%s\"..."
+
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 msgid "Only superuser is allowed to install packages"
 msgstr "Instalovat balíky mù¾e pouze u¾ivatel root"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr "chybí program wget\n"
+
+#: po/placeholder.h:240
 #, c-format
-msgid "One of the following packages is needed to install %s:"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
 msgstr ""
-"Pro instalaci %s je zapotøebí nainstalovat jeden z následujících balíèkù:"
+"odebírám %s pro aktualizaci %s ...\n"
+" jinak nebude úspì¹nì aktualizován"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"odebírám %s pro aktualizaci %s...\n"
+" proto¾e jinak by se aktualizace nezdaøila!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Instalace selhala, nìkteré soubory chybí.\n"
+"Bude nutné aktualizovat databázi urpmi"
+
+#: po/placeholder.h:348
+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"
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"urpmi verze %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"Toto je svobodný software a je volnì ¹iøitelný podle podmínek licence GNU "
+"GPL.\n"
+"pou¾ití:\n"
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
 "%s\n"
@@ -826,7 +989,7 @@ msgstr ""
 "%s\n"
 "s volbou --distrib není tøeba zadávat <relativní cestak hdlistu>"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -848,17 +1011,7 @@ msgstr ""
 "      removable_<zaøízení>://<cesta>\n"
 "a [volby] jsou z\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "nelze vytvoøit zdroj \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "nelze aktualizovat zdroj \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -868,11 +1021,7 @@ msgstr ""
 "\n"
 "neznámé volby '%s'\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c           - sma¾e doèasný adresáø.\n"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -881,16 +1030,7 @@ msgstr ""
 "%s\n"
 "<relativní cestak hdlistu> chybí\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f         - provede generování hdlist souborù.\n"
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-"  -h        - provede pokus o nalezení souboru hdlist nebo synthesis.\n"
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -899,53 +1039,7 @@ msgstr ""
 "%s\n"
 " chybí pro FTP zdroj\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - vytvoøí zdroj pro aktualizaci.\n"
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-"  --distrib      - automaticky vytvoøí v¹echny zdroje z instalaèních médií.\n"
-
-#: po/placeholder.h:218
-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"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, 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"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d           - provede kompletní generování souboru depslists.ordered.\n"
-
-#: po/placeholder.h:235 urpmi.update:57
-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"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a           - vybere v¹echna nevýjimatelná média.\n"
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-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"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -954,11 +1048,7 @@ msgstr ""
 "záznam pro odebrání chybí\n"
 "(jeden z %s)\n"
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr "  -a           - vybere v¹echna média.\n"
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
@@ -966,34 +1056,24 @@ msgstr ""
 "pou¾ití: urpmi.removemedia [-a] <jméno> ...\n"
 "kde <jméno> je název zdroje pro aktualizaci.\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr "  -h           - vypí¹e tuto nápovìdu.\n"
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr "  -g         - vypí¹e tag skupina spoleènì se jménem.\n"
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nemohu pøeèíst rpm soubor \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  jméno nebo rpm soubory zadané na pøíkazové øádce, které jsou dotazovány.\n"
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr "  -r              - spoleènì se jménem vypí¹e verzi a vydání.\n"
+"pou¾ití: urpmi.update [volby] <jméno> ...\n"
+"kde <jméno> je název zdroje pro aktualizaci.\n"
 
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  -f        - spoleènì se jménem vypí¹e verzi, vydání a architekturu.\n"
+"záznam pro update chybí\n"
+"(jeden z %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1008,35 +1088,7 @@ msgstr ""
 "GPL.\n"
 "pou¾ití:\n"
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d               - roz¹íøený dotaz na závislosti balíèku.\n"
-
-#: po/placeholder.h:267
-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"
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr "  -c             - vybere kompletní metodu pro vyøe¹ení závislostí.\n"
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"nìkteré balíèky pro upgrade se musí odebrat, toto je zatím nepodporováno\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: neznámá volba \"%s\", zpùsob pou¾ití vyvoláte s --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
@@ -1044,12 +1096,6 @@ msgstr ""
 "  --headers      - extrahuje hlavièky pro balíèek z urpmi db na std. "
 "výstup.\n"
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-"  -u          - odebere balíèek pokud je ji¾ instalována novìj¹í verze.\n"
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1092,17 +1138,17 @@ msgstr ") . _("
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "pou¾ití: urpmi.update [volby] <jméno> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "pou¾ití: urpmi.removemedia [-a] <jméno> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "pou¾ití: urpmi.removemedia [-a] <jméno> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "pou¾ití: urpmi.update [volby] <jméno> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/da.po b/po/da.po
index 3a47f653..4d3e593a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-11-23 14:45+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: dansk <dansk@klid.dk>\n"
@@ -30,27 +30,31 @@ msgstr ""
 "Automatisk installation af pakker...\n"
 "Du bestilte installation af pakke $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Er det o.k.?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "O.k."
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Annullér"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "YyJj"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (J/n) "
 
@@ -58,646 +62,736 @@ msgstr " (J/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: kommando ikke fundet\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf version %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 "Dette er frit programmel og kan redistribueres under vilkårene til GNU GPL."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "brug: urpmf [flag] [<fil>]"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - skriv ikke mærkenavn (standard hvis intet mærke angivet "
 "på kommando"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    linje, ikke kompatibel med interaktivt modus)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - skriv alle mærker."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - skriv mærkenavn: rpm filnavn (antaget hvis intet mærke "
 "givet på"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    kommandolinje, men uden pakkenavn)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - skriv mærkegruppe: gruppe."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - skriv mærke-størrelse: størrelse."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - skriv mærke-serienummer: serienummer."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - skriv mærke-resumé: resumé."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - skriv mærke-beskrivelse: beskrivelse."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr "  --provides      - skriv mærke-tilbud: alle tilbud (flere linjer)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr "  --requires      - skriv mærke-krav: alle krav (flere linjer)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files         - skriv mærke-filer: alle filer (flere linjer)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --conflicts     - skriv mærke-konflikter: alle konflikter (flere linjer)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - skriv mærke-forældede: alle forældede (flere linjer)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 "  --prereqs       - skriv mærke-forudsætninger: alle forudsætninger (flere "
 "linjer)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "prøv urpmf --help for flere valgmuligheder"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "kunne ikke skrive config-fil [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-#, fuzzy
-msgid "retrieving rpms files..."
-msgstr "modtager [%s]"
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  --all           - skriv alle mærker."
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "bruger en anden udskiftelig enhed [%s] for \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "kunne ikke finde listefil for \"%s\", media ignoreret"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "ingenting at skrive i listefil for \"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "kunne ikke finde listefil for \"%s\", media ignoreret"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "kunne ikke fortolke hdlist-filen \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ingenting skrevet i listefil for \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, fuzzy, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "modtager [%s]"
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "kan ikke få adgang til filen \"%s\", media ignoreret"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "pakke %s er ikke fundet."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "afmonterer %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "fjerner %d forældede hoveder i hurtiglager"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "ingen hdlist-fil fundet for media \"%s\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr "media \"%s\" prøver at bruge en allerede brugt hdlist, media ignoreret"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "læser hdlist-fil [%s]"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "kunne ikke bruge navn \"%s\" for media uden navn da navnet allerede er brugt"
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "prøver at fjerne media \"%s\" som ikke eksisterer"
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "læser hdlist-fil [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "kunne ikke tage media \"%s\" i beregning da ingen listefil [%s] eksisterer"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "behold kun filer nævnt i tilbud"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "kunne ikke bygge synthesis fil for media \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "fandt %d hoveder i hurtiglager"
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "prøver at vælge ikke-eksisterende media \"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "undgå valg af %s da dens lokale sprog ikke er valgt allerede"
+msgid "unable to update medium \"%s\"\n"
+msgstr "kan ikke opdatere medie \"%s\"\n"
 
-#: po/placeholder.h:55
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"fjerner %s for at opgradere ...\n"
-" til %s da den ikke vil blive opdateret ellers"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+#, fuzzy
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  --all           - skriv alle mærker."
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "media \"%s\" eksisterer allerede"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "kunne ikke skrive listefil for \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "skriv config fil [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "ingen pakke kaldet %s"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Prøv installation med endnu større kraft (--force)? (j/N) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "kunne ikke finde hdlist-fil for \"%s\", media ignoreret"
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "byggede hdlist synthesis fil for media \"%s\""
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "kunne ikke finde alle synthesis file, bruger parsehdlist tjener"
+msgid " (y/N) "
+msgstr " (J/n) "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "kunne ikke finde hdlist-fil for \"%s\", media ignoreret"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"en pakke skal fjernes før den kan opgraderes, dette er ikke understøttet "
+"endnu.\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "monterer %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"kan ikke behandle media \"%s\" da listefil allerede bliver brugt af et andet "
-"media"
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "læs syntese-fil [%s]"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+#, fuzzy
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --group         - skriv mærkegruppe: gruppe."
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kan ikke finde stinavn for udskifteligt medie \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+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"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "malformed input: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "der er flere pakker med samme rpm-filnavn \"%s\""
+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:"
 
-#: po/placeholder.h:74
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Tryk på retur, når den er færdig..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr "media \"%s\" prøver at bruge en allerede brugt liste, media ignoreret"
 
-#: po/placeholder.h:76
+#: po/placeholder.h:74 po/placeholder.h:448
 #, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "modtager [%s]"
+msgid "  -h             - print this help message.\n"
+msgstr "  --all           - skriv alle mærker."
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "kunne ikke nå hdlist-fil af \"%s\", media ignoreret"
+#: po/placeholder.h:75 po/placeholder.h:450
+#, fuzzy
+msgid "  -g             - print groups too with name.\n"
+msgstr "  --group         - skriv mærkegruppe: gruppe."
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "kunne ikke registrere rpm-fil"
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  --all           - skriv alle mærker."
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "kunne ikke inspicere listefil for \"%s\", media ignoreret"
+#: po/placeholder.h:78 po/placeholder.h:407
+#, fuzzy
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  --group         - skriv mærkegruppe: gruppe."
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "For mange monteringspunkter for udskifteligt medium \"%s\""
+#: po/placeholder.h:79 po/placeholder.h:454
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr "                    kommandolinje, men uden pakkenavn)."
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "inkonsistent listefil for \"%s\", media ignoreret"
-
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "kopi af [%s] mislykkedes"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "kunne ikke fortolke [%s] korrekt"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+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"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
 msgid "read synthesis file [%s]"
 msgstr "læs syntese-fil [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "kunne ikke fortolke hdlist-filen \"%s\""
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-#, fuzzy
-msgid "...copying done"
-msgstr "modtager [%s]"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "kan ikke oprette medie \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "læser hdlist-fil [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "syntaksfejl i config fil ved linje %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ukendt parameter \"-%s\", tjek brug med --help\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "brug: urpmi.removemedia [-a] <name> ..."
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "bygger hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "kunne ikke læse rpm-fil [%s] fra media \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "kunne ikke læse rpm-fil [%s] fra media \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "fejl ved registrering af lokale pakker"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tager udskifteligt medium som \"%s\""
-
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "modtager [%s]"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "inkonsistent media \"%s\" mærket fjernbart, men er det ikke"
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "ingenting skrevet i listefil for \"%s\""
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "kunne ikke bygge hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "media \"%s\" er ikke valgt"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ugyldigt rpm-filnavn [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "ukendt data associeret med %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "prøver at forbigå eksisterende media \"%s\", undgår"
+msgid "What is your choice? (1-%d) "
+msgstr "Hvad er dit valg? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "kan ikke få adgang til filen \"%s\", media ignoreret"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "undgår at vælge %s da ikke nok filer vil blive opdateret"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kunne ikke nå rpm fil [%s]"
 
-#: po/placeholder.h:111
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"fjerner %s for at opgradere ...\n"
-" til %s da den ikke vil opgradere korrekt!"
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "omflyttede %s indgange i depsliste"
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Undskyld, dårligt valg, prøv igen\n"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "kunne ikke nå media \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr "kunne ikke fortolke [%s] korrekt bed værdi \"%s\""
+msgid "relocated %s entries in depslist"
+msgstr "omflyttede %s indgange i depsliste"
+
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "prøver at vælge ikke-eksisterende media \"%s\""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Følgende pakker indeholder %s: %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "kunne ikke fortolke [%s] korrekt bed værdi \"%s\""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "ingen rpm filer fundet fra [%s]"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "læser hdlist-fil [%s]"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "kunne ikke bedstemme media for denne hdlist-fil [%s]"
+
+#: po/placeholder.h:119 po/placeholder.h:328
 #, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "omflyttede %s indgange i depsliste"
+msgid "  --help         - print this help message.\n"
+msgstr "  --all           - skriv alle mærker."
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "alting er allerede installeret"
 
-#: po/placeholder.h:123 urpm.pm:1897
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
 #, fuzzy
-msgid "...retrieving done"
+msgid "retrieving rpms files..."
 msgstr "modtager [%s]"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "vælger %s ved at bruge obsolete"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "bruger en anden udskiftelig enhed [%s] for \"%s\""
 
-#: po/placeholder.h:125 urpm.pm:151
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Der er brug for en af de følgende pakker:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "vælger %s ved valg af filer"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan ikke læse rpm-fil \"%s\"\n"
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:128
-#, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "ingenting skrevet i listefil for \"%s\""
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Installationen fejlede"
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr "kan ikke få adgang til filen \"%s\", media ignoreret"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  --group         - skriv mærkegruppe: gruppe."
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
+#, c-format
+msgid "unmounting %s"
+msgstr "afmonterer %s"
+
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "fjerner %d forældede hoveder i hurtiglager"
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ingen hdlist-fil fundet for media \"%s\""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:141 po/placeholder.h:233
+#, fuzzy, c-format
+msgid "removing medium \"%s\""
+msgstr "prøver at fjerne media \"%s\" som ikke eksisterer"
+
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "kunne ikke bedstemme media for denne hdlist-fil [%s]"
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "kunne ikke bygge synthesis fil for media \"%s\""
 
-#: po/placeholder.h:132
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "prøver at vælge ikke-eksisterende media \"%s\""
+
+#: po/placeholder.h:144 po/placeholder.h:447
 #, fuzzy
-msgid "  --help         - print this help message.\n"
+msgid "  -a             - select all non-removable media.\n"
 msgstr "  --all           - skriv alle mærker."
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "alting er allerede installeret"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: ukendt parameter \"-%s\", tjek brug med --help\n"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "undgå valg af %s da dens lokale sprog ikke er valgt allerede"
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:253
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "skriv config fil [%s]"
+
+#: po/placeholder.h:150 po/placeholder.h:249
 #, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  --all           - skriv alle mærker."
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "kunne ikke finde alle synthesis file, bruger parsehdlist tjener"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Der er brug for en af de følgende pakker:"
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"kan ikke behandle media \"%s\" da listefil allerede bliver brugt af et andet "
+"media"
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "læs syntese-fil [%s]"
 
-#: po/placeholder.h:138 urpmi:321
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "kan ikke finde stinavn for udskifteligt medie \"%s\""
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "der er flere pakker med samme rpm-filnavn \"%s\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"For at tilfredsstille afhængigheder vil de følgende pakker blive installeret "
+"(%d Mb)"
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "modtager [%s]"
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: ukendt parameter \"-%s\", tjek brug med --help\n"
+
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "kunne ikke nå hdlist-fil af \"%s\", media ignoreret"
+
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "kunne ikke registrere rpm-fil"
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Installationen fejlede"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "kunne ikke inspicere listefil for \"%s\", media ignoreret"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "For mange monteringspunkter for udskifteligt medium \"%s\""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "inkonsistent listefil for \"%s\", media ignoreret"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "kopi af [%s] mislykkedes"
+
+#: po/placeholder.h:173 po/placeholder.h:462
+#, fuzzy
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "                    kommandolinje, men uden pakkenavn)."
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "kunne ikke fortolke hdlist-filen \"%s\""
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr "  --all           - skriv alle mærker."
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+#, fuzzy
+msgid "...copying done"
+msgstr "modtager [%s]"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -706,115 +800,188 @@ msgstr ""
 "For at tilfredsstille afhængigheder vil de følgende pakker blive installeret "
 "(%d Mb)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
+#: po/placeholder.h:180 po/placeholder.h:277
 #, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  --group         - skriv mærkegruppe: gruppe."
+msgid "copying hdlists file..."
+msgstr "læser hdlist-fil [%s]"
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "syntaksfejl i config fil ved linje %s"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Prøv installation uden at tjekke afhængigheder? (j/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "fejl ved registrering af lokale pakker"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
-msgstr ""
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "tager udskifteligt medium som \"%s\""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "ingenting skrevet i listefil for \"%s\""
+
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
+msgstr "kunne ikke bygge hdlist: %s"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "media \"%s\" er ikke valgt"
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "prøver at forbigå eksisterende media \"%s\", undgår"
 
-#: po/placeholder.h:159
+#: po/placeholder.h:191 po/placeholder.h:355
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "  --all           - skriv alle mærker."
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Hvad er dit valg? (1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "installerer %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
+#, 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]"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Følgende pakker indeholder %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
 #, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"Dette er frit programmel og kan redistribueres under vilkårene til GNU GPL."
+msgid "examining hdlist file [%s]"
+msgstr "læser hdlist-fil [%s]"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Prøv installation med endnu større kraft (--force)? (j/N) "
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "omflyttede %s indgange i depsliste"
 
-#: po/placeholder.h:171 po/placeholder.h:269
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Undskyld, dårligt valg, prøv igen\n"
+#: po/placeholder.h:205 po/placeholder.h:445
+#, fuzzy
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  --group         - skriv mærkegruppe: gruppe."
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+#, fuzzy
+msgid "...retrieving done"
+msgstr "modtager [%s]"
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "installing %s\n"
-msgstr "installerer %s\n"
+msgid "selecting %s using obsoletes"
+msgstr "vælger %s ved at bruge obsolete"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, 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 "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "vælger %s ved valg af filer"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Tryk på retur, når den er færdig..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "ingenting skrevet i listefil for \"%s\""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 msgid "Only superuser is allowed to install packages"
 msgstr "Kun superbrugeren har lov til at installere pakker"
 
-#: po/placeholder.h:182 urpmi:216
-#, 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:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"fjerner %s for at opgradere ...\n"
+" til %s da den ikke vil blive opdateret ellers"
+
+#: po/placeholder.h:296
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"fjerner %s for at opgradere ...\n"
+" til %s da den ikke vil opgradere korrekt!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:359
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"Dette er frit programmel og kan redistribueres under vilkårene til GNU GPL."
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -823,7 +990,7 @@ msgstr ""
 "%s\n"
 "<relativ sti for hdlist> mangler\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -845,17 +1012,7 @@ msgstr ""
 "       http://<vært>/<sti> with <relativt filnavn for hdlist>\n"
 "       removable_<enhed>://<sti>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "kan ikke oprette medie \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "kan ikke opdatere medie \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, fuzzy, c-format
 msgid ""
@@ -863,12 +1020,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr "ukendte valg \"%s\"\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  --all           - skriv alle mærker."
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -877,17 +1029,7 @@ msgstr ""
 "%s\n"
 "<relativ sti for hdlist> mangler\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --group         - skriv mærkegruppe: gruppe."
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  --group         - skriv mærkegruppe: gruppe."
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -896,57 +1038,7 @@ msgstr ""
 "%s\n"
 "'with' mangler for ftp-medie\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"brug: urpmi.removemedia [-a] <navn> ...\n"
-"hvor <navn> er et medie navn der skal fjernes.\n"
-"   -a    vælg alle medier.\n"
-"\n"
-"ukendte valg '%s'\n"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, 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"
-
-#: po/placeholder.h:234
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  --group         - skriv mærkegruppe: gruppe."
-
-#: po/placeholder.h:235 urpmi.update:57
-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"
-
-#: po/placeholder.h:236
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --all           - skriv alle mærker."
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-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"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -955,12 +1047,7 @@ msgstr ""
 "mangler det element der skal fjernes\n"
 "(én af %s)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  --all           - skriv alle mærker."
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -972,35 +1059,28 @@ msgstr ""
 "\n"
 "ukendte valg '%s'\n"
 
-#: po/placeholder.h:252
-#, fuzzy
-msgid "  -h             - print this help message.\n"
-msgstr "  --all           - skriv alle mærker."
-
-#: po/placeholder.h:254
+#: po/placeholder.h:429
 #, fuzzy
-msgid "  -g             - print groups too with name.\n"
-msgstr "  --group         - skriv mærkegruppe: gruppe."
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kan ikke læse rpm-fil \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"brug: urpmi.removemedia [-a] <navn> ...\n"
+"hvor <navn> er et medie navn der skal fjernes.\n"
+"   -a    vælg alle medier.\n"
+"\n"
+"ukendte valg '%s'\n"
 
-#: po/placeholder.h:258
-#, fuzzy
-msgid "  -r             - print version and release too with name.\n"
-msgstr "                    kommandolinje, men uden pakkenavn)."
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, 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"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1011,45 +1091,12 @@ msgid ""
 msgstr ""
 "Dette er frit programmel og kan redistribueres under vilkårene til GNU GPL."
 
-#: po/placeholder.h:266
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                    kommandolinje, men uden pakkenavn)."
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"en pakke skal fjernes før den kan opgraderes, dette er ikke understøttet "
-"endnu.\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ukendt parameter \"-%s\", tjek brug med --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1093,18 +1140,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "brug: urpmi.update [-a] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "brug: urpmi.removemedia [-a] <name> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "brug: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "brug: urpmi.update [-a] <name> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/de.po b/po/de.po
index 3c167e75..ad10a56b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2002-01-30 18:54+0100\n"
 "Last-Translator: Stefan Siegel <siegel@linux-mandrake.com>\n"
 "Language-Team: German <cooker-i18n@linux-mandrake.com>\n"
@@ -26,27 +26,31 @@ msgstr ""
 "Automatische Installation von Paketen ...\n"
 "Sie wünschen die Installation von Paket „$rpm“\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Ist das in Ordnung?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ok"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "JjYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (J/n) "
 
@@ -54,16 +58,16 @@ msgstr " (J/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: Befehl nicht gefunden\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf Version %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Urheberrecht (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
@@ -71,80 +75,80 @@ msgstr ""
 "Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter "
 "Vertrieben werden."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "Verwendung: rpmf [Optionen] <Datei>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - Keine Parameter ausgeben (Standard, wenn kein Parameter"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                   in der Kommandozeile vorgegeben wurde)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - Alle Parameter ausgeben."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - Ausgabe des Attributs „Name des RPMs“ (Dieses Attribut"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 "                   wird angenommen, wenn kein Parameter angegeben wird)"
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - Ausgabe des Attributs „Größe“."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - Ausgabe des Attributs „Seriennummer“."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - Ausgabe des Attributs „Zusammenfassung“."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - Ausgabe des Attributs „Beschreibung“."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 "  --provides      - Ausgabe des Attributs „Stellt zur Verfügung“ (mehrere\n"
 "                           Zeilen möglich)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 "  --requires      - Ausgabe des Attributs „Benötigt“ (mehrere Zeilen "
 "möglich)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 "  --files         - Ausgabe des Attribus „Dateien“ (mehrere Zeilen möglich)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --conflicts     - Ausgabe des Attributs „Steht in Konflikt mit“ (mehrere\n"
 "                    Zeilen möglich)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
@@ -152,563 +156,666 @@ msgstr ""
 "Zeilen\n"
 "                    möglich)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 "  --prereqs       - Ausgabe des Attributs „Benötigt zur Installation“\n"
 "                    (mehrere Zeilen möglich)"
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "Mit „urmpf --help“ erhatlen Sie weitere Optionen"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr "Es wurde keine komplette Medienliste gefunden"
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "Die Konfigurationsdatei [%s] kann nicht geschrieben werden."
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr "Holen der RPMs ..."
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr "Untersuchung der gesamten urpmi-Datenbank"
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Verwendung verschiedener Wechselmedien [%s] für „%s“"
-
-#: po/placeholder.h:33
-#, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr "Für die Dateiliste von „%s“ muss nichts geschrieben werden."
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"Kein Zugriff auf das erste Installationsmedium (die Datei „Mandrake/base/hdlists“ wurde nicht gefunden)"
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  --all           - Alle Parameter ausgeben."
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, 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."
 
-#: po/placeholder.h:36
+#: po/placeholder.h:33 po/placeholder.h:218
+#, c-format
+msgid "nothing to write in list file for \"%s\""
+msgstr "Für die Dateiliste von „%s“ muss nichts geschrieben werden."
+
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "Die Struktur der HD-Liste von „%s“ ist nicht korrekt."
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "Es wurde nichts in die Dateiliste von „%s“ geschrieben."
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "Holen der Beschreibungsdatei für „%s“ ..."
 
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr "Es kann nicht auf das erste Installationsmedium zugegriffen werden."
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "Paket %s wurde nicht gefunden."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "Aushängen von „%s“"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "Entferne %d veraltete Informationen aus dem Cache."
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "Keine HD-Liste für das Medium „%s“ gefunden."
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries 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."
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr "<nichtdruckbare Zeichen>"
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr "Probleme beim Lesen der HD-Liste, versuche es erneut ..."
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
+msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, 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."
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "Entfernen des Mediums „%s“."
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr "Probleme beim Lesen der HD-Liste, versuche es erneut ..."
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, 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."
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "Nur Behalten der Dateien, die als Anbieter referenziert werden."
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "Ich kann die Synthese-Datei für das Medium „%s“ nicht aktualisieren."
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d Informationen im Cache gefunden."
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "Versuch, das Mehrfachmedium „%s“ auszuwählen."
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
-"Vermeide die Auswahl von „%s“, das die entsprechenden Spracheinstellungen "
-"nicht installiert sind."
+msgid "unable to update medium \"%s\"\n"
+msgstr "Ich kann das Medium „%s“ nicht aktualisieren.\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"Entfernen von %s für die Aktualisierung auf %s ...\n"
-"Andernfalls funktioniert die Aktualisierung nicht korrekt."
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c              - Löschen des Header-Verzeichnisses.\n"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "Das Medium „%s“ existiert bereits."
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "Ich kann die Dateiliste für „%s“ nicht schreiben."
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "Schreiben der Konfigurationsdatei [%s]."
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "Kein Paket namens %s"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "Erstellen der HD-Liste für das Medium „%s“"
-
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "Ich kann keine Synthese-Dateien erstellen - verwende die Parsedhdlist-Variante"
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Soll ich eine Installation mit Gewalt (--force) versuchen? (j/N) "
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, 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."
+msgstr ""
+"Die HD-Liste für das Medium „%s“ wurde nicht gefunden, es wird ignoriert."
 
-#: po/placeholder.h:66
+#: po/placeholder.h:58 po/placeholder.h:248
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "Erstellen der HD-Liste für das Medium „%s“"
+
+#: po/placeholder.h:59 po/placeholder.h:251
 msgid "urpmi database locked"
 msgstr "Die urpmi-Datenbank wird von einem anderen Prozess blockiert!"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, c-format
-msgid "mounting %s"
-msgstr "Einhängen von „%s“"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (J/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
-"Das Medium „%s“ kann nicht verwendet werden, da die Dateiliste bereits von "
-"einem anderen Medium verwendet wird."
+"Einige Pakete müssen entfernt werden, bevor die diese Aktualisierungen \n"
+"durchführen können. Diese Funktionalität wird noch nicht angeboten.\n"
 
-#: po/placeholder.h:69
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "Lesen der Synthese-Datei [%s]"
+msgid "mounting %s"
+msgstr "Einhängen von „%s“"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f              - Forciere das Erstellen einer HD-Liste.\n"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget-Fehler: Rückgabewert ist ‚%d‘ oder ‚%d‘\n"
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "Ich kann den Pfadnamen für das Wechselmedium „%s“ nicht finden."
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+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"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "Inkorrekte Eingabe: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "Es existieren mehrere Pakete mit dem selben RPM-Dateinamen „%s“"
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Eines der folgenden Pakete wird benötigt:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Bestätigen Sie dies durch drücken der Return Taste ..."
 
-#: po/placeholder.h:74
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr "... das Kopieren schlug fehl!"
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 "Das Medium „%s“ versucht eine bereits verwendete Liste ebenfalls zu "
 "verwenden, es wird daher ignoriert."
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr "Holen der HD-Liste ..."
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-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."
-
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "Die RPM-Datei kann nicht registriert werden."
-
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
-msgstr "„%s“"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr "  -h              - Ausgabe dieser Hilfe.\n"
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr ""
-"Die Dateiliste für „%s“ kann nicht kontrolliert werden, es wird ignoriert."
+#: po/placeholder.h:75 po/placeholder.h:450
+#, fuzzy
+msgid "  -g             - print groups too with name.\n"
+msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "Es existieren zu viele Einhängpunkte für das Wechselmedium „%s“"
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  --all           - Alle Parameter ausgeben."
 
-#: po/placeholder.h:82
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "Fehlerhafte HD-Liste in Datei „%s“"
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "Die Dateiliste für „%s“ ist inkonsistent, das Medium wird ignoriert."
+#: po/placeholder.h:78 po/placeholder.h:407
+#, fuzzy
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "Kopieren von [%s] schlug fehl."
+#: po/placeholder.h:79 po/placeholder.h:454
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr ""
+"                   wird angenommen, wenn kein Parameter angegeben wird)"
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
+
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "Die Struktur von [%s] ist nicht korrekt."
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+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"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
 msgid "read synthesis file [%s]"
 msgstr "Lesen der Synthese-Datei [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "Ich kann die Struktur der Synthese-Liste von „%s“ nicht analysieren."
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
-msgstr "Es ist kein WebFetch-Paket (momentan unterstützt werden „curl“ und „wget“) installiert.\n"
+msgstr ""
+"Es ist kein WebFetch-Paket (momentan unterstützt werden „curl“ und „wget“) "
+"installiert.\n"
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr "... das Kopieren ist beendet!"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "Ich kann das Medium „%s“ nicht anlegen.\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
-msgstr "Lesen der HD-Liste ..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: unbekannte Option „-$1“. Weitere Infos erhalten Sie \n"
+"mittels „urpmq --help“\n"
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
-msgstr "Syntax-Fehler in Konfigurationsdatei auf Linie %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "Verwendung: urpmi.removemedia [-a] <Name> ..."
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "Erstellen der HD-Liste [%s]."
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "Ich kann das RPM-Paket „%s“ von Medium „%s“ nicht lesen."
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "Ich kann das RPM-Paket „%s“ von Medium „%s“ nicht lesen."
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "Fehler bei der Registrierung lokaler Pakete"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "Verwende Wechselmedium als „%s“"
-
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "Holen von [%s]"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "„%s“ wurde als Wechselmedium angegeben, ist es aber nicht."
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "Es wurde nichts in die Dateiliste von „%s“ geschrieben."
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "Ich kann die HD-Liste „%s“ nicht erzeugen."
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "Das Medium „%s“ wurde nicht ausgewählt."
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Ungültiger RPM Name [%s]."
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "Ihre Wahl? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Ich habe keinen Zugriff auf die RPM-Datei [%s]."
 
-#: po/placeholder.h:111
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"Entfernen von %s für die Aktualisierung ...\n"
-"auf %s da die Aktualisierung sont nicht korrekt funktioniert!"
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Eine schlechte Wahl, versuchen Sie es erneut\n"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "Ich kann auf das Medium „%s“ nicht zugreifen."
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "Versuch, das nicht existierende Medium „%s“ auszuwählen."
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Die folgenden Pakete enthalten „%s“: %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, fuzzy, c-format
 msgid "no rpm files found from [%s]"
 msgstr "Ungültiger RPM Name „%s“"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "Lesen der HD-Liste [%s]"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
+#: po/placeholder.h:119 po/placeholder.h:328
 #, fuzzy
-msgid "...retrieving done"
-msgstr "Holen von [%s]"
+msgid "  --help         - print this help message.\n"
+msgstr "  --all           - Alle Parameter ausgeben."
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "Alles bereits installiert"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr "Holen der RPMs ..."
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "Verwendung verschiedener Wechselmedien [%s] für „%s“"
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Eines der folgenden Pakete wird benötigt:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
+"Kein Zugriff auf das erste Installationsmedium (die Datei „Mandrake/base/"
+"hdlists“ wurde nicht gefunden)"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: Ich kann das RPM „%s“ nicht lesen.\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Die Installation schlug Fehl"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr "Es kann nicht auf das erste Installationsmedium zugegriffen werden."
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "unmounting %s"
+msgstr "Aushängen von „%s“"
+
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "Entferne %d veraltete Informationen aus dem Cache."
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "Keine HD-Liste für das Medium „%s“ gefunden."
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr "<nichtdruckbare Zeichen>"
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:141 po/placeholder.h:233
+#, c-format
+msgid "removing medium \"%s\""
+msgstr "Entfernen des Mediums „%s“."
+
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "Ich kann die Synthese-Datei für das Medium „%s“ nicht aktualisieren."
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "Versuch, das Mehrfachmedium „%s“ auszuwählen."
+
+#: po/placeholder.h:144 po/placeholder.h:447
+#, fuzzy
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --all           - Alle Parameter ausgeben."
+
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:128
-#, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "Es wurde nichts in die Dateiliste von „%s“ geschrieben."
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
+#, c-format
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
+"Vermeide die Auswahl von „%s“, das die entsprechenden Spracheinstellungen "
+"nicht installiert sind."
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "write config file [%s]"
+msgstr "Schreiben der Konfigurationsdatei [%s]."
+
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
+"Ich kann keine Synthese-Dateien erstellen - verwende die Parsedhdlist-"
+"Variante"
 
-#: po/placeholder.h:132
-#, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr "  --all           - Alle Parameter ausgeben."
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "Alles bereits installiert"
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+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."
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
+msgstr "Lesen der Synthese-Datei [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "Ich kann den Pfadnamen für das Wechselmedium „%s“ nicht finden."
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "Es existieren mehrere Pakete mit dem selben RPM-Dateinamen „%s“"
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert (%"
+"d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr "Holen der HD-Liste ..."
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 "urpmq: unbekannte Option „-$1“. Weitere Infos erhalten Sie \n"
 "mittels „urpmq --help“\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  --all           - Alle Parameter ausgeben."
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+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."
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Eines der folgenden Pakete wird benötigt:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "Die RPM-Datei kann nicht registriert werden."
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr "„%s“"
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
+"Die Dateiliste für „%s“ kann nicht kontrolliert werden, es wird ignoriert."
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "Es existieren zu viele Einhängpunkte für das Wechselmedium „%s“"
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "Die Dateiliste für „%s“ ist inkonsistent, das Medium wird ignoriert."
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "Kopieren von [%s] schlug fehl."
+
+#: po/placeholder.h:173 po/placeholder.h:462
+#, fuzzy
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
+"                   wird angenommen, wenn kein Parameter angegeben wird)"
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Die Installation schlug Fehl"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "Ich kann die Struktur der Synthese-Liste von „%s“ nicht analysieren."
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr "  --all           - Alle Parameter ausgeben."
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr "... das Kopieren ist beendet!"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -717,119 +824,190 @@ msgstr ""
 "Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert (%"
 "d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-#, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr "Lesen der HD-Liste ..."
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "Syntax-Fehler in Konfigurationsdatei auf Linie %s"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Soll ich eine Installation ohne Abhängigkeitstest versuchen? (j/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "Fehler bei der Registrierung lokaler Pakete"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
-msgstr ""
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "Verwende Wechselmedium als „%s“"
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "Es wurde nichts in die Dateiliste von „%s“ geschrieben."
+
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
+msgstr "Ich kann die HD-Liste „%s“ nicht erzeugen."
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "Das Medium „%s“ wurde nicht ausgewählt."
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:191 po/placeholder.h:355
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "  --all           - Alle Parameter ausgeben."
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ihre Wahl? (1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "Installiere %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
+#, 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“."
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Die folgenden Pakete enthalten „%s“: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
 #, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "examining hdlist file [%s]"
+msgstr "Lesen der HD-Liste [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
 msgstr ""
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter "
-"Vertrieben werden."
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Soll ich eine Installation mit Gewalt (--force) versuchen? (j/N) "
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update        - erstellen eines Aktualisierungsmediums.\n"
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:205 po/placeholder.h:445
+#, fuzzy
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Eine schlechte Wahl, versuchen Sie es erneut\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "Ich kann die Quellpakete nicht finden, Abbruch."
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+#, fuzzy
+msgid "...retrieving done"
+msgstr "Holen von [%s]"
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "installing %s\n"
-msgstr "Installiere %s\n"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
 #, 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“."
-
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "Ich kann die Quellpakete nicht finden, Abbruch."
+msgid "selecting %s by selection on files"
+msgstr ""
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Bestätigen Sie dies durch drücken der Return Taste ..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "Es wurde nichts in die Dateiliste von „%s“ geschrieben."
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 "Nur der Systemadministrator mit dem privilegierten \n"
 "Benutzerkennzeichen darf Pakete installieren."
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"Entfernen von %s für die Aktualisierung auf %s ...\n"
+"Andernfalls funktioniert die Aktualisierung nicht korrekt."
+
+#: po/placeholder.h:296
 #, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Eines der folgenden Pakete wird benötigt:"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"Entfernen von %s für die Aktualisierung ...\n"
+"auf %s da die Aktualisierung sont nicht korrekt funktioniert!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter "
+"Vertrieben werden."
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -838,7 +1016,7 @@ msgstr ""
 "%s\n"
 "<relativer Pfad zur HD-Liste> fehlt.\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -860,17 +1038,7 @@ msgstr ""
 "       http://<Rechner>/<Pfad> with <relativer Pfad zur HD-Liste>\n"
 "       removable_<Gerät>://<Pfad>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "Ich kann das Medium „%s“ nicht anlegen.\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "Ich kann das Medium „%s“ nicht aktualisieren.\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -880,11 +1048,7 @@ msgstr ""
 "\n"
 "Unbekannte Optionen „%s“\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c              - Löschen des Header-Verzeichnisses.\n"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -893,16 +1057,7 @@ msgstr ""
 "%s\n"
 "<relativer Pfad zur HD-Liste> fehlt.\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f              - Forciere das Erstellen einer HD-Liste.\n"
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -911,57 +1066,7 @@ msgstr ""
 "%s\n"
 "„with“ fehlt für FTP-Medien.\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update        - erstellen eines Aktualisierungsmediums.\n"
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-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"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"Was soll aktualisiert werden?\n"
-"(eins aus %s)\n"
-
-#: po/placeholder.h:234
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
-
-#: po/placeholder.h:235 urpmi.update:57
-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"
-
-#: po/placeholder.h:236
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --all           - Alle Parameter ausgeben."
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-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"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -970,12 +1075,7 @@ msgstr ""
 "Was soll entfernt werden?\n"
 "(eins aus %s)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  --all           - Alle Parameter ausgeben."
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
@@ -983,35 +1083,24 @@ msgstr ""
 "Verwendung: urpmi.removemedia [-a] <Name> ...\n"
 "Wobei <Name> das zu entfernende Medium ist.\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr "  -h              - Ausgabe dieser Hilfe.\n"
-
-#: po/placeholder.h:254
-#, fuzzy
-msgid "  -g             - print groups too with name.\n"
-msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: Ich kann das RPM „%s“ nicht lesen.\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-#, fuzzy
-msgid "  -r             - print version and release too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"                   wird angenommen, wenn kein Parameter angegeben wird)"
+"Verwendung: urpmi.update [Optionen] <Name> ...\n"
+"Wobei <Name> das zu aktualisierende Medium ist.\n"
 
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"Was soll aktualisiert werden?\n"
+"(eins aus %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1023,48 +1112,12 @@ msgstr ""
 "Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter "
 "Vertrieben werden."
 
-#: po/placeholder.h:266
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-"                   wird angenommen, wenn kein Parameter angegeben wird)"
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"Einige Pakete müssen entfernt werden, bevor die diese Aktualisierungen \n"
-"durchführen können. Diese Funktionalität wird noch nicht angeboten.\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: unbekannte Option „-$1“. Weitere Infos erhalten Sie \n"
-"mittels „urpmq --help“\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1108,17 +1161,17 @@ msgstr ") . _("
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "Verwendung: urpmi.update [Optionen] <Name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "Verwendung: urpmi.removemedia [-a] <Name> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "Verwendung: urpmi.removemedia [-a] <Name> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "Verwendung: urpmi.update [Optionen] <Name> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/el.po b/po/el.po
index 2d4be1d4..80ddc2f4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-08-22 22:42+0300\n"
 "Last-Translator: Thanos Kyritsis <djart@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -26,27 +26,31 @@ msgstr ""
 "Áõôüìáôç åãêáôÜóôáóç ðáêÝôùí...\n"
 "ÆçôÞóáôå ôçí åãêáôÜóôáóç ôïõ ðáêÝôïõ $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Åßíáé åíôÜîåé;"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "ÅíôÜîåé"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "¶êõñï"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Ïï"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "Íí"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (Í/ï) "
 
@@ -54,16 +58,16 @@ msgstr " (Í/ï) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: ç åíôïëÞ äå âñÝèçêå\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmq Ýêäïóç %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
@@ -71,646 +75,738 @@ msgstr ""
 "Áõôü åßíáé åëåýèåñï ëïãéóìéêü êáé ìðïñåß íá äéáíÝìåôáé õðü ôïõò üñïõò ôïõ "
 "GNU GPL."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "÷ñÞóç: rpmf [åðéëïãÝò] <áñ÷åßï>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - ìçí ôõðþóåéò ôï üíïìá tag (åî' ïñéóìïý áí êáíÝíá tag äåí "
 "äïèåß óôçí ãñáììÞ"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    åíôïëþí, áóýìâáôï ìå ôçí êáôÜóôáóç interactive)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - ôýðùóå üëá ôá tags."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - ôýðùóå ôï üíïìá tag: üíïìá áñ÷åßïõ rpm (÷ñçóéìïðïéåßôáé "
 "áí äåí äïèåß tag óôçí"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    ãñáììÞ åíôïëþí áëëÜ ÷ùñßò üíïìá ðáêÝôïõ)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - ôýðùóç ôï tag group: group."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - ôýðùóç ôï ìÝãåèïò ôïõ tag: ìÝãåèïò."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - ôýðùóå ôï tag serial: serial."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - ôýðùóå ôçí ðåñßëçøç ôïõ tag: ðåñßëçøç."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - ôýðùóå ôçí ðåñéãñáöÞ ôïõ tag: ðåñéãñáöÞ."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 "  --provides      - ôýðùóå ôéò ðáñï÷Ýò ôïõ tag: üëåò ôéò ðáñï÷Ýò (ðïëëáðëÝò "
 "ãñáììÝò)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 "  --requires      - ôýðùóå ôéò áðáéôÞóåéò ôïõ tag: üëåò ôéò áðáéôÞóåéò "
 "(ðïëëáðëÝò ãñáììÝò)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 "  --files         - ôýðùóå ôá áñ÷åßá ôïõ tag: üëá ôá áñ÷åßá (ðïëëáðëÝò "
 "ãñáììÝò)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --conflicts     - ôýðùóå ôéò óõãêñïýóåéò ôïõ tag: üëåò ôéò óõãêñïýóåéò "
 "(ðïëëáðëÝò ãñáììÝò)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - ôýðùóå ôá tag obsoletes: üëá ôá obsoletes (ðïëëáðëÝò "
 "ãñáììÝò)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 "  --prereqs       - ôýðùóå üëá ôá tag prereqs: üëá ôá prereqs (ðïëëáðëÝò "
 "ãñáììÝò)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "ðñïóðáèÞóôå ìå urpmf --help ãéá ðåñéóóüôåñåò åðéëïãÝò"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "áäõíáìßá åããñáöÞò áñ÷åßïõ ñõèìßóåùí [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-#, fuzzy
-msgid "retrieving rpms files..."
-msgstr "áíÜêôçóç [%s]"
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  --all           - ôýðùóå üëá ôá tags."
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "áäõíáìßá åýñåóçò áñ÷åßïõ ëßóôáò ãéá ôï \"%s\", ôï ìÝóï èá áãíïçèåß"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "ôßðïôá ãéá åããñáöÞ óôï áñ÷åßï ëßóôáò ãéá ôï \"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "áäõíáìßá åýñåóçò áñ÷åßïõ ëßóôáò ãéá ôï \"%s\", ôï ìÝóï èá áãíïçèåß"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "áäõíáìßá áíÜãíùóçò ôïõ hdlist áñ÷åßïõ ôïõ \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ôßðïôá äåí ãñÜöôçêå óôï áñ÷åßï ëßóôáò ãéá ôï \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, fuzzy, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "áíÜêôçóç [%s]"
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "áäõíáìßá ðñüóâáóçò óôï áñ÷åßï ëßóôáò ôïõ \"%s\", ôï ìÝóï áãíïåßôáé"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "ôï ðáêÝôï %s äåí âñÝèçêå."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "áðïðñïóáñôþ %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "äéáãñáöÞ %d áóõíáöþí åðéêåöáëßäùí áðü ôçí cache"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "äåí âñÝèçêå hdlist áñ÷åßï ãéá ôï ìÝóï \"%s\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 "ôï ìÝóï \"%s\" ðñïóðáèåß íá ÷ñçóéìïðïéÞóåé ôçí Þäç ÷ñçóéìïðïéçìÝíç hdlist, "
 "ôï ìÝóï èá áãíïçèåß"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "áíÜãíùóç áñ÷åßïõ hdlist [%s]"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "áäõíáìßá ÷ñÞóçò ïíüìáôïò \"%s\" ãéá ôï áíþíõìï ìÝóï ãéáôß Þäç ÷ñçóéìïðïéåßôáé"
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "ðñïóðÜèåéá äéáãñáöÞò ìç õðáñêôïý ìÝóïõ \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "áíÜãíùóç áñ÷åßïõ hdlist [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "áäõíáôþ íá ðÜñù ôï ìÝóï \"%s\" óôá óïâáñÜ êáèþò äåí õðÜñ÷åé áñ÷åßï ëßóôáò [%"
 "s]"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "äéáôÞñçóç ìüíï ôùí áñ÷åßùí ðïõ áíáöÝñïíôáé óôá provides"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ óýíèåóçò ãéá ôï ìÝóï \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "âñÝèçêáí %d êåöáëßäåò óôï cache"
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "ðñïóðÜèåéá åðéëïãÞò ôïõ ìç õðáñêôïý ìÝóïõ \"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
-"áðïöýãåôå íá åðéëÝîåôå ôï %s êáèþò ç ãëþóóá ôùí locales ôïõ äåí Ý÷åé áêüìá "
-"åðéëå÷èåß"
+msgid "unable to update medium \"%s\"\n"
+msgstr "áäõíáìßá áíáâÜèìéóçò ôïõ ìÝóïõ \"%s\"\n"
 
-#: po/placeholder.h:55
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"äéáãñáöÞ ôïõ %s ãéá áíáâÜèìéóç ......\n"
-" óôï %s áöïý äåí ãßíåôáé íá áíáâáèìéóôåß áëëéþò"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+#, fuzzy
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  --all           - ôýðùóå üëá ôá tags."
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "ôï ìÝóï \"%s\" Þäç õðÜñ÷åé"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "áäõíáìßá åããñáöÞò áñ÷åßïõ ëßóôáò ôïõ \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "åããñáöÞ áñ÷åßïõ ñõèìßóåùí [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "êáíÝíá ðáêÝôï ìå ôï üíïìá %s"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "ÐñïóðÜèåéá ãéá ðéï äõíáôÞ åãêáôÜóôáóç (--force); (í/Ï) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "áäõíáìßá åýñåóçò ôïõ áñ÷åßïõ hdlist ãéá ôï \"%s\", ôï ìÝóï èá áãíïçèåß"
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "äçìéïõñãßá áñ÷åßïõ óýíèåóçò hdlist áðü ôï ìÝóï \"%s\""
 
-#: po/placeholder.h:64
-#, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
 msgstr ""
-"áäõíáìßá åýñåóçò üëïõ ôïõ áñ÷åßïõ óýíèåóçò, ÷ñÞóç åîõðçñåôçôÞ parsehdlist"
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "áäõíáìßá åýñåóçò ôïõ áñ÷åßïõ hdlist ãéá ôï \"%s\", ôï ìÝóï èá áãíïçèåß"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (Í/ï) "
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"êÜðïéï ðáêÝôï ðñÝðåé íá äéáãñáöåß ãéá íá áíáâáèìéóôåß, áõôü äåí "
+"õðïóôçñßæåôáé áêüìá\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "ðñïóáñôþ ôï %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"áäõíáìßá åëÝã÷ïõ ôïõ ìÝóïõ \"%s\" êáèþò ôï áñ÷åßï ëßóôá Þäç ÷ñçóéìïðïéåßôáé "
-"áðü Üëëï ìÝóï"
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "áíÜãíùóç depslist áñ÷åßïõ [%s]"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+#, fuzzy
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --group         - ôýðùóç ôï tag group: group."
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "áäõíáìßá äçìéïõñãßáò ôïõ ìÝóïõ \"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"ôßðïôá ãéá äéáãñáöÞ (÷ñçóéìïðïéÞóôå urpmi.addmedia ãéá ðñïóèÞêç ìÝóïõ)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "êáêïäéáôõðùìÝíç åßóïäïò: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "õðÜñ÷ïõí ðïëëáðëÜ ðáêÝôá ìå ôï ßäéï üíïìá rpm áñ÷åßïõ \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "¸íá åê ôùí ðáñáêÜôù ðáêÝôùí áðáéôåßôáé:"
 
-#: po/placeholder.h:74
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "ÐáôÞóôå enter üôáí ôåëåéþóåôå..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 "ôï ìÝóï \"%s\" ðñïóðáèåß íá ÷ñçóéìïðïéÞóåé ôçí Þäç ÷ñçóéìïðïéçìÝíç ëßóôá, ôï "
 "ìÝóï èá áãíïçèåß"
 
-#: po/placeholder.h:76
+#: po/placeholder.h:74 po/placeholder.h:448
 #, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "áíÜêôçóç [%s]"
+msgid "  -h             - print this help message.\n"
+msgstr "  --all           - ôýðùóå üëá ôá tags."
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "áäõíáìßá ðñüóâáóçò óôï áñ÷åßï ëßóôáò ôïõ \"%s\", ôï ìÝóï èá áãíïçèåß"
+#: po/placeholder.h:75 po/placeholder.h:450
+#, fuzzy
+msgid "  -g             - print groups too with name.\n"
+msgstr "  --group         - ôýðùóç ôï tag group: group."
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "áäõíáìßá êáôáãñáöÞò ôïõ rpm áñ÷åßïõ"
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  --all           - ôýðùóå üëá ôá tags."
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "áäõíáìßá åðéèåþñçóç áñ÷åßïõ ëßóôáò ãéá ôï \"%s\", ôï ìÝóï èá áãíïçèåß"
+#: po/placeholder.h:78 po/placeholder.h:407
+#, fuzzy
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  --group         - ôýðùóç ôï tag group: group."
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
+#: po/placeholder.h:79 po/placeholder.h:454
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr "                    ãñáììÞ åíôïëþí áëëÜ ÷ùñßò üíïìá ðáêÝôïõ)."
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "ìÞ óõíáöÝò áñ÷åßï ëßóôáò ãéá ôï \"%s\", ôï ìÝóï áãíïåßôáé"
-
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "ç áíôéãñáöÞ ôïõ [%s] áðÝôõ÷å"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "áäõíáìßá áíÜãíùóçò óùóôÜ [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"ôßðïôá ãéá áíáâÜèìéóç (÷ñçóéìïðïéÞóôå urpmi.addmedia ãéá ðñïóèÞêç ìÝóïõ)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "áíÜãíùóç depslist áñ÷åßïõ [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "áäõíáìßá áíÜãíùóçò ôïõ hdlist áñ÷åßïõ ôïõ \"%s\""
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-#, fuzzy
-msgid "...copying done"
-msgstr "áíÜêôçóç [%s]"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "áäõíáìßá äçìéïõñãßáò ôïõ ìÝóïõ \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "áíÜãíùóç áñ÷åßïõ hdlist [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "óõíôáêôéêü ëÜèïò óôï áñ÷åßï ñõèìßóåùí óôç ãñáììÞ %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: Üãíùóôç ðáñÜìåôñïò \"-%s\", åëÝãîôå ôçí óýíôáîç ìå ôï --help\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "÷ñÞóç: urpmi.removemedia [-a] <üíïìá> ..."
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "äçìéïõñãßá hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "áäõíáìßá áíÜãíùóçò ôïõ rpm áñ÷åßïõ [%s] áðü ôï ìÝóï \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "óöÜëìá êáôáãñáöÞò ôïðéêþí ðáêÝôùí"
-
-#: po/placeholder.h:99
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "áäõíáìßá áíÜãíùóçò ôïõ rpm áñ÷åßïõ [%s] áðü ôï ìÝóï \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "áíÜêôçóç [%s]"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "ôï ìÝóï \"%s\" Ý÷åé áíáöåñèåß óáí áöáéñïýìåíï áëëÜ äåí åßíáé"
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "ôßðïôá äåí ãñÜöôçêå óôï áñ÷åßï ëßóôáò ãéá ôï \"%s\""
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "áäõíáìßá äçìéïõñãßáò ôïõ hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "ôï ìÝóï \"%s\" äåí Ý÷åé åðéëå÷èåß"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ëÜèïò üíïìá rpm áñ÷åßïõ [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "Üãíùóôá äåäïìÝíá óõíäåäåìÝíá ìå ôï %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "ðñïóðÜèåéá áðïöõãÞò õðÜñ÷ïíôïò ìÝóïõ \"%s\""
+msgid "What is your choice? (1-%d) "
+msgstr "ÐïéÜ åßíáé ç åðéëïãÞ óáò; (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "áäõíáìßá ðñüóâáóçò óôï áñ÷åßï ëßóôáò ôïõ \"%s\", ôï ìÝóï áãíïåßôáé"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "áðïöõãÞ åðéëïãÞò %s áöïý äåí èá áíáâáèìéóôïýí áñêåôÜ áñ÷åßá"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "áäõíáìßá ðñüóâáóçò óôï rpm áñ÷åßï [%s]"
 
-#: po/placeholder.h:111
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"äéáãñáöÞ ôïõ %s ãéá áíáâÜèìéóç ...\n"
-" óôï %s êáèþò äåí èá áíáâáèìéóôåß óùóôÜ!"
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "åðáíåíôüðéóç %s êáôá÷ùñÞóåùí óôï depslist"
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "ËõðÜìáé, êáêÞ åðéëïãÞ, ðñïóðáèÞóôå îáíÜ\n"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "áäõíáìßá ðñüóâáóçò óôï ìÝóï \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr "áäõíáìßá áðüäïóçò óùóôÜ ôïõ [%s] óôçí ôéìÞ \"%s\""
+msgid "relocated %s entries in depslist"
+msgstr "åðáíåíôüðéóç %s êáôá÷ùñÞóåùí óôï depslist"
+
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "ðñïóðÜèåéá åðéëïãÞò ôïõ ìç õðáñêôïý ìÝóïõ \"%s\""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Ôá ðáñáêÜôù ðáêÝôá ðåñéÝ÷ïõí %s: %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "áäõíáìßá áðüäïóçò óùóôÜ ôïõ [%s] óôçí ôéìÞ \"%s\""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "äåí âñÝèçêáí rpm áñ÷åßá áðü ôï [%s]"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "áíÜãíùóç áñ÷åßïõ hdlist [%s]"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "áäõíáìßá áðüöáóçò ãéá ôï ìÝóï áõôïý ôïõ áñ÷åßïõ hdlist [%s]"
 
-#: po/placeholder.h:122 urpm.pm:1191
+#: po/placeholder.h:119 po/placeholder.h:328
 #, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "åðáíåíôüðéóç %s êáôá÷ùñÞóåùí óôï depslist"
+msgid "  --help         - print this help message.\n"
+msgstr "  --all           - ôýðùóå üëá ôá tags."
 
-#: po/placeholder.h:123 urpm.pm:1897
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "üëá åßíáé Þäç åãêáôåóôçìÝíá"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
 #, fuzzy
-msgid "...retrieving done"
+msgid "retrieving rpms files..."
 msgstr "áíÜêôçóç [%s]"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "åðéëïãÞ %s ÷ñÞóç áðáñ÷áéùìÝíïõ"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "¸íá åê ôùí ðáñáêÜôù ðáêÝôùí áðáéôåßôáé:"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: áäõíáìßá áíÜãíùóçò rpm áñ÷åßïõ \"%s\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Ç åãêáôÜóôáóç áðÝôõ÷å"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr "áäõíáìßá ðñüóâáóçò óôï áñ÷åßï ëßóôáò ôïõ \"%s\", ôï ìÝóï áãíïåßôáé"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  --group         - ôýðùóç ôï tag group: group."
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "selecting %s by selection on files"
+msgid "unmounting %s"
+msgstr "áðïðñïóáñôþ %s"
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "äéáãñáöÞ %d áóõíáöþí åðéêåöáëßäùí áðü ôçí cache"
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "äåí âñÝèçêå hdlist áñ÷åßï ãéá ôï ìÝóï \"%s\""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "ôßðïôá äåí ãñÜöôçêå óôï áñ÷åßï ëßóôáò ãéá ôï \"%s\""
+msgid "removing medium \"%s\""
+msgstr "ðñïóðÜèåéá äéáãñáöÞò ìç õðáñêôïý ìÝóïõ \"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ óýíèåóçò ãéá ôï ìÝóï \"%s\""
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "ðñïóðÜèåéá åðéëïãÞò ôïõ ìç õðáñêôïý ìÝóïõ \"%s\""
+
+#: po/placeholder.h:144 po/placeholder.h:447
+#, fuzzy
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --all           - ôýðùóå üëá ôá tags."
+
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "áäõíáìßá áðüöáóçò ãéá ôï ìÝóï áõôïý ôïõ áñ÷åßïõ hdlist [%s]"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
+"áðïöýãåôå íá åðéëÝîåôå ôï %s êáèþò ç ãëþóóá ôùí locales ôïõ äåí Ý÷åé áêüìá "
+"åðéëå÷èåß"
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
 
-#: po/placeholder.h:132
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "åããñáöÞ áñ÷åßïõ ñõèìßóåùí [%s]"
+
+#: po/placeholder.h:150 po/placeholder.h:249
 #, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr "  --all           - ôýðùóå üëá ôá tags."
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr ""
+"áäõíáìßá åýñåóçò üëïõ ôïõ áñ÷åßïõ óýíèåóçò, ÷ñÞóç åîõðçñåôçôÞ parsehdlist"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "üëá åßíáé Þäç åãêáôåóôçìÝíá"
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"áäõíáìßá åëÝã÷ïõ ôïõ ìÝóïõ \"%s\" êáèþò ôï áñ÷åßï ëßóôá Þäç ÷ñçóéìïðïéåßôáé "
+"áðü Üëëï ìÝóï"
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "áíÜãíùóç depslist áñ÷åßïõ [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "áäõíáìßá äçìéïõñãßáò ôïõ ìÝóïõ \"%s\"\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "õðÜñ÷ïõí ðïëëáðëÜ ðáêÝôá ìå ôï ßäéï üíïìá rpm áñ÷åßïõ \"%s\""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Ãéá íá éêáíïðïéçèïýí ïé åîáñôÞóåéò (dependencies), ôá ðáñáêÜôù ðáêÝôá èá "
+"åãêáôáóôáèïýí (%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "áíÜêôçóç [%s]"
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: Üãíùóôç ðáñÜìåôñïò \"-%s\", åëÝãîôå ôçí óýíôáîç ìå ôï --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  --all           - ôýðùóå üëá ôá tags."
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "áäõíáìßá ðñüóâáóçò óôï áñ÷åßï ëßóôáò ôïõ \"%s\", ôï ìÝóï èá áãíïçèåß"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "¸íá åê ôùí ðáñáêÜôù ðáêÝôùí áðáéôåßôáé:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "áäõíáìßá êáôáãñáöÞò ôïõ rpm áñ÷åßïõ"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "áäõíáìßá åðéèåþñçóç áñ÷åßïõ ëßóôáò ãéá ôï \"%s\", ôï ìÝóï èá áãíïçèåß"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "ìÞ óõíáöÝò áñ÷åßï ëßóôáò ãéá ôï \"%s\", ôï ìÝóï áãíïåßôáé"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Ç åãêáôÜóôáóç áðÝôõ÷å"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "ç áíôéãñáöÞ ôïõ [%s] áðÝôõ÷å"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+#, fuzzy
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "                    ãñáììÞ åíôïëþí áëëÜ ÷ùñßò üíïìá ðáêÝôïõ)."
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "áäõíáìßá áíÜãíùóçò ôïõ hdlist áñ÷åßïõ ôïõ \"%s\""
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr "  --all           - ôýðùóå üëá ôá tags."
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+#, fuzzy
+msgid "...copying done"
+msgstr "áíÜêôçóç [%s]"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -719,119 +815,192 @@ msgstr ""
 "Ãéá íá éêáíïðïéçèïýí ïé åîáñôÞóåéò (dependencies), ôá ðáñáêÜôù ðáêÝôá èá "
 "åãêáôáóôáèïýí (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
+#: po/placeholder.h:180 po/placeholder.h:277
 #, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  --group         - ôýðùóç ôï tag group: group."
+msgid "copying hdlists file..."
+msgstr "áíÜãíùóç áñ÷åßïõ hdlist [%s]"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "óõíôáêôéêü ëÜèïò óôï áñ÷åßï ñõèìßóåùí óôç ãñáììÞ %s"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 "ÐñïóðÜèåéá ãéá åãêáôÜóôáóç ÷ùñßò ôïí Ýëåã÷ï ôùí åîáñôÞóåùí (dependencies); "
 "(í/Ï) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "óöÜëìá êáôáãñáöÞò ôïðéêþí ðáêÝôùí"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "ôßðïôá äåí ãñÜöôçêå óôï áñ÷åßï ëßóôáò ãéá ôï \"%s\""
+
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
+msgstr "áäõíáìßá äçìéïõñãßáò ôïõ hdlist: %s"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "ôï ìÝóï \"%s\" äåí Ý÷åé åðéëå÷èåß"
 
-#: po/placeholder.h:159
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "ðñïóðÜèåéá áðïöõãÞò õðÜñ÷ïíôïò ìÝóïõ \"%s\""
+
+#: po/placeholder.h:191 po/placeholder.h:355
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "  --all           - ôýðùóå üëá ôá tags."
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "ÐïéÜ åßíáé ç åðéëïãÞ óáò; (1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "åãêáôÜóôáóç %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ðáñáêáëþ âÜëôå ôï ìÝóï ìå üíïìá \"%s\" óôç óõóêåõÞ [%s]"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Ôá ðáñáêÜôù ðáêÝôá ðåñéÝ÷ïõí %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
 #, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"Áõôü åßíáé åëåýèåñï ëïãéóìéêü êáé ìðïñåß íá äéáíÝìåôáé õðü ôïõò üñïõò ôïõ "
-"GNU GPL."
+msgid "examining hdlist file [%s]"
+msgstr "áíÜãíùóç áñ÷åßïõ hdlist [%s]"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "ÐñïóðÜèåéá ãéá ðéï äõíáôÞ åãêáôÜóôáóç (--force); (í/Ï) "
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "åðáíåíôüðéóç %s êáôá÷ùñÞóåùí óôï depslist"
 
-#: po/placeholder.h:171 po/placeholder.h:269
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "ËõðÜìáé, êáêÞ åðéëïãÞ, ðñïóðáèÞóôå îáíÜ\n"
+#: po/placeholder.h:205 po/placeholder.h:445
+#, fuzzy
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  --group         - ôýðùóç ôï tag group: group."
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "áäõíáìßá êáôåâÜóìáôïò ôùí ðçãáßùí (source) ðáêÝôùí, åãêáôÜëåéøç"
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+#, fuzzy
+msgid "...retrieving done"
+msgstr "áíÜêôçóç [%s]"
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "installing %s\n"
-msgstr "åãêáôÜóôáóç %s\n"
+msgid "selecting %s using obsoletes"
+msgstr "åðéëïãÞ %s ÷ñÞóç áðáñ÷áéùìÝíïõ"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ðáñáêáëþ âÜëôå ôï ìÝóï ìå üíïìá \"%s\" óôç óõóêåõÞ [%s]"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "áäõíáìßá êáôåâÜóìáôïò ôùí ðçãáßùí (source) ðáêÝôùí, åãêáôÜëåéøç"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "selecting %s by selection on files"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "ÐáôÞóôå enter üôáí ôåëåéþóåôå..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "ôßðïôá äåí ãñÜöôçêå óôï áñ÷åßï ëßóôáò ãéá ôï \"%s\""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "Ìüíï ï õðåñ÷ñÞóôçò ìðïñåß íá åãêáôáóôÞóåé ôïðéêÜ ðáêÝôá"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
 #, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "¸íá åê ôùí ðáñáêÜôù ðáêÝôùí áðáéôåßôáé:"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"äéáãñáöÞ ôïõ %s ãéá áíáâÜèìéóç ......\n"
+" óôï %s áöïý äåí ãßíåôáé íá áíáâáèìéóôåß áëëéþò"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:296
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"äéáãñáöÞ ôïõ %s ãéá áíáâÜèìéóç ...\n"
+" óôï %s êáèþò äåí èá áíáâáèìéóôåß óùóôÜ!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"Áõôü åßíáé åëåýèåñï ëïãéóìéêü êáé ìðïñåß íá äéáíÝìåôáé õðü ôïõò üñïõò ôïõ "
+"GNU GPL."
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -840,7 +1009,7 @@ msgstr ""
 "%s\n"
 "ç <ó÷åôéêÞ äéáäñïìÞ ôïõ hdlist> ëåßðåé\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -862,17 +1031,7 @@ msgstr ""
 "       http://<host>/<path> with <relative filename of hdlist>\n"
 "       removable_<óõóêåõÞ>://<path>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "áäõíáìßá äçìéïõñãßáò ôïõ ìÝóïõ \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "áäõíáìßá áíáâÜèìéóçò ôïõ ìÝóïõ \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -880,12 +1039,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  --all           - ôýðùóå üëá ôá tags."
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -894,17 +1048,7 @@ msgstr ""
 "%s\n"
 "ç <ó÷åôéêÞ äéáäñïìÞ ôïõ hdlist> ëåßðåé\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --group         - ôýðùóç ôï tag group: group."
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  --group         - ôýðùóç ôï tag group: group."
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -913,59 +1057,7 @@ msgstr ""
 "%s\n"
 "ôï `with' ëåßðåé áðü ôï ftp media\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-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"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"ç êáôá÷þñçóç ðñïò áíáâÜèìéóç ëåßðåé\n"
-"(Ýíá åê ôùí %s)\n"
-
-#: po/placeholder.h:234
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  --group         - ôýðùóç ôï tag group: group."
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"ôßðïôá ãéá áíáâÜèìéóç (÷ñçóéìïðïéÞóôå urpmi.addmedia ãéá ðñïóèÞêç ìÝóïõ)\n"
-
-#: po/placeholder.h:236
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --all           - ôýðùóå üëá ôá tags."
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"ôßðïôá ãéá äéáãñáöÞ (÷ñçóéìïðïéÞóôå urpmi.addmedia ãéá ðñïóèÞêç ìÝóïõ)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -974,12 +1066,7 @@ msgstr ""
 "ç åðéëïãÞ ðñïò äéáãñáöÞ ëåßðåé\n"
 "(Ýíá Ýê ôùí %s)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  --all           - ôýðùóå üëá ôá tags."
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -991,35 +1078,28 @@ msgstr ""
 "\n"
 "Üãíùóôåò åðéëïãÝò '%s'\n"
 
-#: po/placeholder.h:252
-#, fuzzy
-msgid "  -h             - print this help message.\n"
-msgstr "  --all           - ôýðùóå üëá ôá tags."
-
-#: po/placeholder.h:254
+#: po/placeholder.h:429
 #, fuzzy
-msgid "  -g             - print groups too with name.\n"
-msgstr "  --group         - ôýðùóç ôï tag group: group."
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: áäõíáìßá áíÜãíùóçò rpm áñ÷åßïõ \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\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"
 
-#: po/placeholder.h:258
-#, fuzzy
-msgid "  -r             - print version and release too with name.\n"
-msgstr "                    ãñáììÞ åíôïëþí áëëÜ ÷ùñßò üíïìá ðáêÝôïõ)."
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"ç êáôá÷þñçóç ðñïò áíáâÜèìéóç ëåßðåé\n"
+"(Ýíá åê ôùí %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1031,45 +1111,12 @@ msgstr ""
 "Áõôü åßíáé åëåýèåñï ëïãéóìéêü êáé ìðïñåß íá äéáíÝìåôáé õðü ôïõò üñïõò ôïõ "
 "GNU GPL."
 
-#: po/placeholder.h:266
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                    ãñáììÞ åíôïëþí áëëÜ ÷ùñßò üíïìá ðáêÝôïõ)."
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"êÜðïéï ðáêÝôï ðñÝðåé íá äéáãñáöåß ãéá íá áíáâáèìéóôåß, áõôü äåí "
-"õðïóôçñßæåôáé áêüìá\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: Üãíùóôç ðáñÜìåôñïò \"-%s\", åëÝãîôå ôçí óýíôáîç ìå ôï --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1113,18 +1160,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "÷ñÞóç: urpmi.update [-a] <üíïìá> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "÷ñÞóç: urpmi.removemedia [-a] <üíïìá> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "÷ñÞóç: urpmi.removemedia [-a] <üíïìá> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "÷ñÞóç: urpmi.update [-a] <üíïìá> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/eo.po b/po/eo.po
index 1a1094a8..6b36cbcd 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-09-14 07:50-0500\n"
 "Last-Translator: D. Dale Gulledge <dsplat@rochester.rr.com>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -25,27 +25,31 @@ msgstr ""
 "Aýtomata instalado de paka¼oj...\n"
 "Vi petis instaladon de paka¼o $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Æu tio estas bona?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Jes"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Nuligu"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "JjYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (J/n) "
 
@@ -53,16 +57,16 @@ msgstr " (J/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: ordono ne trovata\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmq versio %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Kopirajtita (C) 1999, 2000, 2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
@@ -70,749 +74,910 @@ msgstr ""
 "Æi tiu estas libera programo kaj vi rajtas redistribui øi sub la kondiæoj\n"
 "de la GNU GPL."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "uzado: urpmf [<opcioj>] <dosiero>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - ne printu etikedonomon (defaýlto se neniu etikedo estas"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    donata en ordonolinio en interaga reøimo)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - printu æiujn etikedojn."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - printu etikedonomon: rpm-an dosieronomon (supozata se "
 "neniu"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    etikedo donata en ordonolinio sed sen paka¼nomo)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - printu etikedan grupon: group."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --group         - printu etikedan grandecon: size."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --group         - printu etikedan serian: serial."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --group         - printu etikedan resumon: summary."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --group         - printu etikedan priskribon: description."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 "  --provides      - printu etikedan provizon: æiuj provizoj (pluraj linioj)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 "  --requires      - printu etikedan postulon: æiuj postuloj (pluraj linioj)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 "  --files         - printu etikedajn dosierojn: æiuj dosieroj (pluraj "
 "linioj)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --conflicts     - printu etikedajn konfliktojn: æiuj konfliktoj (pluraj "
 "linioj)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - printu etikedajn arkaikojn: æiuj arkaikoj (pluraj "
 "linioj)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 "  --prereqs       - printu etikedajn antaýkondiæojn: æiuj antaýkondiæoj "
 "(pluraj linioj)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "provu `urpmf --help' por pli da opcioj"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "ne povas skribi konfigurodosieron [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-#, fuzzy
-msgid "retrieving rpms files..."
-msgstr "reprenas [%s]"
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  --all           - printu æiujn etikedojn."
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "ne povis trovi listdosieron por \"%s\", ignoris medion"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "nenio por skribi en listdosiero por \"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "ne povis trovi listdosieron por \"%s\", ignoris medion"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ne povis analizi hdlist dosieron de \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "skribis nenion en listdosiero por \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, fuzzy, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "reprenas [%s]"
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "ne povis atingi listdosieron de \"%s\", ignoris medion"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "paka¼o %s ne estis trovata."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "malmuntas %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "forigas %d jam ne uzatajn æapdosierojn en kaþejo"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr "medio \"%s\" provis uzi jam uzita \"hdlist\", ignoris medion"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "legas \"hdlist\" dosieron [%s]"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, 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"
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "Provas forigi neekzistantan medion \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "legas \"hdlist\" dosieron [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, 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]"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "konservas nur dosierojn al kiuj \"provides\"-a dosiero aludas"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "ne povis konstrui syntezan dosieron por medio \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "trovis %d æapdosierojn en kaþejo"
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "provas elekti neekzistantan medion \"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "evitu elekti %s æar øia lokallingvo ne estas jam elektita"
+msgid "unable to update medium \"%s\"\n"
+msgstr "ne povis øisdatigi medion \"%s\"\n"
 
-#: po/placeholder.h:55
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"forigas %s por øisdatigi ...\n"
-" al %s æar øi ne estos øisdatigata alie"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+#, fuzzy
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  --all           - printu æiujn etikedojn."
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medio \"%s\" jam ekzistas"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ne povis skribi listdosieron de \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "skribu konfiguran dosieron [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "neniu paka¼o nomata %s"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Provu instaladon eæ pli forte (--force)? (j/N) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ne povis trovi \"hdlist\"-an dosieron por \"%s\", ignoris medion"
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "ne povis trovi æiujn sintezadodosierojn, per \"parsehdlist\"-a servilo"
+msgid " (y/N) "
+msgstr " (J/n) "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ne povis trovi \"hdlist\"-an dosieron por \"%s\", ignoris medion"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"Por øisdatigi, iu paka¼o devas esti forprenata.  Æi tiu ne jam estas "
+"subtenata.\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "muntas %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, 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"
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "legu \"depslist\" dosieron [%s]"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+#, fuzzy
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --group         - printu etikedan grupon: group."
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne povis krei medion \"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nenio por forpreni (uzu urpmi.addmedia por aldoni medion)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "malbone formata enigo: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
-"ekzistas plurajn paka¼ojn kiuj havas la saman rpm-an dosiernomon \"%s\""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, 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:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Premu la enigklavon kiam øi estas finata..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr "medio \"%s\" provis uzi jam uzitan liston, ignoras medion"
 
-#: po/placeholder.h:76
+#: po/placeholder.h:74 po/placeholder.h:448
 #, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "reprenas [%s]"
+msgid "  -h             - print this help message.\n"
+msgstr "  --all           - printu æiujn etikedojn."
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ne povas atingi \"hdlist\" dosieron de \"%s\", ignoris medion"
+#: po/placeholder.h:75 po/placeholder.h:450
+#, fuzzy
+msgid "  -g             - print groups too with name.\n"
+msgstr "  --group         - printu etikedan grupon: group."
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "ne povis registri rpm-an dosieron"
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  --all           - printu æiujn etikedojn."
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ne povas inspekti listdosieron por \"%s\", ignoris medion"
+#: po/placeholder.h:78 po/placeholder.h:407
+#, fuzzy
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  --group         - printu etikedan grupon: group."
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
+#: po/placeholder.h:79 po/placeholder.h:454
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr "                    etikedo donata en ordonolinio sed sen paka¼nomo)."
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "nekohera listdosiero por \"%s\", medio ignorita"
-
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "kopiado de [%s] malsukcesis"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "ne povis analizi øuste [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nenio por øisdatigi (uzu urpmi.addmedia por aldoni medion)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "legu \"depslist\" dosieron [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "ne povis analizi hdlist dosieron de \"%s\""
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-#, fuzzy
-msgid "...copying done"
-msgstr "reprenas [%s]"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "ne povis krei medion \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "legas \"hdlist\" dosieron [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "sintakseraro en konfigura dosiero æe linio %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "uzado: urpmi.removemedia [-a] <name> ..."
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "konstruas \"hdlist\" [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "eraro dum registri lokajn paka¼ojn"
-
-#: po/placeholder.h:99
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "reprenas [%s]"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "malkohera medio \"%s\" indikita forigebla sed ne vere"
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "skribis nenion en listdosiero por \"%s\""
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "ne povis konstrui \"hdlist\": %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medio \"%s\" ne estas elektata"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nevalida rpm-a dosiernomo [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "nekonata dateno rilatigata kun %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "provas æirkaýiri ekzistantan medion \"%s:, evitas"
+msgid "What is your choice? (1-%d) "
+msgstr "Kiu estas via elekto? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ne povis atingi listdosieron de \"%s\", ignoris medion"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "evitu elekti %s æar nesufiæe da dosieroj estos øisdatigataj"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne povis atingi rpm-an dosieron [%s]"
 
-#: po/placeholder.h:111
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"forigas %s por øisdatigi ...\n"
-" al %s æar øi ne øisdatigos øuste!"
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "translokigis %s enskriba¼ojn en \"depslist\""
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Bedaýrinde, nevalida elekto, reprovu\n"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "ne povis atingi medion \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr "ne povis øuste analizi [%s] je valoro \"%s\""
+msgid "relocated %s entries in depslist"
+msgstr "translokigis %s enskriba¼ojn en \"depslist\""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "provas elekti neekzistantan medion \"%s\""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "La sekvantaj paka¼oj enhavas %s: %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "ne povis øuste analizi [%s] je valoro \"%s\""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "neniom da rpm-aj dosieroj trovataj de [%s]"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "legas \"hdlist\" dosieron [%s]"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ne povis determini medion de æi tiu \"hdlist\" dosiero [%s]"
+
+#: po/placeholder.h:119 po/placeholder.h:328
 #, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "translokigis %s enskriba¼ojn en \"depslist\""
+msgid "  --help         - print this help message.\n"
+msgstr "  --all           - printu æiujn etikedojn."
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "æio jam instalita"
 
-#: po/placeholder.h:123 urpm.pm:1897
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
 #, fuzzy
-msgid "...retrieving done"
+msgid "retrieving rpms files..."
 msgstr "reprenas [%s]"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "%s elektata per arkaika¼oj"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Unu el la sekvantaj paka¼oj estas bezonata:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Instalado malsukcesis"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr "ne povis atingi listdosieron de \"%s\", ignoris medion"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  --group         - printu etikedan grupon: group."
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "elektas %s per elektado je dosieroj"
+msgid "unmounting %s"
+msgstr "malmuntas %s"
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "forigas %d jam ne uzatajn æapdosierojn en kaþejo"
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "skribis nenion en listdosiero por \"%s\""
+msgid "removing medium \"%s\""
+msgstr "Provas forigi neekzistantan medion \"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "ne povis konstrui syntezan dosieron por medio \"%s\""
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "provas elekti neekzistantan medion \"%s\""
+
+#: po/placeholder.h:144 po/placeholder.h:447
+#, fuzzy
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --all           - printu æiujn etikedojn."
+
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ne povis determini medion de æi tiu \"hdlist\" dosiero [%s]"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "evitu elekti %s æar øia lokallingvo ne estas jam elektita"
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "skribu konfiguran dosieron [%s]"
 
-#: po/placeholder.h:132
+#: po/placeholder.h:150 po/placeholder.h:249
 #, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr "  --all           - printu æiujn etikedojn."
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "ne povis trovi æiujn sintezadodosierojn, per \"parsehdlist\"-a servilo"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "æio jam instalita"
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, 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"
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "legu \"depslist\" dosieron [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ne povis krei medion \"%s\"\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr ""
+"ekzistas plurajn paka¼ojn kiuj havas la saman rpm-an dosiernomon \"%s\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "Por plenumi dependa¼ojn, la sekvantaj paka¼oj estas instalonta (%d mb)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "reprenas [%s]"
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  --all           - printu æiujn etikedojn."
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ne povas atingi \"hdlist\" dosieron de \"%s\", ignoris medion"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Unu el la sekvantaj paka¼oj estas bezonata:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "ne povis registri rpm-an dosieron"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ne povas inspekti listdosieron por \"%s\", ignoris medion"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "nekohera listdosiero por \"%s\", medio ignorita"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Instalado malsukcesis"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "kopiado de [%s] malsukcesis"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+#, fuzzy
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "                    etikedo donata en ordonolinio sed sen paka¼nomo)."
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "ne povis analizi hdlist dosieron de \"%s\""
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr "  --all           - printu æiujn etikedojn."
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+#, fuzzy
+msgid "...copying done"
+msgstr "reprenas [%s]"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "Por plenumi dependa¼ojn, la sekvantaj paka¼oj estas instalonta (%d mb)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
+#: po/placeholder.h:180 po/placeholder.h:277
 #, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  --group         - printu etikedan grupon: group."
+msgid "copying hdlists file..."
+msgstr "legas \"hdlist\" dosieron [%s]"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "sintakseraro en konfigura dosiero æe linio %s"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Provu instaladon sen kontroli dependa¼ojn? (j/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "eraro dum registri lokajn paka¼ojn"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "skribis nenion en listdosiero por \"%s\""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
+msgstr "ne povis konstrui \"hdlist\": %s"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "medio \"%s\" ne estas elektata"
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "provas æirkaýiri ekzistantan medion \"%s:, evitas"
+
+#: po/placeholder.h:191 po/placeholder.h:355
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "  --all           - printu æiujn etikedojn."
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Kiu estas via elekto? (1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "instalas %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Bonvole enþovu la medion nomata \"%s\" en aparato [%s]"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "La sekvantaj paka¼oj enhavas %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
 #, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"Æi tiu estas libera programo kaj vi rajtas redistribui øi sub la kondiæoj\n"
-"de la GNU GPL."
+msgid "examining hdlist file [%s]"
+msgstr "legas \"hdlist\" dosieron [%s]"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Provu instaladon eæ pli forte (--force)? (j/N) "
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "translokigis %s enskriba¼ojn en \"depslist\""
 
-#: po/placeholder.h:171 po/placeholder.h:269
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Bedaýrinde, nevalida elekto, reprovu\n"
+#: po/placeholder.h:205 po/placeholder.h:445
+#, fuzzy
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  --group         - printu etikedan grupon: group."
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "Ne povas preni fontajn paka¼ojn.  Mi æesiøas."
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+#, fuzzy
+msgid "...retrieving done"
+msgstr "reprenas [%s]"
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "installing %s\n"
-msgstr "instalas %s\n"
+msgid "selecting %s using obsoletes"
+msgstr "%s elektata per arkaika¼oj"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Bonvole enþovu la medion nomata \"%s\" en aparato [%s]"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "Ne povas preni fontajn paka¼ojn.  Mi æesiøas."
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "elektas %s per elektado je dosieroj"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Premu la enigklavon kiam øi estas finata..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "skribis nenion en listdosiero por \"%s\""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "Nur superuzulo rajtas instali lokajn paka¼ojn"
 
-#: po/placeholder.h:182 urpmi:216
-#, 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:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"forigas %s por øisdatigi ...\n"
+" al %s æar øi ne estos øisdatigata alie"
+
+#: po/placeholder.h:296
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"forigas %s por øisdatigi ...\n"
+" al %s æar øi ne øisdatigos øuste!"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"Æi tiu estas libera programo kaj vi rajtas redistribui øi sub la kondiæoj\n"
+"de la GNU GPL."
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -821,7 +986,7 @@ msgstr ""
 "%s\n"
 "<relativa dosieronomo de hd-listo> mankas\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -845,17 +1010,7 @@ msgstr ""
 "listo>\n"
 "       removable_<aparato>://<dosierindiko>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ne povis krei medion \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ne povis øisdatigi medion \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -863,12 +1018,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  --all           - printu æiujn etikedojn."
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -877,17 +1027,7 @@ msgstr ""
 "%s\n"
 "<relativa dosieronomo de hd-listo> mankas\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --group         - printu etikedan grupon: group."
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  --group         - printu etikedan grupon: group."
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -896,57 +1036,7 @@ msgstr ""
 "%s\n"
 "`with' mankanta por ftp medio\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"uzado: urpmi.removemedia [-a] <nomo> ...\n"
-"kie <nomo> estas nomo de medio por depreni.\n"
-"   -a    elektu æiujn mediojn.\n"
-"\n"
-"nekonataj opcioj '%s'\n"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, 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"
-
-#: po/placeholder.h:234
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  --group         - printu etikedan grupon: group."
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nenio por øisdatigi (uzu urpmi.addmedia por aldoni medion)\n"
-
-#: po/placeholder.h:236
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --all           - printu æiujn etikedojn."
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nenio por forpreni (uzu urpmi.addmedia por aldoni medion)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -955,12 +1045,7 @@ msgstr ""
 "la enskriba¼o por forpreni mankas\n"
 "(unu el %s)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  --all           - printu æiujn etikedojn."
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -972,35 +1057,28 @@ msgstr ""
 "\n"
 "nekonataj opcioj '%s'\n"
 
-#: po/placeholder.h:252
-#, fuzzy
-msgid "  -h             - print this help message.\n"
-msgstr "  --all           - printu æiujn etikedojn."
-
-#: po/placeholder.h:254
+#: po/placeholder.h:429
 #, fuzzy
-msgid "  -g             - print groups too with name.\n"
-msgstr "  --group         - printu etikedan grupon: group."
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"uzado: urpmi.removemedia [-a] <nomo> ...\n"
+"kie <nomo> estas nomo de medio por depreni.\n"
+"   -a    elektu æiujn mediojn.\n"
+"\n"
+"nekonataj opcioj '%s'\n"
 
-#: po/placeholder.h:258
-#, fuzzy
-msgid "  -r             - print version and release too with name.\n"
-msgstr "                    etikedo donata en ordonolinio sed sen paka¼nomo)."
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, 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"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1012,45 +1090,12 @@ msgstr ""
 "Æi tiu estas libera programo kaj vi rajtas redistribui øi sub la kondiæoj\n"
 "de la GNU GPL."
 
-#: po/placeholder.h:266
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                    etikedo donata en ordonolinio sed sen paka¼nomo)."
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"Por øisdatigi, iu paka¼o devas esti forprenata.  Æi tiu ne jam estas "
-"subtenata.\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1094,18 +1139,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "uzado: urpmi.update [-a] <nomo> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "uzado: urpmi.removemedia [-a] <name> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "uzado: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "uzado: urpmi.update [-a] <nomo> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/es.po b/po/es.po
index 6cb0a067..67c0d8d1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.2\n"
-"POT-Creation-Date: 2002-01-30 22:25+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2002-01-30 23:50-0300\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: Spanish <cooker-i18n@linux-mandrake.com>\n"
@@ -28,27 +28,31 @@ msgstr ""
 "Instalación automática de paquetes...\n"
 "Pidió la instalación del paquete $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "¿Está todo bien?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Aceptar"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "SsYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (S/n) "
 
@@ -56,16 +60,16 @@ msgstr " (S/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: comando no encontrado\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf versión %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
@@ -73,635 +77,721 @@ msgstr ""
 "Este software es libre y se puede redistribuir bajo los términos de la "
 "licencia GNU GPL."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "utilización: urpmf [opciones] <archivo>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - no imprime nombre de etiqueta (por defecto si no hay "
 "etiq."
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    en línea comando, incompat. con modo interactivo)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - imprime todas las etiquetas."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - imprime nombre etiqu.: nombre arch. rpm (se asume si no"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    etiq. en línea comando pero sin nombre paquete)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - imprime etiqueta de grupo: group."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - imprime etiqueta de tamaño: size."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - imprime etiqueta de serie: serial."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - imprime etiqueta resumen: summary."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - imprime etiqueta de descripción: description."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 "  --provides      - imprime etiq. provides: todo que proporciona (lín. "
 "múlt.)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 "  --requires      - imprime etiq. requires: todo que precisa (lín. múlt.)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 "  --files         - imprime etiq. archivos: todos archivos (lín. múlt.)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --conflicts     - imprime etiq. conflicts: todos conflictos (lín. múlt.)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - imprime etiq. obsoletes: todo obsoleto (lín. múlt.)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 "  --prereqs       - imprime etiq. prereqs: todos prereqs. (lín. múlt.)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "pruebe urpmf --help para más opciones"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr "no se encontró la lista completa de soportes"
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "no se puede escribir el archivo de configuración [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1890
-msgid "retrieving rpms files..."
-msgstr "recuperando archivos rpm..."
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr "examinando la base de datos de urpmi al completo"
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "usar dispositivo extraíble diferente [%s] para \"%s\""
-
-#: po/placeholder.h:33
-#, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr "nada para escribir en el archivo de lista para \"%s\""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"no se puede acceder al primer soporte de la instalación (no se encontró el "
-"archivo Mandrake/base/hdlists)"
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  -y             - forzar búsqueda difusa.\n"
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, 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"
 
-#: po/placeholder.h:36
+#: po/placeholder.h:33 po/placeholder.h:218
+#, c-format
+msgid "nothing to write in list file for \"%s\""
+msgstr "nada para escribir en el archivo de lista para \"%s\""
+
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "no se puede interpretar el archivo hdlist de \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "nada escrito en el archivo de lista para \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+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"
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+"  --auto-select  - selección auto. de paquetes para actualizar sistema.\n"
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "recuperando descripción de archivo de \"%s\"..."
 
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr "no se puede acceder al primer soporte de la instalación"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "no se encontró el paquete %s."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "desmontando %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "quitando %d encabezados obsoletos del cache"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "no se encuentra el archivo hdlist para el soporte \"%s\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr "soporte \"%s\" intenta utilizar un hdlist utilizado, soporte ignorado"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr "<carácter no imprimible>"
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr "problema al leer el archivo hdlist, se intenta de nuevo"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
+msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, 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"
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "quitando el soporte \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr "problema al leer el archivo hdlist, se intenta de nuevo"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, 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]"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "manteniendo sólo los archivos referenciados en \"provides\""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "no se puede generar el archivo de síntesis para el soporte \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "se encontraron %d encabezados en el cache"
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "intentando seleccionar soportes múltiples \"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2123
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
-"evitar seleccionar %s como sus locales. El lenguaje no está seleccionado aún."
+msgid "unable to update medium \"%s\"\n"
+msgstr "no se puede actualizar soporte \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"borrando %s para actualizar a %s ...\n"
-". ya que no se podrá actualizar de otra manera"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - limpia dir. encabezados de cache.\n"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "ya existe el soporte \"%s\""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "no se puede escribir el archivo de lista de \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "escrito archivo de configuración [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+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"
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "ningún paquete llamado %s"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "se generó el archivo de síntesis hdlist para el soporte \"%s\""
-
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr ""
-"no se puede construir el archivo de sintesis hdlist, se usa el metodo "
-"parsehdlist"
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "¿Intentar con más fuerza la instalación (--force)? (s/N) "
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "no se puede encontrar el archivo hdlist para \"%s\", soporte ignorado"
 
-#: po/placeholder.h:66
+#: po/placeholder.h:58 po/placeholder.h:248
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "se generó el archivo de síntesis hdlist para el soporte \"%s\""
+
+#: po/placeholder.h:59 po/placeholder.h:251
 msgid "urpmi database locked"
 msgstr "base de datos de urpmi bloqueada"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, c-format
-msgid "mounting %s"
-msgstr "montando %s"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+msgid " (y/N) "
+msgstr " (s/N) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+"  -a             - selecciona todas coincidencias en línea de comando.\n"
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
-"no se puede utilizar el soporte \"%s\" como archivo de lista que ya utiliza "
-"otro soporte"
+"se tiene que quitar algún paquete para poder actualizarlo, todavía esto no "
+"está soportado\n"
 
-#: po/placeholder.h:69
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "examinando el archivo de síntesis [%s]"
+msgid "mounting %s"
+msgstr "montando %s"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - fuerza generación de archivos hdlist.\n"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget falló: salió con %d o señal %d\n"
 
-#: po/placeholder.h:71
-#, 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\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nada para quitar (use urpmi.addmedia para agregar un soporte)\n"
 
-#: po/placeholder.h:72 urpm.pm:1885
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "entrada mal formada [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+"  -u             - borra paquete si hay versión más reciente instalada.\n"
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, 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 "One of the following packages is needed to install %s:"
+msgstr "Uno de los paquetes siguientes es necesario para instalar %s:"
 
-#: po/placeholder.h:74
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Pulse «Intro» cuando esté hecho..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr "...falló la copia"
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr "soporte \"%s\" intenta utilizar una lista ya usada, soporte ignorado"
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr "recuperando archivo hdlists..."
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "no se puede acceder al archivo hdlist de \"%s\", soporte ignorado"
-
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "no se puede registrar el archivo rpm"
-
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr "  -h             - muestra este mensaje de ayuda.\n"
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr ""
-"no se puede inspeccionar el archivo de lista para \"%s\", soporte ignorado"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr "  -g             - imprime grupos también con nombres.\n"
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "demasiados puntos de montaje para medios extraíbles \"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - selecciona todos los soportes.\n"
 
-#: po/placeholder.h:82
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "descripción de hdlist no válida \"%s\" en archivo hdlists"
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "archivo de lista no coherente para \"%s\", soporte ignorado"
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  -h             - intenta encontrar y usar arch síntesis o hdlist.\n"
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "falló la copia de [%s]"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
+msgstr "  -r             - imprime versión y liberación junto con nombre.\n"
+
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - imprime versión, liberación y arq con nombre.\n"
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
+"  --auto         - selección automática de paquetes buenos en opciones.\n"
+
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "no se puede analizar correctamente [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nada para actualizar (use urpmi.addmedia para agregar un soporte)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
 msgid "read synthesis file [%s]"
 msgstr "leído el archivo de síntesis [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "no se puden analizar los datos de síntesis de %s"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "no se encontró webfetch (curl o wget, por ejemplo)\n"
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "recuperando hdlist fuente (o síntesis) de \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
+msgstr ""
+"  -c             - selecciona método completo para resolver clausuras.\n"
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr "...copia hecha"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "no se puede crear soporte \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copiando hdlist fuente (o síntesis) de \"%s\"..."
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
-msgstr "copiando archivo hdlists..."
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, 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 "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opción desconocida \"-%s\", verifique el uso con --help\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "uso: urpme [-a] [--auto] <paquetes...>\n"
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "generando hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1820
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "no se puede leer el archivo rpm [%s] del soporte \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr "  --media         - usa sólo soportes listados por coma.\n"
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr "añadido soporte %s"
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "no se puede leer el archivo rpm [%s] del soporte \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "falló la recuperación de hdlist fuente (o síntesis)"
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "error registrando paquetes locales"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tomar dispositivo extraíble como \"%s\""
-
-#: po/placeholder.h:100 urpm.pm:1897
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...falló la recuperación: %s"
 
-#: po/placeholder.h:101 urpm.pm:1836
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "soporte no coherente \"%s\" marcado como borrable, pero no borrado"
 
-#: po/placeholder.h:102
-#, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "copiando descripción de archivo de \"%s\"..."
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "no se puede generar el archivo hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1810 urpm.pm:1813 urpm.pm:1832
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "el soporte \"%s\" no está seleccionado"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nombre de archivo rpm no válido [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "datos desconocidos asociados a %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "intentando pasar al soporte existente \"%s\", evitando"
+msgid "What is your choice? (1-%d) "
+msgstr "¿Qué elige? (1-%d)"
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, 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"
 
-#: po/placeholder.h:109 urpm.pm:2111
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - usa wget para recuperar archivos remotos.\n"
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 "evitar seleccionar %s porque no hay suficientes archivos que serán "
 "actualizados"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "no se puede acceder al archivo rpm [%s]"
 
-#: po/placeholder.h:111
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Disculpe, elección incorrecta, reinténtelo\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"borrando %s para actualizar a %s ...\n"
-"  ¡porque no actualizaría correctamente!"
+msgid "unable to access medium \"%s\""
+msgstr "no se puede acceder al soporte \"%s\""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "relocalizadas %s entradas en la lista de dependencias"
 
-#: po/placeholder.h:116 urpm.pm:1847
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - usa curl para recuperar archivos remotos.\n"
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "no se puede acceder al soporte \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "intentando seleccionar el soporte inexistente \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr "no se puede analizar correctamente [%s] sobre el valor \"%s\""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "intentando seleccionar el soporte inexistente \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "no se encontraron archivos rpm en [%s]"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr "no se encuentra curl\n"
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Los siguientes paquetes contienen %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "no se puede determinar el soporte de este archivo hdlist [%s]"
 
-#: po/placeholder.h:120
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - imprime este mensaje de ayuda.\n"
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "ya está todo instalado"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr "recuperando archivos rpm..."
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "no se encontraron archivos rpm en [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "usar dispositivo extraíble diferente [%s] para \"%s\""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Uno de los paquetes siguientes es necesario:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"no se puede acceder al primer soporte de la instalación (no se encontró el "
+"archivo Mandrake/base/hdlists)"
 
-#: po/placeholder.h:121
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "examinando el archivo hdlist [%s]"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: no se puede leer el archivo rpm \"%s\"\n"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
-msgstr "no hay entradas reubicadas en depslist"
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1895
-msgid "...retrieving done"
-msgstr "...recuperación hecha"
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Falló la instalación"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr "no se puede acceder al primer soporte de la instalación"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -p             - no buscar en 'provides' para encontrar paquete.\n"
 
-#: po/placeholder.h:124 urpm.pm:2004
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "seleccionar %s utilizando obsoletos"
+msgid "unmounting %s"
+msgstr "desmontando %s"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl falló: salió con %d o señal %d\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "quitando %d encabezados obsoletos del cache"
 
-#: po/placeholder.h:126 urpm.pm:2120
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "seleccionando %s por la selección de archivos"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "no se encuentra el archivo hdlist para el soporte \"%s\""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
-msgstr "no se encuentra curl\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr "<carácter no imprimible>"
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modo informativo.\n"
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "copiando lista fuente de \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "quitando el soporte \"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr "no se encuentra wget\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "no se puede generar el archivo de síntesis para el soporte \"%s\""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:143 po/placeholder.h:238
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "no se puede determinar el soporte de este archivo hdlist [%s]"
+msgid "trying to select multiple medium: %s"
+msgstr "intentando seleccionar soportes múltiples \"%s\""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - imprime este mensaje de ayuda.\n"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - selecciona todos los soportes no extraíbles.\n"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "ya está todo instalado"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr "  se instalan los nombres o archivos rpm dados en línea de comandos.\n"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: opción desconocida \"-%s\", verifique el uso con --help\n"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
+"evitar seleccionar %s como sus locales. El lenguaje no está seleccionado aún."
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  -y             - forzar búsqueda difusa.\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+"  --complete     - usa servidor parsehdlist para completar selección.\n"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Uno de los paquetes siguientes es necesario:"
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "escrito archivo de configuración [%s]"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - usa sólo soporte de actualización.\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr ""
+"no se puede construir el archivo de sintesis hdlist, se usa el metodo "
+"parsehdlist"
 
-#: po/placeholder.h:138 urpmi:321
+#: po/placeholder.h:151 po/placeholder.h:413
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Falló la instalación, no se encuentran algunos archivos.\n"
-"Puede querer actualizar su base de datos de urpmi"
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr "  --distrib      - crea automát. todos soportes de instalación\n"
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --auto         - selección automática de paquetes buenos en opciones.\n"
+"no se puede utilizar el soporte \"%s\" como archivo de lista que ya utiliza "
+"otro soporte"
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Falló la instalación"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
+msgstr "examinando el archivo de síntesis [%s]"
 
-#: po/placeholder.h:145 po/placeholder.h:270
+#: po/placeholder.h:158 po/placeholder.h:256
+#, 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\""
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, 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\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, c-format
 msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --auto-select  - selección auto. de paquetes para actualizar sistema.\n"
+"Para resolver las dependencias, se desinstalarán los paquetes siguientes (%d "
+"MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr "recuperando archivo hdlists..."
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: opción desconocida \"-%s\", verifique el uso con --help\n"
+
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "no se puede acceder al archivo hdlist de \"%s\", soporte ignorado"
+
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "no se puede registrar el archivo rpm"
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"no se puede inspeccionar el archivo de lista para \"%s\", soporte ignorado"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "demasiados puntos de montaje para medios extraíbles \"%s\""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "archivo de lista no coherente para \"%s\", soporte ignorado"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - usa sólo soporte de actualización.\n"
 
-#: po/placeholder.h:147
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "falló la copia de [%s]"
+
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - extiende consulta a las dependencias del paquete.\n"
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "no se puden analizar los datos de síntesis de %s"
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "recuperando hdlist fuente (o síntesis) de \"%s\"..."
+
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - usar la interfaz X.\n"
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr "...copia hecha"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -709,123 +799,194 @@ msgid ""
 msgstr ""
 "Para resolver las dependencias, se instalarán los paquetes siguientes (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -p             - no buscar en 'provides' para encontrar paquete.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr "copiando archivo hdlists..."
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, 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"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "¿Intentar de instalar sin verificar las dependencias? (s/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr "  --media         - usa sólo soportes listados por coma.\n"
-
-#: po/placeholder.h:152
-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"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "error registrando paquetes locales"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modo informativo.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "tomar dispositivo extraíble como \"%s\""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - permite buscar en provides para encontrar paquete.\n"
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr "  se instalan los nombres o archivos rpm dados en línea de comandos.\n"
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modo silencioso.\n"
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr ""
-"  --complete     - usa servidor parsehdlist para completar selección.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "copiando descripción de archivo de \"%s\"..."
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "¿Qué elige? (1-%d)"
+msgid "unable to build hdlist: %s"
+msgstr "no se puede generar el archivo hdlist: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - usa wget para recuperar archivos remotos.\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "el soporte \"%s\" no está seleccionado"
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"urmpi versión %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Esto es software libre y se debe redistribuir bajo los términos de la "
-"licencia pública general GNU.\n"
-"uso:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "intentando pasar al soporte existente \"%s\", evitando"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "¿Intentar con más fuerza la instalación (--force)? (s/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modo silencioso.\n"
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - fuerza invocación aunque no existan algunos paquetes.\n"
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Disculpe, elección incorrecta, reinténtelo\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
-"  -a             - selecciona todas coincidencias en línea de comando.\n"
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - usa curl para recuperar archivos remotos.\n"
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "instalando %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Por favor, inserte el soporte denominado \"%s\" en el dispositivo [%s]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Los siguientes paquetes contienen %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr "examinando el archivo hdlist [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr "no hay entradas reubicadas en depslist"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - crea sólo soporte de actualización.\n"
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+"  -d             - fuerza computación total de arch. depslist.ordered.\n"
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "no se pueden obtener los paquetes fuente, abortando"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Pulse «Intro» cuando esté hecho..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr "...recuperación hecha"
+
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "seleccionar %s utilizando obsoletos"
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl falló: salió con %d o señal %d\n"
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "seleccionando %s por la selección de archivos"
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "copiando lista fuente de \"%s\"..."
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 msgid "Only superuser is allowed to install packages"
 msgstr "Sólo el superusuario está autorizado a instalar paquetes"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr "no se encuentra wget\n"
+
+#: po/placeholder.h:240
 #, 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 ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"borrando %s para actualizar a %s ...\n"
+". ya que no se podrá actualizar de otra manera"
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"borrando %s para actualizar a %s ...\n"
+"  ¡porque no actualizaría correctamente!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Falló la instalación, no se encuentran algunos archivos.\n"
+"Puede querer actualizar su base de datos de urpmi"
+
+#: po/placeholder.h:348
+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"
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"urmpi versión %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"Esto es software libre y se debe redistribuir bajo los términos de la "
+"licencia pública general GNU.\n"
+"uso:\n"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
 "%s\n"
@@ -834,7 +995,7 @@ msgstr ""
 "%s\n"
 "no ha de dar <ruta relativa de hdlist> con --distrib"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -856,17 +1017,7 @@ msgstr ""
 "       removable://<ruta>\n"
 "y [opciones] es uno o varios de\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "no se puede crear soporte \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "no se puede actualizar soporte \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -876,11 +1027,7 @@ msgstr ""
 "\n"
 "opciones desconocidas '%s'\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - limpia dir. encabezados de cache.\n"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -889,15 +1036,7 @@ msgstr ""
 "%s\n"
 "falta <ruta relativa de hdlist>\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - fuerza generación de archivos hdlist.\n"
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  -h             - intenta encontrar y usar arch síntesis o hdlist.\n"
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -906,52 +1045,7 @@ msgstr ""
 "%s\n"
 "falta `with' para soporte por FTP\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - crea sólo soporte de actualización.\n"
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr "  --distrib      - crea automát. todos soportes de instalación\n"
-
-#: po/placeholder.h:218
-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"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, 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"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - fuerza computación total de arch. depslist.ordered.\n"
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nada para actualizar (use urpmi.addmedia para agregar un soporte)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - selecciona todos los soportes no extraíbles.\n"
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nada para quitar (use urpmi.addmedia para agregar un soporte)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -960,11 +1054,7 @@ msgstr ""
 "falta la entrada a quitar\n"
 "(una de %s)\n"
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - selecciona todos los soportes.\n"
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
@@ -972,33 +1062,24 @@ msgstr ""
 "uso: urpmi.removemedia [-a] <nombre> ...\n"
 "donde <nombre> es nombre del soporte a borrar.\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr "  -h             - muestra este mensaje de ayuda.\n"
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr "  -g             - imprime grupos también con nombres.\n"
+#: po/placeholder.h:429
+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"
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: no se puede leer el archivo rpm \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  los nombres o archivos rpm dados en línea de comandos se consultan.\n"
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr "  -r             - imprime versión y liberación junto con nombre.\n"
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - imprime versión, liberación y arq con nombre.\n"
+"falta la entrada a actualizar\n"
+"(una de %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1013,37 +1094,7 @@ msgstr ""
 "licencia pública general GNU.\n"
 "uso:\n"
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - extiende consulta a las dependencias del paquete.\n"
-
-#: po/placeholder.h:267
-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"
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-"  -c             - selecciona método completo para resolver clausuras.\n"
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"se tiene que quitar algún paquete para poder actualizarlo, todavía esto no "
-"está soportado\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opción desconocida \"-%s\", verifique el uso con --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
@@ -1051,30 +1102,24 @@ msgstr ""
 "  --headers      - extrae cabeceras para paquetes listados desde la\n"
 "                   bd de urpmi a stdout (sólo root).\n"
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-"  -u             - borra paquete si hay versión más reciente instalada.\n"
-
-#: urpm.pm:2028 urpm.pm:2037
+#: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
 msgstr "borrando %s para actualizar a %s ..."
 
-#: urpm.pm:2029 urpm.pm:2038
+#: urpm.pm:2031 urpm.pm:2040
 msgid ", $otherPackage, "
 msgstr ", $otherPackage, "
 
-#: urpm.pm:2029 urpm.pm:2038
+#: urpm.pm:2031 urpm.pm:2040
 msgid "));"
 msgstr "));"
 
-#: urpm.pm:2034
+#: urpm.pm:2036
 msgid "$p->{name}-$p->{version}-$p->{release}"
 msgstr "$p->{name}-$p->{version}-$p->{release}"
 
-#: urpm.pm:2044
+#: urpm.pm:2046
 msgid "$prefix/$_"
 msgstr "$prefix/$_"
 
@@ -1099,20 +1144,19 @@ msgstr ") . _("
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "uso: urpmi.update [opciones] <nombre> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "uso: urpmi.removemedia [-a] <nombre> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "uso: urpmi.removemedia [-a] <nombre> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "uso: urpmi.update [opciones] <nombre> ..."
 
 #: urpmq:34
 #, c-format
 msgid "urpmq version %s"
 msgstr "urpmq versión %s"
-
diff --git a/po/et.po b/po/et.po
index e7aab5f9..4da7098e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 1999-12-11 04:18+0100\n"
 "Last-Translator: Riho Kurg <rx@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -25,27 +25,31 @@ msgstr ""
 "Automaatne pakettide installimine...\n"
 "Soovisite paigaldada paketti $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Kas sobib?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "OK"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "EeNn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "JjYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (J/e) "
 
@@ -53,735 +57,888 @@ msgstr " (J/e) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: ei tunne seda käsku\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, fuzzy, c-format
 msgid "urpmf version %s"
 msgstr "urpmi versioon %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 #, fuzzy
 msgid "usage: urpmf [options] <file>"
 msgstr "kasutamine: rpmf [<fail>]"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ei saa uuendada andmekandjat \"%s\"\n"
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "ei saa uuendada andmekandjat \"%s\"\n"
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr ""
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "ei saa luua andmekandjat \"%s\"\n"
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, fuzzy, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "ei saa uuendada andmekandjat \"%s\"\n"
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "ei saa luua andmekandjat \"%s\"\n"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "ei saa uuendada andmekandjat \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ei saa luua andmekandjat \"%s\"\n"
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "paketti %s ei leitud\n"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Proovin paigaldada veel jõulisemalt (--force)? (j/E) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:64
-#, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "ei saa uuendada andmekandjat \"%s\"\n"
-
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "rpm andmebaasi päring ebaõnnestus\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "installitakse %s\n"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (J/e) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"uuendamiseks tuleks osa pakette eemaldada, kahjuks ei ole see aga veel "
+"võimalik\n"
 
-#: po/placeholder.h:69
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "ei saa luua andmekandjat \"%s\"\n"
+msgid "mounting %s"
+msgstr "installitakse %s\n"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr ""
+
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ei saa luua andmekandjat \"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ei ole midagi eemaldada (andmekandja lisamiseks urpmi.addmedia)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Vajalik on vähemalt üks järgnevatest pakettidest:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Vajutage Enter kui see on tehtud..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "ei saa luua andmekandjat \"%s\"\n"
-
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, fuzzy, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "ei saa uuendada andmekandjat \"%s\"\n"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ei ole midagi uuendada (andmekandja lisamiseks urpmi.addmedia)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "ei saa luua andmekandjat \"%s\"\n"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "ei saa uuendada andmekandjat \"%s\"\n"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr ""
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "ei saa luua andmekandjat \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: tundmatu võti \"-$1\", vaata igaks juhuks --help\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"kasutamine: urpmi [-h] [--auto] [--force] [-a] paketi_nimi "
+"[paketi_nimed...]\n"
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
-msgid "syntax error in config file at line %s"
+msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:94
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
+
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
-msgid "building hdlist [%s]"
+msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, fuzzy, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "ei saa luua andmekandjat \"%s\"\n"
 
-#: po/placeholder.h:96
-#, c-format
-msgid "added medium %s"
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "What is your choice? (1-%d) "
+msgstr "Millise(d) valite? (1-%d)"
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, fuzzy, c-format
-msgid "unable to build hdlist: %s"
+msgid "unable to access rpm file [%s]"
+msgstr "ei saa luua andmekandjat \"%s\"\n"
+
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Selline valik ei ole lubatud, proovige uuesti\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\""
 msgstr "ei saa uuendada andmekandjat \"%s\"\n"
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
-#, c-format
-msgid "invalid rpm file name [%s]"
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:114 po/placeholder.h:303
+#, fuzzy, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "ei saa luua andmekandjat \"%s\"\n"
+
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unknown data associated with %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
-#, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
-#, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ei saa luua andmekandjat \"%s\"\n"
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
 
-#: po/placeholder.h:111
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "kõik on juba installitud"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Vajalik on vähemalt üks järgnevatest pakettidest:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ei saa lugeda rpm-faili \"$_\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Installimine ebaõnnestus"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
 msgstr "ei saa uuendada andmekandjat \"%s\"\n"
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "unmounting %s"
+msgstr ""
+
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "removing medium \"%s\""
 msgstr "ei saa luua andmekandjat \"%s\"\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:142 po/placeholder.h:236
 #, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "%s sisaldub järmistes pakettides: %s\n"
-
-#: po/placeholder.h:120
-#, c-format
-msgid "no rpm files found from [%s]"
-msgstr ""
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "ei saa uuendada andmekandjat \"%s\"\n"
 
-#: po/placeholder.h:121
+#: po/placeholder.h:143 po/placeholder.h:238
 #, fuzzy, c-format
-msgid "examining hdlist file [%s]"
+msgid "trying to select multiple medium: %s"
 msgstr "ei saa luua andmekandjat \"%s\"\n"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "ei saa uuendada andmekandjat \"%s\"\n"
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr ""
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "ei saa luua andmekandjat \"%s\"\n"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ei saa luua andmekandjat \"%s\"\n"
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
-msgstr ""
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "Sõltuvuste lahendamiseks installitakse järgmised paketid (%d MB)"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "kõik on juba installitud"
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: tundmatu võti \"-$1\", vaata igaks juhuks --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Vajalik on vähemalt üks järgnevatest pakettidest:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+#, fuzzy
+msgid "unable to register rpm file"
+msgstr "ei saa luua andmekandjat \"%s\"\n"
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Installimine ebaõnnestus"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "ei saa uuendada andmekandjat \"%s\"\n"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "Sõltuvuste lahendamiseks installitakse järgmised paketid (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr ""
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Proovin paigaldada ilma sõltuvust kontrollimata? (j/E)"
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
-msgid "  -p             - allow search in provides to find package.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, fuzzy, c-format
+msgid "unable to build hdlist: %s"
+msgstr "ei saa uuendada andmekandjat \"%s\"\n"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr ""
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:191 po/placeholder.h:355
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Millise(d) valite? (1-%d)"
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "installitakse %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Palun pange andmekandja nimega %s seadmess [%s]"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "%s sisaldub järmistes pakettides: %s\n"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "ei saa luua andmekandjat \"%s\"\n"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Proovin paigaldada veel jõulisemalt (--force)? (j/E) "
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Selline valik ei ole lubatud, proovige uuesti\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "ei leia pakette, katkestan"
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "installing %s\n"
-msgstr "installitakse %s\n"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Palun pange andmekandja nimega %s seadmess [%s]"
-
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "ei leia pakette, katkestan"
+msgid "selecting %s by selection on files"
+msgstr ""
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Vajutage Enter kui see on tehtud..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "Ainult juurkasutaja saab lokaalseid pakette installida"
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Vajalik on vähemalt üks järgnevatest pakettidest:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -790,7 +947,7 @@ msgstr ""
 "%s\n"
 "Puudub <suhteline tee hdlist -ni>\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -812,17 +969,7 @@ msgstr ""
 "       http://<masin>/<tee> with <suhteline tee hdlist juurde>\n"
 "       removable_<seade>://<tee>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ei saa luua andmekandjat \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ei saa uuendada andmekandjat \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, fuzzy, c-format
 msgid ""
@@ -830,11 +977,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr "tundmatu võti \"%s\"\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -843,15 +986,7 @@ msgstr ""
 "%s\n"
 "Puudub <suhteline tee hdlist -ni>\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -860,17 +995,28 @@ msgstr ""
 "%s\n"
 "`with' puudub ftp asukoha jaoks\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"puudub eemaldatava nimi\n"
+"(võimalikke %s)\n"
 
-#: po/placeholder.h:217
+#: po/placeholder.h:425
+#, fuzzy
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
+"kasutamiseks: urpmi.removemedia [-a] <nimi> ...\n"
+"kus <nimi> on eemaldatava andmekandja nimi.\n"
+"   -a    vali kõik andmekandjad.\n"
+"\n"
+"tundmatu(d) '%s'\n"
 
-#: po/placeholder.h:218
+#: po/placeholder.h:429
 #, fuzzy
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -882,7 +1028,7 @@ msgstr ""
 "\n"
 "tundmatu(d) '%s'\n"
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -891,74 +1037,7 @@ msgstr ""
 "puudub uuendatava nimi\n"
 "(võimalikke %s)\n"
 
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ei ole midagi uuendada (andmekandja lisamiseks urpmi.addmedia)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ei ole midagi eemaldada (andmekandja lisamiseks urpmi.addmedia)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
-#, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"puudub eemaldatava nimi\n"
-"(võimalikke %s)\n"
-
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
-#, fuzzy
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"kasutamiseks: urpmi.removemedia [-a] <nimi> ...\n"
-"kus <nimi> on eemaldatava andmekandja nimi.\n"
-"   -a    vali kõik andmekandjad.\n"
-"\n"
-"tundmatu(d) '%s'\n"
-
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:255 urpmq:90
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ei saa lugeda rpm-faili \"$_\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -968,44 +1047,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"uuendamiseks tuleks osa pakette eemaldada, kahjuks ei ole see aga veel "
-"võimalik\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: tundmatu võti \"-$1\", vaata igaks juhuks --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1049,18 +1096,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "kasutamiseks: urpmi.update [-a] <nimi> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "kasutamiseks: urpmi.removemedia [-a] <nimi> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "kasutamiseks: urpmi.removemedia [-a] <nimi> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "kasutamiseks: urpmi.update [-a] <nimi> ..."
 
 #: urpmq:34
 #, c-format
@@ -1185,13 +1232,6 @@ msgstr "urpmq versioon %s"
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "kasutamine: urpmi [-h] [--auto] [--force] [-a] paketi_nimi "
-#~ "[paketi_nimed...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "Ei ole võimalik leida faili %s, väljun"
 
diff --git a/po/eu.po b/po/eu.po
index 003ec337..8778b4ca 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-31 20:51+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-09-02 16:40GMT+1\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -26,27 +26,31 @@ msgstr ""
 "Paketeen instalazio automatikoa...\n"
 "Zuk $rpm paketearen instalazioa eskatu duzu\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Zuzena al da?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ados"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Etsi"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "EeNn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "BbYySs"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (B/e) "
 
@@ -54,762 +58,925 @@ msgstr " (B/e) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: agindua ez da aurkitu\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf bertsioa %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr "Hau software askea da eta GNUren GPL baldintzapean birbanatu daiteke."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "erabilera: rpmf [<fitxategia>]"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - ez inprimatu izena etiketa (aurrezarria agindu lerroan "
 "etiketarik ematen "
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    ez bada, modu sinteraktiboarekins bateraezina)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - inprimatu etiketa guztiak."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - inprimatu izena etiketa: rpm fitxategi izena (agindu "
 "lerroan etiketarik ematen "
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 "                    ez bada horrela hartzen da baino pakete izena gabe)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - inprimatu talde etiketa: taldea."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - inprimatu neurri etiketa: neurria."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - inprimatu serie etiketa: serie."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - inprimatu laburpena etiketa: laburpena."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - inprimatu azalpena etiketa: azalpena."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 "  --provides      -inprimatu hornitu etiketa: hornidura guztiak (hainbat "
 "lerro)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 "  --requires      - inprimatu behar etiketa: behar guztiak (hainbat lerro)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 "  --files         - inprimatu fitxategiak etiketa: fitxategi guztiak "
 "(hainbat lerro)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --conflicts     - inprimatu gatazkak etiketa: gatazka guztiak (hainbat "
 "lerro)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - inprimatu zaharkituak etiketa: zaharkitu guztiak "
 "(hainbat lerro)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 "  --prereqs       - inprimatu aurrebeharrak etiketa: aurrebehar guztiak "
 "(hainbat lerro)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "saiatu urpmf --help aukerak ikusteko"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "ezin da [%s] ezarpen fitxategia idatzi"
 
-#: po/placeholder.h:30 urpm.pm:1891
-#, fuzzy
-msgid "retrieving rpms files..."
-msgstr "[%s] eskuratzen"
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  --all           - inprimatu etiketa guztiak."
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "ez dago zerrenda fitxategian \"%s\"-rri buruz idazteko ezer"
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ezin da \"%s\"-ren zerrenda fitxategia irakurri"
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ez dago zerrenda fitxategian \"%s\"-ri buruzko ezer idatzita"
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, fuzzy, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "[%s] eskuratzen"
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "ezin da \"%s\" euskarrira heldu"
-
-#: po/placeholder.h:40 urpm.pm:1769
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "ez da %s paketea aurkitu."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "%s desmontatzen"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr ""
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "[%s] hdlist fitxategia irakurtzen"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "ezin da erabili \"%s\" izena izengabeko mediarentzako erabili dagoeneko "
 "erabilita dagoelako"
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "ezin da \"%s\" bitartekoa sortu\n"
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "[%s] hdlist fitxategia irakurtzen"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, fuzzy, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "ezin da \"%s\" bitartekoa eguneratu\n"
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "ezin da \"%s\" bitartekoa sortu\n"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "ezin da \"%s\" bitartekoa eguneratu\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+#, fuzzy
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  --all           - inprimatu etiketa guztiak."
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ezin da \"%s\"-ren zerrenda fitxategia irakurri"
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "idatzi [%s] ezarpen fitxategia"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "ez dago %s izeneko paketerik"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Saiatu instalatzen indartsuago (--force)? (b/E) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "ezin da \"%s\" bitartekoa eguneratu\n"
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "ezin da \"%s\" bitartekoa eguneratu\n"
+msgid " (y/N) "
+msgstr " (B/e) "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"zenbait pakete ezabatu egin behar dira eguneratu ahal izateko, ez dago "
+"oraindik honetarako euskarririk\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "%s montatzen"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "[%s] depslist fitxategia irakurri"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+#, fuzzy
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --group         - inprimatu talde etiketa: taldea."
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ezin da \"%s\" bitartekoa sortu\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ez dago zer ezabatu (erabili urpmi.addmedia media gehitzeko)\n"
 
-#: po/placeholder.h:72 urpm.pm:1886
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "gaizki osatutako sarrera: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1722 urpm.pm:1748
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "hainbat pakete daude rpm fitxategi izen \"%s\" berberarekin"
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Ondorengo pakeetariko bat behar da:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Sartu sakatu egindakoan..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
+#: po/placeholder.h:74 po/placeholder.h:448
 #, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "[%s] eskuratzen"
+msgid "  -h             - print this help message.\n"
+msgstr "  --all           - inprimatu etiketa guztiak."
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr ""
+#: po/placeholder.h:75 po/placeholder.h:450
+#, fuzzy
+msgid "  -g             - print groups too with name.\n"
+msgstr "  --group         - inprimatu talde etiketa: taldea."
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "ezin da rpm fitxategia erregistratu"
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  --all           - inprimatu etiketa guztiak."
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr ""
+#: po/placeholder.h:78 po/placeholder.h:407
+#, fuzzy
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  --group         - inprimatu talde etiketa: taldea."
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:79 po/placeholder.h:454
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
+"                    ez bada horrela hartzen da baino pakete izena gabe)."
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "[%s]-ren kopiak hutsegin du"
-
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, fuzzy, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "ezin da \"%s\" bitartekoa eguneratu\n"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ez dago zer eguneratu (erabili urpmi.addmedia media gehitzeko)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "[%s] depslist fitxategia irakurri"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "ezin da \"%s\"-ren zerrenda fitxategia irakurri"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-#, fuzzy
-msgid "...copying done"
-msgstr "[%s] eskuratzen"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "ezin da \"%s\" bitartekoa sortu\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "[%s] hdlist fitxategia irakurtzen"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr ""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: aukera ezezaguna \"-%s\", begiratu erabilera --help bitartez\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "erabilera: urpmi.removemedia [-a] <izena> ..."
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "[%s] hdlist eraikitzen"
 
-#: po/placeholder.h:95 urpm.pm:1821
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ezin da \"%s\" bitartekoa sortu\n"
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "okerra bertako paketeak erregistratzerakoan"
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, fuzzy, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ezin da \"%s\" bitartekoa sortu\n"
 
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1898
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "[%s] eskuratzen"
 
-#: po/placeholder.h:101 urpm.pm:1837
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "ez dago zerrenda fitxategian \"%s\"-ri buruzko ezer idatzita"
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "ezin da hdlist eraiki: %s"
-
-#: po/placeholder.h:104 urpm.pm:1811 urpm.pm:1814 urpm.pm:1833
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "\"%s\" bitartekoa ez dago aukeratuta"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "baliogabeko rpm fitxategi izena [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "Zein da zure aukera? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ezin da [%s] rpm fitxategira heldu"
 
-#: po/placeholder.h:111
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Barkatu, aukera okerra, saiatu berriro\n"
 
-#: po/placeholder.h:116 urpm.pm:1848
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "ezin da \"%s\" euskarrira heldu"
 
-#: po/placeholder.h:117 urpm.pm:1757
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, fuzzy, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "ezin da \"%s\" bitartekoa sortu\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Ondorengo pakeek %s dute: %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "ez dira [%s]-n rpm fitxategiak aurkitu"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "[%s] hdlist fitxategia irakurtzen"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1896
+#: po/placeholder.h:119 po/placeholder.h:328
 #, fuzzy
-msgid "...retrieving done"
+msgid "  --help         - print this help message.\n"
+msgstr "  --all           - inprimatu etiketa guztiak."
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "guztia instalatuta dago"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+#, fuzzy
+msgid "retrieving rpms files..."
 msgstr "[%s] eskuratzen"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Ondorengo pakeetariko bat behar da:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Instalazioak hutsegin du"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr "ezin da \"%s\" euskarrira heldu"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  --group         - inprimatu talde etiketa: taldea."
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
+#, c-format
+msgid "unmounting %s"
+msgstr "%s desmontatzen"
+
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "ez dago zerrenda fitxategian \"%s\"-ri buruzko ezer idatzita"
+msgid "removing medium \"%s\""
+msgstr "ezin da \"%s\" bitartekoa sortu\n"
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, fuzzy, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "ezin da \"%s\" bitartekoa eguneratu\n"
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "ezin da \"%s\" bitartekoa sortu\n"
+
+#: po/placeholder.h:144 po/placeholder.h:447
+#, fuzzy
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --all           - inprimatu etiketa guztiak."
+
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:132
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "idatzi [%s] ezarpen fitxategia"
+
+#: po/placeholder.h:150 po/placeholder.h:249
 #, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr "  --all           - inprimatu etiketa guztiak."
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "ezin da \"%s\" bitartekoa eguneratu\n"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "guztia instalatuta dago"
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "[%s] depslist fitxategia irakurri"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ezin da \"%s\" bitartekoa sortu\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "hainbat pakete daude rpm fitxategi izen \"%s\" berberarekin"
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "Menpekotasunak asetzeko, ondorengo paketeak instalatuko dira (%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "[%s] eskuratzen"
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi: aukera ezezaguna \"-%s\", begiratu erabilera --help bitartez\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  --all           - inprimatu etiketa guztiak."
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Ondorengo pakeetariko bat behar da:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "ezin da rpm fitxategia erregistratu"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Instalazioak hutsegin du"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "[%s]-ren kopiak hutsegin du"
+
+#: po/placeholder.h:173 po/placeholder.h:462
+#, fuzzy
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
+"                    ez bada horrela hartzen da baino pakete izena gabe)."
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "ezin da \"%s\"-ren zerrenda fitxategia irakurri"
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr "  --all           - inprimatu etiketa guztiak."
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+#, fuzzy
+msgid "...copying done"
+msgstr "[%s] eskuratzen"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "Menpekotasunak asetzeko, ondorengo paketeak instalatuko dira (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
+#: po/placeholder.h:180 po/placeholder.h:277
 #, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  --group         - inprimatu talde etiketa: taldea."
+msgid "copying hdlists file..."
+msgstr "[%s] hdlist fitxategia irakurtzen"
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Saiatu instalatzen menpekotasunak aztertu gabe? (b/E)"
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "okerra bertako paketeak erregistratzerakoan"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "ez dago zerrenda fitxategian \"%s\"-ri buruzko ezer idatzita"
+
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
+msgstr "ezin da hdlist eraiki: %s"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "\"%s\" bitartekoa ez dago aukeratuta"
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:191 po/placeholder.h:355
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "  --all           - inprimatu etiketa guztiak."
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Zein da zure aukera? (1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "%s instalatzen\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Mesedez, sartu bitartekoaren izena \"%s\" gailuan [%s]"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Ondorengo pakeek %s dute: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
 #, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr "Hau software askea da eta GNUren GPL baldintzapean birbanatu daiteke."
+msgid "examining hdlist file [%s]"
+msgstr "[%s] hdlist fitxategia irakurtzen"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Saiatu instalatzen indartsuago (--force)? (b/E) "
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Barkatu, aukera okerra, saiatu berriro\n"
+#: po/placeholder.h:205 po/placeholder.h:445
+#, fuzzy
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  --group         - inprimatu talde etiketa: taldea."
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "ezin dira jatorria duten paketeak eskuratu, galerazten"
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+#, fuzzy
+msgid "...retrieving done"
+msgstr "[%s] eskuratzen"
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "installing %s\n"
-msgstr "%s instalatzen\n"
+msgid "selecting %s using obsoletes"
+msgstr ""
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Mesedez, sartu bitartekoaren izena \"%s\" gailuan [%s]"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "ezin dira jatorria duten paketeak eskuratu, galerazten"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr ""
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Sartu sakatu egindakoan..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "ez dago zerrenda fitxategian \"%s\"-ri buruzko ezer idatzita"
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 "Soilik superrerabiltzaileak dauka bertako paketeak instalatzeko baimena"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
 #, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Ondorengo pakeetariko bat behar da:"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr "Hau software askea da eta GNUren GPL baldintzapean birbanatu daiteke."
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -818,7 +985,7 @@ msgstr ""
 "%s\n"
 "<hdlist-en bide erlatiboa> falta da\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -840,17 +1007,7 @@ msgstr ""
 "       http://<ostatua>/<bidea> with <hdlist-ren fitxategi izen erlatiboa>\n"
 "       removable_<gailua>://<bidea>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ezin da \"%s\" bitartekoa sortu\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ezin da \"%s\" bitartekoa eguneratu\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -858,12 +1015,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  --all           - inprimatu etiketa guztiak."
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -872,17 +1024,7 @@ msgstr ""
 "%s\n"
 "<hdlist-en bide erlatiboa> falta da\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --group         - inprimatu talde etiketa: taldea."
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  --group         - inprimatu talde etiketa: taldea."
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -891,57 +1033,7 @@ msgstr ""
 "%s\n"
 "`with' falta da ftp mediarentzat\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"erabilera: urpmi.removemedia [-a] <izena> ...\n"
-"non <izena> ezabatzeko bitartekoaren izena den.\n"
-"   -a    aukeratu media guztiak.\n"
-"\n"
-"aukera ezezagunak '%s'\n"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"eguneratzeko sarrera falta da\n"
-"(%s-ko bat)\n"
-
-#: po/placeholder.h:234
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  --group         - inprimatu talde etiketa: taldea."
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ez dago zer eguneratu (erabili urpmi.addmedia media gehitzeko)\n"
-
-#: po/placeholder.h:236
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --all           - inprimatu etiketa guztiak."
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ez dago zer ezabatu (erabili urpmi.addmedia media gehitzeko)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -950,12 +1042,7 @@ msgstr ""
 "ezabatzeko sarrera falta da\n"
 "(%s-ko bat)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  --all           - inprimatu etiketa guztiak."
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -967,36 +1054,28 @@ msgstr ""
 "\n"
 "aukera ezezagunak '%s'\n"
 
-#: po/placeholder.h:252
-#, fuzzy
-msgid "  -h             - print this help message.\n"
-msgstr "  --all           - inprimatu etiketa guztiak."
-
-#: po/placeholder.h:254
-#, fuzzy
-msgid "  -g             - print groups too with name.\n"
-msgstr "  --group         - inprimatu talde etiketa: taldea."
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
+#: po/placeholder.h:429
 #, fuzzy
-msgid "  -r             - print version and release too with name.\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"                    ez bada horrela hartzen da baino pakete izena gabe)."
+"erabilera: urpmi.removemedia [-a] <izena> ...\n"
+"non <izena> ezabatzeko bitartekoaren izena den.\n"
+"   -a    aukeratu media guztiak.\n"
+"\n"
+"aukera ezezagunak '%s'\n"
 
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"eguneratzeko sarrera falta da\n"
+"(%s-ko bat)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1006,46 +1085,12 @@ msgid ""
 "usage:\n"
 msgstr "Hau software askea da eta GNUren GPL baldintzapean birbanatu daiteke."
 
-#: po/placeholder.h:266
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-"                    ez bada horrela hartzen da baino pakete izena gabe)."
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"zenbait pakete ezabatu egin behar dira eguneratu ahal izateko, ez dago "
-"oraindik honetarako euskarririk\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: aukera ezezaguna \"-%s\", begiratu erabilera --help bitartez\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1089,18 +1134,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "erabilera: urpmi.update [-a] <izena> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "erabilera: urpmi.removemedia [-a] <izena> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "erabilera: urpmi.removemedia [-a] <izena> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "erabilera: urpmi.update [-a] <izena> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/fi.po b/po/fi.po
index 647fb3cc..8425e75c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-12-17 22:46EET\n"
 "Last-Translator: Matias Griese <mahagr@utu.fi>\n"
 "Language-Team: Finnish\n"
@@ -27,27 +27,31 @@ msgstr ""
 "Pakettien automaattinen asennus...\n"
 "Lähetit pyynnön paketin $rpm asentamisesta\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Sopiiko tämä?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ok"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "EeNn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "KkJjYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (K/e) "
 
@@ -55,732 +59,883 @@ msgstr " (K/e) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: komentoa ei löytynyt\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf versio %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "käyttö: rpmf [valitsimet] <tiedosto>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr "täysinäistä medialuetteloa ei löytynyt"
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "hdlist-tiedostoa \"%s\" ei voida lukea"
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "mediaa \"%s\" ei voitu käyttää"
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr ""
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "yritän poistaa olematonta mediaa \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "synteesitiedostoa ei voida rakentaa medialle \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "yritettiin valita olematon media \"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "mediaa \"%s\" ei voida päivittää\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "listatiedostoa \"%s\":sta ei voida kirjoittaa levylle"
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr ""
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Yritä asentaa pakolla (--force)? (k/E) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "synteesitiedostoa ei voida rakentaa medialle \"%s\""
+msgid " (y/N) "
+msgstr " (K/e) "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"jotkin paketit pitää poistaa ohjelmiston päivittämiseksi, tätä toimintoa ei "
+"tueta vielä\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "liitän %s:n"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "luetaan synteesitiedostoa [%s]"
-
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "hakemiston nimeä ei voida noutaa poistettavalle medialle \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ei mitään poistettavaa (käytä urpmi.addmedia lisääksesi median)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Yksi seuraavista paketeista täytyy asentaa: %s:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Paina enteriä tehtyäsi sen..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "rpm-tiedostoa ei voitu rekisteröidä"
-
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "ei voitu jäsentää oikein [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ei mitään päivitettävää (käytä urpmi.addmedia lisääksesi median)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
 msgid "read synthesis file [%s]"
 msgstr "luetaan synteesitiedostoa [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "synteesitietoja %s ei voitu analysoida"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr ""
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "mediaa \"%s\" ei voida luoda\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
-msgstr ""
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: tuntematon valitsin \"-%s\", tarkista ohjelman käyttö: --help\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "käyttö: urpmi.removemedia [-a] <nimi> ..."
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
-msgid "syntax error in config file at line %s"
+msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:94
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
+
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
-msgid "building hdlist [%s]"
+msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "rpm-tiedostoa [%s] ei voitu lukea medialta \"%s\""
 
-#: po/placeholder.h:96
-#, c-format
-msgid "added medium %s"
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "What is your choice? (1-%d) "
+msgstr "Mikä on valintasi? (1-%d)"
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
-msgid "unable to build hdlist: %s"
-msgstr "hdlistiä ei voitu rakentaa: %s"
+msgid "unable to access rpm file [%s]"
+msgstr "ei oikeuksia rpm-tiedostoon [%s]"
+
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Virheellinen valinta, yritä uudelleen\n"
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr ""
+msgid "unable to access medium \"%s\""
+msgstr "mediaa \"%s\" ei voitu käyttää"
 
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
-#, c-format
-msgid "unknown data associated with %s"
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr ""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "yritettiin valita olematon media \"%s\""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ei oikeuksia rpm-tiedostoon [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr ""
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "kaikki on jo asennettu"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Yksi seuraavista paketeista tarvitaan:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ei voida lukea rpm-tiedostoa \"%s\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
-#, c-format
-msgid "unable to access medium \"%s\""
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Asennus epäonnistui"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
 msgstr "mediaa \"%s\" ei voitu käyttää"
 
-#: po/placeholder.h:117 urpm.pm:1756
-#, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "yritettiin valita olematon media \"%s\""
+msgid "unmounting %s"
+msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Seuraavat paketit sisältävät %s: %s"
+msgid "removing %d obsolete headers in cache"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "luetaan synteesitiedostoa [%s]"
-
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:141 po/placeholder.h:233
+#, fuzzy, c-format
+msgid "removing medium \"%s\""
+msgstr "yritän poistaa olematonta mediaa \"%s\""
+
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "synteesitiedostoa ei voida rakentaa medialle \"%s\""
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "yritettiin valita olematon media \"%s\""
+
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "synteesitiedostoa ei voida rakentaa medialle \"%s\""
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "luetaan synteesitiedostoa [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "hakemiston nimeä ei voida noutaa poistettavalle medialle \"%s\""
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "kaikki on jo asennettu"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "Riippuvuuksien täyttämiseksi seuraavat paketit asennetaan (%d Mt)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 "urpmi: tuntematon parametri \"-%s\", tarkista ohjelman käyttö: --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Yksi seuraavista paketeista tarvitaan:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "rpm-tiedostoa ei voitu rekisteröidä"
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Asennus epäonnistui"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "synteesitietoja %s ei voitu analysoida"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "Riippuvuuksien täyttämiseksi seuraavat paketit asennetaan (%d Mt)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr ""
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Yritä asentaa ilman riippuvuuksia? (k/E) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
-msgid "  -p             - allow search in provides to find package.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
+msgstr "hdlistiä ei voitu rakentaa: %s"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr ""
+
+#: po/placeholder.h:191 po/placeholder.h:355
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Mikä on valintasi? (1-%d)"
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "asennan %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Aseta media nimeltään \"%s\" laitteeseen [%s]"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Seuraavat paketit sisältävät %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "luetaan synteesitiedostoa [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Yritä asentaa pakolla (--force)? (k/E) "
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Virheellinen valinta, yritä uudelleen\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "lähteen paketteja ei saada, toiminto keskeytetään"
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "installing %s\n"
-msgstr "asennan %s\n"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Aseta media nimeltään \"%s\" laitteeseen [%s]"
-
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "lähteen paketteja ei saada, toiminto keskeytetään"
+msgid "selecting %s by selection on files"
+msgstr ""
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Paina enteriä tehtyäsi sen..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 msgid "Only superuser is allowed to install packages"
 msgstr "Vain pääkäyttäjä saa asentaa paketteja"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Yksi seuraavista paketeista täytyy asentaa: %s:"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -789,7 +944,7 @@ msgstr ""
 "%s\n"
 "<hdlist:in relatiivinen polku> puuttuu\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -812,17 +967,7 @@ msgstr ""
 "       removable://<polku>\n"
 "ja [valitsimet] ovat\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "mediaa \"%s\" ei voida luoda\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "mediaa \"%s\" ei voida päivittää\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -830,11 +975,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -843,15 +984,7 @@ msgstr ""
 "%s\n"
 "<hdlist:in relatiivinen polku> puuttuu\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -860,51 +993,7 @@ msgstr ""
 "%s\n"
 "ftp-median kohta \"with\" puuttuu\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-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"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, 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"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ei mitään päivitettävää (käytä urpmi.addmedia lisääksesi median)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ei mitään poistettavaa (käytä urpmi.addmedia lisääksesi median)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -913,11 +1002,7 @@ msgstr ""
 "Poistettava kohta puuttuu\n"
 "(yksi seuraavista: %s)\n"
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -926,32 +1011,24 @@ msgstr ""
 "käyttö: urpmi.update [valitsimet] <nimi> ...\n"
 "jossa <nimi> on päivitettävän median nimi.\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+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"
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ei voida lukea rpm-tiedostoa \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"Päivitettävä kohta puuttuu\n"
+"(yksi seuraavista: %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -961,44 +1038,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"jotkin paketit pitää poistaa ohjelmiston päivittämiseksi, tätä toimintoa ei "
-"tueta vielä\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: tuntematon valitsin \"-%s\", tarkista ohjelman käyttö: --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1042,17 +1087,17 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "käyttö: urpmi.update [valitsimet] <nimi> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "käyttö: urpmi.removemedia [-a] <nimi> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "käyttö: urpmi.removemedia [-a] <nimi> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "käyttö: urpmi.update [valitsimet] <nimi> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/fr.po b/po/fr.po
index dc36bedd..4d0a3a3a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2002-01-10 17:25+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: French\n"
@@ -30,27 +30,31 @@ msgstr ""
 "Installation automatique des packages...\n"
 "Vous avez demandé l'installation du paquetage $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Est-ce correct ?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "OK"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Annuler"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "OoYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (O/n) "
 
@@ -58,16 +62,16 @@ msgstr " (O/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: commande non trouvée\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf version %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
@@ -75,774 +79,943 @@ msgstr ""
 "Ceci est un logiciel libre pouvant etre redistribue selon les termes de la "
 "licence GNU GPL"
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "usage: urpmf [options] <fichier>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "   --quiet        - ne pas afficher le nom des tag (par défaut si aucun tag "
 "sur la ligne de commande)"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 "                   sur la ligne de commande, incompatible avec le mode "
 "interactif"
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - afficher tous les tags"
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name       - affiche le tag name: nom du fichier rpm (par défaut si "
 "aucun tag"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    sur la ligne de commande mais sans nom de package)"
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - afficher le tag group: groupe"
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - afficher le tag size: taille."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - afficher le tag serial: numéro de série."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - afficher le tag summary: résumé."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - afficher le tag description: description."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 "  --provides      - afficher le tag provides: toutes ce qui est fourni "
 "(multi-lignes)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 "  --requires      - afficher le tag requires: toutes les dependances (multi-"
 "lignes)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 "  --files         - afficher le tag files: tous les fichiers (multi-lignes)."
 
 # é
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "\"  --conflicts     - afficher le tag conflicts: tous les conflits (multi-"
 "lignes)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "--obsoletes     - afficher le tag obsoletes: toutes les obscoletences (multi-"
 "lignes)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 "  --prereqs       - afficher le tag prereqs: toutes les pré-dépendances "
 "(multi-lignes)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "essayez urpmf --help pour plus d'options"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr "aucune liste de média complète n'a pu -bêtre trouv-Aée"
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "impossible d'écrire le fichier de configuration [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr "récupération des fichiers rpm..."
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  -v             - mode verbeux.\n"
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "utilisation de différents périphériques amovibles [%s] pour \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "impossible de trouver le fichier list de \"%s\", média ignoré"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "rien à écrire dans le fichier liste pour \"%s\""
 
-#: po/placeholder.h:34
-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)"
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "impossible de trouver le fichier list de \"%s\", média ignoré"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "impossible d'analyser le fichier hdlist de \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "rien n'a été écrit dans le fichier-liste pour [%s]"
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "récupération le fichier description de \"%s\"..."
 
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr "impossible d'accéder premier média d'installation"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "paquetage %s non trouvé"
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "démontage de %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "destruction de %d en-têtes obsoletes dans le cache"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "pas de hdlist trouvé pour le média \"%s\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr "le média \"%s\" essaye d'utiliser un hdlist déja utilisé, média ignoré"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr "<caractère non imprimable>"
-
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "lecture du fichier hdlist [%s]"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
+msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, 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é"
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "enlever le média \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "lecture du fichier hdlist [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "impossible de prendre le média \"%s\" en compte car aucun fichier-liste [%s] "
 "n'existe"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "on ne garde que les fichiers référencés dans le fichier provides"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "impossible de créer le fichier de synthese pour le media \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d en-têtes trouvé dans le cache"
 
-#: po/placeholder.h:53
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "essaye de sélectionner plusieurs médias %s"
-
-#: po/placeholder.h:54 urpm.pm:2125
-#, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
-"évite de sélectionner %s car la locale de son langage n'est pas déja "
-"sélectionné"
+msgid "unable to update medium \"%s\"\n"
+msgstr "impossible de mettre à jour le média \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-" %s est enlev? pour mettre a jour vers %s ...\n"
-"  car il ne peut etre mis a jour autrement!"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - purger le répertoire cache des en-têtes.\n"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "le média \"%s\" existe déjà"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "impossible d'écrire le fichier-liste \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "écriture du fichier de configuration [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
+"  des noms ou fichiers rpms indiqué sur la ligne de commandes sont "
+"nécessaires.\n"
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "pas de paquetage nommé %s"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "créé le fichier de synthese pour le média \"%s\""
-
-#: po/placeholder.h:64
-#, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr ""
-"impossible de trouver tous les fichiers de synthèse, utilisation du serveur "
-"parsehdlist"
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "impossible de trouver le fichier hdlist pour \"%s\", média ignoré"
 
-#: po/placeholder.h:66
+#: po/placeholder.h:58 po/placeholder.h:248
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "créé le fichier de synthese pour le média \"%s\""
+
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "la requête sur la base de données rpm a échoué\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, c-format
-msgid "mounting %s"
-msgstr "montage de %s"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (O/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+"  -a             - sélectionne toutes les correspondances de la ligne de "
+"commande.\n"
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"certains paquetages doivent être désinstallés pour être mis à jour, ce qui "
+"n'est pas encore supporté\n"
 
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "lit le fichier de synthese [%s]"
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
+#, c-format
+msgid "mounting %s"
+msgstr "montage de %s"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - forcer la génération des fichiers hdlist.\n"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget a échoué: sortie avec le code %d ou tué par le signal %d\n"
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "impossbile de d'accéder au chemin du média amovible \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "rien à enlever (utiliser urpmi.addmedia  pour ajouter un média)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "entrée mal formée: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+"  -u             - enlève le package si une version + récente est déja "
+"installée.\n"
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, 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 "One of the following packages is needed to install %s:"
+msgstr "L'un des paquetages suivants est nécessaire pour installer %s:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Appuyez ensuite sur la touche Entrée..."
 
-#: po/placeholder.h:74
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr "...copie non réussie"
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 "le média \"%s\" essaye d'utiliser une liste déja utilisée, média ignoré"
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr "récupération du fichier hdlists..."
-
-#: po/placeholder.h:77 urpm.pm:253
-#, 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é"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr "  -h             - afficher ce message d'aide\n"
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "impossible d'enregistrer le fichier"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr "  -g             - afficher les groupes avec le nom\n"
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - sélectionne tous les médias non amovibles\n"
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "impossible de consulter le fichier-liste pour \"%s\", média ignoré"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "trop de points de montage pour le média amovible \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr ""
+"  -h             - essaye de trouver et utilise le fichier hdlist ou de "
+"synthèse.\n"
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
+"  -r             - affiche les numéros de version et de release avec le nom "
+"également\n"
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "fichier de liste incohérent pour \"%s\", média ignoré"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - affiche l'architecture, les numéros de version et de "
+"release avec le nom\n"
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "la copie de [%s] a échoué"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
+"  --auto         - sélectionne automatiquement un bon paquetage dans les "
+"choix disponibles.\n"
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "impossible d'analyser correctement [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+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"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
 msgid "read synthesis file [%s]"
 msgstr "lit le fichier de synthese [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "impossible d'analyser le fichier synthèse de %s"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "aucun webfetch (curl ou wget) trouvé\n"
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "récupération du hdlist source (ou synthèse) de \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
+msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr "...copie effectuée"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "impossbile de créer le média \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copie du hdlist source (ou synthèse) de \"%s\"..."
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
-msgstr "copie du fichier hdlists..."
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "erreur de syntaxe dans le fichier de configuration à la ligne %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: option \"-%s\" inconnue, vérifiez l'usage avec --help\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr ""
+"Utilisation : urpmi [-h] [--auto] [--force] [-a] nom_du_paquetage "
+"[noms_des_paquetages...]\n"
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "création de hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, 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\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+#, fuzzy
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr "  --update       - n'utilise que les médias de mise à jour.\n"
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr "média %s ajouté"
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, 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\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "la récupération du hdlist source (ou synthèse) a échouée"
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "erreur lors de l'enregistrement des paquetages locaux"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "périphérique du média amovible pris sur \"%s\""
-
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...échec de la récupération: %s"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "média incohérent \"%s\" marqué amovible mais ne l'est pas réellement"
 
-#: po/placeholder.h:102
-#, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "copie du fichier description de \"%s\""
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "impossible de créer le fichier hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "le média \"%s\" n'est pas sélectionné"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "le nom du fichier rpm est invalide [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "donnée inconnue associée à %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "Lequel choisissez-vous ? (1-%d)"
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "impossible d'accéder au fichier-liste de \"%s\", média ignoré"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+"  --wget         - utiliser wget pour récupérer les fichiers distants.\n"
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 "évite de sélectionner %s car il n'y pas assez de fichier à mettre à jour"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "impossible d'accéder au fichier rpm [%s]"
 
-#: po/placeholder.h:111
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-" %s est enlevé pour mettre a jour %s ...\n"
-"  car il ne peut etre mis a jour correctement!"
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s entrées déplacées dans la depslist"
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Désolé, mauvais choix, veuillez réessayez\n"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "impossible d'accéder au média \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr "impossible d'analyser correctement [%s] pour la valeur \"%s\""
+msgid "relocated %s entries in depslist"
+msgstr "%s entrées déplacées dans la depslist"
+
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+"  --curl         - utilise curl pour récupérer les fichiers distants.\n"
 
-#: po/placeholder.h:118
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "essaye de sélectionner un média inexistant \"%s\""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Les paquetages suivants contiennent %s : %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "impossible d'analyser correctement [%s] pour la valeur \"%s\""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "pas de fichier rpm trouvé pour [%s]"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "lecture du fichier hdlist [%s]"
-
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
-msgstr "pas d'entrées déplacées dans la depslist"
-
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
-msgstr "...récupération effectuée"
-
-#: po/placeholder.h:124 urpm.pm:2006
-#, c-format
-msgid "selecting %s using obsoletes"
-msgstr "sélection de %s en utilisant obsoletes"
-
-#: po/placeholder.h:125 urpm.pm:151
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "échec de curl: sortie avec %d ou tué par le signal %d\n"
-
-#: po/placeholder.h:126 urpm.pm:2122
-#, c-format
-msgid "selecting %s by selection on files"
-msgstr "sélection de %s par sélection de fichiers"
-
-#: po/placeholder.h:127 urpm.pm:101
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
 msgid "curl is missing\n"
 msgstr "curl n'est pas installé\n"
 
-#: po/placeholder.h:128
-#, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "copie du hdlist source (ou synthèse) de \"%s\"..."
-
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr "wget n'est pas installé\n"
-
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "impossible de détermer le média de ce fichier hdlist [%s]"
 
-#: po/placeholder.h:132
+#: po/placeholder.h:119 po/placeholder.h:328
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - afficher ce message d'aide\n"
 
-#: po/placeholder.h:133 urpmi:383
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
 msgid "everything already installed"
 msgstr "tout est déja installé"
 
-#: po/placeholder.h:134 urpmi:113
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: option \"-%s\" inconnue, vérifiez l'usage avec --help\n"
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr "récupération des fichiers rpm..."
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  -v             - mode verbeux.\n"
+#: po/placeholder.h:123 po/placeholder.h:217
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr "utilisation de différents périphériques amovibles [%s] pour \"%s\""
 
-#: po/placeholder.h:136 urpmi:217
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
 msgid "One of the following packages is needed:"
 msgstr "Un des paquetages suivants est nécessaire :"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - n'utilise que les médias de mise à jour.\n"
-
-#: po/placeholder.h:138 urpmi:321
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+"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)"
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: impossible de lire le fichier rpm \"%s\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
-"  --auto         - sélectionne automatiquement un bon paquetage dans les "
-"choix disponibles.\n"
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
 msgid "Installation failed"
 msgstr "L'installation a échoué"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
-msgstr ""
-
-#: po/placeholder.h:147
-msgid "  --X            - use X interface.\n"
-msgstr "  --X           - utiliser l'interface X11\n"
-
-#: po/placeholder.h:148 urpmi:267
-#, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr ""
-"Pour satisfaire les dépendances, les paquetages suivants vont être installés "
-"(%d Mo)"
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr "impossible d'accéder premier média d'installation"
 
-#: po/placeholder.h:149 po/placeholder.h:273
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
 #, fuzzy
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -p              - autorise les recherches dans les provides pour trouver "
 "le package.\n"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Essayer d'installer sans vérifier les dépendances ? (o/N) "
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
+#, c-format
+msgid "unmounting %s"
+msgstr "démontage de %s"
 
-#: po/placeholder.h:151 po/placeholder.h:278
-#, fuzzy
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr "  --update       - n'utilise que les médias de mise à jour.\n"
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "destruction de %d en-têtes obsoletes dans le cache"
 
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "pas de hdlist trouvé pour le média \"%s\""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr "<caractère non imprimable>"
 
-#: po/placeholder.h:156 po/placeholder.h:280
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - mode verbeux.\n"
 
-#: po/placeholder.h:157 po/placeholder.h:279
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p              - autorise les recherches dans les provides pour trouver "
-"le package.\n"
+#: po/placeholder.h:141 po/placeholder.h:233
+#, c-format
+msgid "removing medium \"%s\""
+msgstr "enlever le média \"%s\""
+
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "impossible de créer le fichier de synthese pour le media \"%s\""
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "essaye de sélectionner plusieurs médias %s"
 
-#: po/placeholder.h:158
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - sélectionne tous les médias non amovibles\n"
+
+#: po/placeholder.h:145 po/placeholder.h:354
 #, fuzzy
 msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 "  des noms ou fichiers rpms indiqué sur la ligne de commandes sont "
 "nécessaires.\n"
 
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - mode peu verbeux.\n"
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
+#, c-format
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
+"évite de sélectionner %s car la locale de son langage n'est pas déja "
+"sélectionné"
 
-#: po/placeholder.h:160
+#: po/placeholder.h:148 po/placeholder.h:356
 msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Lequel choisissez-vous ? (1-%d)"
+msgid "write config file [%s]"
+msgstr "écriture du fichier de configuration [%s]"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
-"  --wget         - utiliser wget pour récupérer les fichiers distants.\n"
+"impossible de trouver tous les fichiers de synthèse, utilisation du serveur "
+"parsehdlist"
 
-#: po/placeholder.h:163
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+"  --distrib      - créé automatiquement tous les médias à partir d'un média "
+"d'install.\n"
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"urpmi version %s\\n\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Ceci est un logiciel libre pouvant etre redistribue selon les termes de la "
-"licence GNU GPL\n"
-"usage:\n"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "lit le fichier de synthese [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "impossbile de d'accéder au chemin du média amovible \"%s\""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, 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\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"Pour satisfaire les dépendances, les paquetages suivants vont être installés "
+"(%d Mo)"
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Désolé, mauvais choix, veuillez réessayez\n"
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr "récupération du fichier hdlists..."
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: option \"-%s\" inconnue, vérifiez l'usage avec --help\n"
+
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, 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é"
+
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "impossible d'enregistrer le fichier"
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "impossible de consulter le fichier-liste pour \"%s\", média ignoré"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "trop de points de montage pour le média amovible \"%s\""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "fichier de liste incohérent pour \"%s\", média ignoré"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - n'utilise que les médias de mise à jour.\n"
+
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "la copie de [%s] a échoué"
+
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - étend la requ-bête aux d-Aépendances de packages.\n"
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "impossible d'analyser le fichier synthèse de %s"
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "récupération du hdlist source (ou synthèse) de \"%s\"..."
+
+#: po/placeholder.h:177 po/placeholder.h:343
+msgid "  --X            - use X interface.\n"
+msgstr "  --X           - utiliser l'interface X11\n"
+
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr "...copie effectuée"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"  -a             - sélectionne toutes les correspondances de la ligne de "
-"commande.\n"
+"Pour satisfaire les dépendances, les paquetages suivants vont être installés "
+"(%d Mo)"
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr "copie du fichier hdlists..."
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "erreur de syntaxe dans le fichier de configuration à la ligne %s"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Essayer d'installer sans vérifier les dépendances ? (o/N) "
+
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "erreur lors de l'enregistrement des paquetages locaux"
+
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "périphérique du média amovible pris sur \"%s\""
+
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"  --curl         - utilise curl pour récupérer les fichiers distants.\n"
+"  -p              - autorise les recherches dans les provides pour trouver "
+"le package.\n"
+
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "copie du fichier description de \"%s\""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
+msgstr "impossible de créer le fichier hdlist: %s"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "le média \"%s\" n'est pas sélectionné"
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr ""
+
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mode peu verbeux.\n"
+
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
+
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "installation de %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Veuillez insérer le support nommé « %s » dans le périphérique [%s]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Les paquetages suivants contiennent %s : %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "lecture du fichier hdlist [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr "pas d'entrées déplacées dans la depslist"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - créé un média de mise à jour.\n"
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+"  -d             - force le recalcul complet du fichier depslist.ordered\n"
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "impossible de récupérer les paquetages sources, abandon"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Appuyez ensuite sur la touche Entrée..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr "...récupération effectuée"
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "sélection de %s en utilisant obsoletes"
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "échec de curl: sortie avec %d ou tué par le signal %d\n"
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "sélection de %s par sélection de fichiers"
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "copie du hdlist source (ou synthèse) de \"%s\"..."
+
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 msgid "Only superuser is allowed to install packages"
 msgstr "Seul l'administrateur système (root) peut installer des paquetages"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr "wget n'est pas installé\n"
+
+#: po/placeholder.h:240
 #, 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 ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+" %s est enlev? pour mettre a jour vers %s ...\n"
+"  car il ne peut etre mis a jour autrement!"
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+" %s est enlevé pour mettre a jour %s ...\n"
+"  car il ne peut etre mis a jour correctement!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\\n\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"Ceci est un logiciel libre pouvant etre redistribue selon les termes de la "
+"licence GNU GPL\n"
+"usage:\n"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
 "%s\n"
@@ -851,7 +1024,7 @@ msgstr ""
 "%s\n"
 "inutile de donner  le <chemin relatif de hdlist> avec --distrib"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -873,17 +1046,7 @@ msgstr ""
 "       http://<host>/<chemin> with <relative filename of hdlist>\n"
 "       removable_<périphérique>://<chemin>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "impossbile de créer le média \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "impossible de mettre à jour le média \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -893,11 +1056,7 @@ msgstr ""
 "\n"
 "option inconnue '%s'\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - purger le répertoire cache des en-têtes.\n"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -906,17 +1065,7 @@ msgstr ""
 "%s\n"
 "<chemin relatif de hdlist> manquant\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - forcer la génération des fichiers hdlist.\n"
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-"  -h             - essaye de trouver et utilise le fichier hdlist ou de "
-"synthèse.\n"
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -925,54 +1074,7 @@ msgstr ""
 "%s\n"
 "`with' manquant pour le média ftp\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - créé un média de mise à jour.\n"
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-"  --distrib      - créé automatiquement tous les médias à partir d'un média "
-"d'install.\n"
-
-#: po/placeholder.h:218
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"usage: urpmi.update [options] <nom> ...\n"
-"où <nom> est un nom de média à mettre à jour.\n"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, 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"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - force le recalcul complet du fichier depslist.ordered\n"
-
-#: po/placeholder.h:235 urpmi.update:57
-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"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - sélectionne tous les médias non amovibles\n"
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "rien à enlever (utiliser urpmi.addmedia  pour ajouter un média)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -981,12 +1083,7 @@ msgstr ""
 "L'entrée à enlever est manquante\n"
 " (l'une parmi %s)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - sélectionne tous les médias non amovibles\n"
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -995,38 +1092,24 @@ msgstr ""
 "usage: urpmi.update [options] <nom> ...\n"
 "où <nom> est un nom de média à mettre à jour.\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr "  -h             - afficher ce message d'aide\n"
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr "  -g             - afficher les groupes avec le nom\n"
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: impossible de lire le fichier rpm \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  des noms ou fichiers rpms indiqué sur la ligne de commandes sont "
-"nécessaires.\n"
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  -r             - affiche les numéros de version et de release avec le nom "
-"également\n"
+"usage: urpmi.update [options] <nom> ...\n"
+"où <nom> est un nom de média à mettre à jour.\n"
 
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  -f             - affiche l'architecture, les numéros de version et de "
-"release avec le nom\n"
+"l'entrée à mettre à jour est manquante\n"
+"(un parmi de %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1041,46 +1124,12 @@ msgstr ""
 "licence GNU GPL.\n"
 "usage:\n"
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - étend la requ-bête aux d-Aépendances de packages.\n"
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"certains paquetages doivent être désinstallés pour être mis à jour, ce qui "
-"n'est pas encore supporté\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: option \"-%s\" inconnue, vérifiez l'usage avec --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-"  -u             - enlève le package si une version + récente est déja "
-"installée.\n"
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1123,17 +1172,17 @@ msgstr ") . _("
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "usage: urpmi.update [options] <nom> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "usage: urpmi.removemedia [-a] <nom> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "usage: urpmi.removemedia [-a] <nom> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "usage: urpmi.update [options] <nom> ..."
 
 #: urpmq:34
 #, c-format
@@ -1244,13 +1293,6 @@ msgstr "urpmq version %s"
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "Utilisation : urpmi [-h] [--auto] [--force] [-a] nom_du_paquetage "
-#~ "[noms_des_paquetages...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "Désolé impossible de trouver le fichier %s, j'abandonne"
 
diff --git a/po/ga.po b/po/ga.po
index b32a6ae0..91f72558 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2000-04-06 10:25+0100\n"
 "Last-Translator: Proinnsias Breathnach <breatpro@dublin.ml.com>\n"
 "Language-Team: Gaeilge <ga@li.org>\n"
@@ -23,27 +23,31 @@ msgid ""
 "You requested installation of package $rpm\n"
 msgstr ""
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "An bhfuil sin Ok ?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ceart go Leor"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "TtYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (T/n) "
 
@@ -51,922 +55,963 @@ msgstr " (T/n) "
 msgid "$rpm: command not found\n"
 msgstr ""
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmg leagan %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Coípcheart (C) 1999,2000,2001 Mandrakesoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "Úsáid: urpmf [roghaí] <comhad>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "package %s is not found."
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "unmounting %s"
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
-msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:46
+#: po/placeholder.h:45 po/placeholder.h:231
 #, fuzzy
 msgid "problem reading hdlist file, trying again"
 msgstr "léamh depslist comhad [%s]"
 
-#: po/placeholder.h:47 urpm.pm:233
-#, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
-#, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "pacáiste ar bith den ainm %s"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 msgid "urpmi database locked"
 msgstr ""
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (T/n) "
+
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "ag feistiú %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "léamh depslist comhad [%s]"
-
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, 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:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Brú Enter nuair atá sin déanta agat..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-#, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "léamh depslist comhad [%s]"
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "Téip cóip do [%s]"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "léamh depslist comhad [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr ""
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "léamh depslist comhad [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "Úsáid: urpmi.removemedia [-a] <ainm>..."
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:102
-#, c-format
-msgid "copying description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr ""
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr ""
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "Céard é do rogha? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Droch-rogha, athtrialaigh!\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
-#, c-format
-msgid "unable to access medium \"%s\""
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, fuzzy, c-format
 msgid "no rpm files found from [%s]"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "léamh depslist comhad [%s]"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
-#, c-format
-msgid "selecting %s using obsoletes"
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "tá gach rud ann cheana féin"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Tá ceann de na pacáistí seo de dhíth:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:128
-#, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "léamh depslist comhad [%s]"
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Theip ar feistiú"
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
+#, c-format
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "tá gach rud ann cheana féin"
-
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Tá ceann de na pacáistí seo de dhíth:"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:141 po/placeholder.h:233
+#, c-format
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Theip ar feistiú"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:147
-msgid "  --X            - use X interface.\n"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
-msgid "Try installation without checking dependencies? (y/N) "
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
 
-#: po/placeholder.h:152
+#: po/placeholder.h:151 po/placeholder.h:413
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
-msgid "  -p             - allow search in provides to find package.\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "léamh depslist comhad [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "léamh depslist comhad [%s]"
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Céard é do rogha? (1-%d) "
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:167 po/placeholder.h:264
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Droch-rogha, athtrialaigh!\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:172 po/placeholder.h:269
 #, c-format
-msgid "installing %s\n"
-msgstr "ag feistiú %s\n"
+msgid "copy of [%s] failed"
+msgstr "Téip cóip do [%s]"
 
-#: po/placeholder.h:177 urpmi:296
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Led' thoil ionchur an %s ainmnithe %s"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
 msgstr ""
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Brú Enter nuair atá sin déanta agat..."
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
-msgid "Only superuser is allowed to install packages"
+#: po/placeholder.h:177 po/placeholder.h:343
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:182 urpmi:216
-#, 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:"
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
 
-#: po/placeholder.h:187
-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"
-"and [options] are from\n"
-msgstr ""
+#: po/placeholder.h:180 po/placeholder.h:277
+#, fuzzy
+msgid "copying hdlists file..."
+msgstr "léamh depslist comhad [%s]"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
 #, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
+msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
-#: urpmi.addmedia:57
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr ""
+
+#: po/placeholder.h:184 po/placeholder.h:284
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:187 po/placeholder.h:287
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: po/placeholder.h:217
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:218
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "installing %s\n"
+msgstr "ag feistiú %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Led' thoil ionchur an %s ainmnithe %s"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Tá %s ins na pacáistí a leanas: %s \n"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "léamh depslist comhad [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr ""
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:234
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
 "  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:248
-#, fuzzy
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr "Úsáid: urpmi.removemedia [-a] <ainm>..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "léamh depslist comhad [%s]"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
+msgid "Only superuser is allowed to install packages"
 msgstr ""
 
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:240
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:260
+#: po/placeholder.h:359
 #, c-format
 msgid ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
+#: po/placeholder.h:379 urpmi.addmedia:70
+#, c-format
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: po/placeholder.h:267
+#: po/placeholder.h:383
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\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"
+"and [options] are from\n"
 msgstr ""
 
-#: po/placeholder.h:268
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
+#: urpmi.addmedia:57
+#, c-format
 msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:271 urpmq:137
+#: po/placeholder.h:401 urpmi.addmedia:82
+#, c-format
 msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: po/placeholder.h:272 urpmq:87
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: po/placeholder.h:274
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:282
+#: po/placeholder.h:425
+#, fuzzy
 msgid ""
-"  -u             - remove package if a better version is already installed.\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr "Úsáid: urpmi.removemedia [-a] <ainm>..."
+
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr ""
+
+#: po/placeholder.h:456
+#, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+
+#: po/placeholder.h:470
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
 #: urpm.pm:2030 urpm.pm:2039
@@ -1012,18 +1057,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "Úsáid: urpmi.update [-a] <ainm> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "Úsáid: urpmi.removemedia [-a] <ainm>..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "Úsáid: urpmi.removemedia [-a] <ainm>..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "Úsáid: urpmi.update [-a] <ainm> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/gl.po b/po/gl.po
index a8f2964e..f1d94cc3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2000-05-09 23:50+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -24,27 +24,31 @@ msgid ""
 "You requested installation of package $rpm\n"
 msgstr ""
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "¿Está ben?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Aceptar"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "SsYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (S/n) "
 
@@ -52,618 +56,705 @@ msgstr " (S/n) "
 msgid "$rpm: command not found\n"
 msgstr ""
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr ""
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr ""
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr ""
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "non hai ningún paquete co nome %s\n"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "¿Probar a instalación con menos comprobacións (--force)? (s/N) "
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "a petición á base de datos rpm fallou\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "instalando %s\n"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (S/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, c-format
-msgid "examining synthesis file [%s]"
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "instalando %s\n"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Necesítase un dos seguintes paquetes:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Prema enter cando estea..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr ""
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:1421
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
-msgid "unable to analyse synthesis data of %s"
+msgid "read synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"uso: urpmi [-h] [--auto] [--force] [-a] nome_do_paquete "
+"[nomes_de_paquetes...]\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "¿Cal é a súa elección? (1-%d) "
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "unable to build hdlist: %s"
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Mala elección, probe de novo\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unknown data associated with %s"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr ""
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "xa está todo instalado"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Necesítase un dos seguintes paquetes:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "A instalación fallou"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Os seguintes paquetes conteñen %s: %s\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:121
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
-#, c-format
-msgid "selecting %s using obsoletes"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr ""
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "xa está todo instalado"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Para satisfacer as dependencias, os seguintes paquetes van ser instalados (%"
+"d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Necesítase un dos seguintes paquetes:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "A instalación fallou"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -672,259 +763,247 @@ msgstr ""
 "Para satisfacer as dependencias, os seguintes paquetes van ser instalados (%"
 "d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr ""
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "¿Probar a instalación sen comprobar as dependencias? (s/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "¿Cal é a súa elección? (1-%d) "
-
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "¿Probar a instalación con menos comprobacións (--force)? (s/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Mala elección, probe de novo\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "instalando %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Por favor, insira o %s nomeado %s"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr ""
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Os seguintes paquetes conteñen %s: %s\n"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Prema enter cando estea..."
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr ""
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Necesítase un dos seguintes paquetes:"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
-#, c-format
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:187
-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"
-"and [options] are from\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
-#: urpmi.addmedia:57
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:211 po/placeholder.h:313
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:296
 #, c-format
 msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:217
+#: po/placeholder.h:348
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:218
+#: po/placeholder.h:359
+#, c-format
 msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
 msgstr ""
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: po/placeholder.h:234
+#: po/placeholder.h:383
 msgid ""
-"  -d             - force complete computation of depslist.ordered file.\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"
+"and [options] are from\n"
 msgstr ""
 
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
+#: urpmi.addmedia:57
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
+#: po/placeholder.h:401 urpmi.addmedia:82
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:408 urpmi.addmedia:84
+#, c-format
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -934,42 +1013,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1012,16 +1061,16 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr ""
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
 msgstr ""
 
 #: urpmq:34
@@ -1035,13 +1084,6 @@ msgstr ""
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "uso: urpmi [-h] [--auto] [--force] [-a] nome_do_paquete "
-#~ "[nomes_de_paquetes...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "Non se pode atopar o ficheiro %s, saíndo"
 
diff --git a/po/hr.po b/po/hr.po
index de272358..ca499857 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2002-01-10 13:38CET\n"
 "Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -26,27 +26,31 @@ msgstr ""
 "Automatska instalacija paketa...\n"
 "Zatra¾ili ste instalaciju paketa $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Da li se sla¾ete s tim?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "U redu"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Odustani"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "YyDd"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (D/n) "
 
@@ -54,642 +58,736 @@ msgstr " (D/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: komanda nije pronaðena\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf verzija %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Autorska prava (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 "Ovo je slobodan software i mo¾e biti redistribuiran pod stavkama GNU GPL."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "uporaba: urpmf [opcije] <datoteka>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - ne ispisuje ime oznake (podrazumijevano ako nije dana "
 "oznaka na komandnoj"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    liniji, nekompaktibilno sa interaktivnim modom)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - ispi¹i sve oznake."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - ispisuje ime oznake: rpm datoteku (podrazumijeva se ako "
 "nema dane oznake na"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    komandnoj liniji ali bez imena paketa)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         -ispisuje oznaku group: grupu."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - ispisuje oznaku size: velièinu."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - ispisuje oznaku serial: serial."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - ispisuje oznaku summary: sa¾eto."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - ispisuje oznaku description: opis."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 "  --provides      - ispisuje oznaku provides: sve ¹to pru¾a (vi¹e linija)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 "  --requires      - ispisuje oznaku requires: sve ¹to zahtjeva (vi¹e linija)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files         - ispisuje oznaku files: sve datoteke (vi¹e linija)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --conflicts     - ispisuje oznaku conflicts: sve konflikte (vi¹e linija)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (vi¹e linija)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 "  --prereqs       - ispisuje oznaku prereqs: sve prereqs (vi¹e linija)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "probajte urpmf --help za vi¹e opcija"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr "nije pronaðen popis punih medija"
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "ne mogu zapisati config datoteku [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr "dohvaæam rpms datoteku..."
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  -v             - op¹iran mod.\n"
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "koristim razlièite prenosive ureðaje [%s] za \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "ne mogu pronaæi list datoteku za \"%s\", medij ignoriran"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "nema ni¹ta za zapisati u list datoteku za \"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"ne mogu pristupiti prvom instalacijskom mediju (nije pronaðen Mandrake/base/"
-"hdlists)"
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "ne mogu pronaæi list datoteku za \"%s\", medij ignoriran"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ne mogu obraditi hdlist datoteku od \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "nema ni¹ta za zapisati u list datoteku za \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - daj sve izvorne pakete prije skidanja (root samo).\n"
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr "  --auto-select  - automatski izaberi pakete za dogradnju sustava.\n"
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "dohvaæam opis datoteka od \"%s\"..."
 
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr "ne mogu pristupiti prvom instalacijskom mediju"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "paket %s nije pronaðen."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "odmontiravam %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "uklanjam %d zastarjelih zaglavlja u priruènoj memoriji"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nije pronaðena hdlist datoteka za medij \"%s\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr "medij \"%s\" poku¹ava koristiti veæ kori¹teni hdlist, medij ignoriran"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr "<nema znakova koji se mogu ispisati>"
-
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "èitam hdlist datoteku [%s]"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
+msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 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"
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "uklanjam medij \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "èitam hdlist datoteku [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, 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"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "zadr¾ava samo datoteke referencirane u provides"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "ne mogu napraviti sinteznu(synthesis) datoteku za medij \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "pronaðeno %d zaglavlja u priruènoj memoriji"
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "poku¹avam izabrati vi¹estruki medij: %s"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
-"izbjegavam odabiranje %s kao lokalnog jezika jer on zapravo nije izabran"
+msgid "unable to update medium \"%s\"\n"
+msgstr "ne mogu a¾urirati medij \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"uklanjam %s za dogradnju na %s...\n"
-" jer se neæe dograditi drugaèije"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - oèisti ke¹ direktorij zaglavlja.\n"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medij \"%s\" veæ postoji"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ne mogu zapisati list datoteku za \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "zapisana config datoteka [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "ne postoji paket pod nazivom %s"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Poku¹ati instalaciju jo¹ sna¾nije (--force)? (d/N) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ne mogu pronaæi hdlist datoteku za \"%s\", medij ignoriran"
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "ne mogu napraviti sinteznu(synthesis) datoteku za medij \"%s\""
+msgid " (y/N) "
+msgstr " (D/n) "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ne mogu pronaæi hdlist datoteku za \"%s\", medij ignoriran"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - odabire sve odgovarajuæe na komandnoj liniji.\n"
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"neki paketi moraju biti uklonjeni da bi mogli biti nadograðeni, ovo jo¹ "
+"uvijek nije podr¾ano\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "montiram %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"ne mogu se pobriniti za medij \"%s\" po¹to se list datoteka veæ koristi za "
-"drugi medij"
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "èitanje synthesis datoteke [%s]"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget neuspje¹an: iza¹ao je sa %d ili signalom %d\n"
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne mogu dohvatiti putanju za prenosivi medij \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+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"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "nepravilan unos: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr "  -u             - ukloni paket ukoliko bolja inaèica veæ postoji.\n"
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, 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 "One of the following packages is needed to install %s:"
+msgstr "Jedan od slijedeæih paketa je potreban za instaliranje %s:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Pritisnite Enter kada ste gotovi..."
 
-#: po/placeholder.h:74
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr "...kopiranje neuspje¹no"
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr "medij \"%s\" poku¹ava koristiti veæ kori¹teni popis, medij ignoriran"
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr "dohvaæam hdlists datoteku..."
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ne mogu pristupiti hdlist datoteci od \"%s\", medij ignoriran"
-
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "ne mogu registrirati rpm datoteku"
-
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr "  -h             - ispi¹i ovaj tekst o pomoæi.\n"
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ne mogu provjeriti list datoteku za \"%s\", medij ignoriran"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr "  -g             - ispi¹i groupe takoðer sa imenom.\n"
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "previ¹e toèaka montiranja za prenosivi medij \"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - odaberi sve neprenosive medije.\n"
 
-#: po/placeholder.h:82
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "nepravilni hdlist opis \"%s\" u hdlists datoteci"
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "nepotpuna list datoteka za \"%s\", medij ignoriran"
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr ""
+"  -h             - poku¹aj pronaæi i koristiti synthesis ili hdlist "
+"datoteku.\n"
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "kopiranje [%s] neuspje¹no"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
+msgstr "  -r             - ispi¹i verzije i izdanja takoðer sa imenom.\n"
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - ispi¹i verziju, izdanje i arhitekturu sa imenom.\n"
+
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr "  --auto         - automatski izaberi dobar paket u izborima.\n"
+
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "ne mogu obraditi ispravno [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+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"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
 msgid "read synthesis file [%s]"
 msgstr "èitanje synthesis datoteke [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "ne mogu obraditi synthesis podatke od %s"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "nije pronaðen niti jedan webfetch (curl ili wget trenutno)\n"
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "dohvaæam hdlist (ili synthesis) izvor od \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
+msgstr ""
+"  -c             - izaberi kompletnu metodu za rje¹avanje kruga ovisnosti.\n"
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr "...kopiranje zavr¹eno"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "ne mogu napraviti medij \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
-msgstr "kopiram hdlists datoteku..."
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "gre¹ka u sintaksi u config datoteci na liniji %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nepoznate opcije \"-%s\", provjerite uporabu sa --help\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "uporaba: urpmi.removemedia [-a] <ime> ..."
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "izgraðujem hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne mogu proèitati rpm datoteku [%s] sa medija \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+#, fuzzy
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr "  --update       - koristi samo medije za dogradnju.\n"
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr "dodan medij %s"
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne mogu proèitati rpm datoteku [%s] sa medija \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "dohvaæanje hdlist (ili synthesis) izvora neuspje¹no"
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "gre¹ka prilikom registriranja lokalnih paketa"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "uzimam prenosivi ureðaj kao \"%s\""
-
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...dohvaæanje neuspje¹no: %s"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "nepotpun medij \"%s\" oznaèen kao prenosiv ali nije zapravo"
 
-#: po/placeholder.h:102
-#, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopiranje opisne datoteke od \"%s\"..."
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "ne mogu napraviti hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medij \"%s\" nije izabran"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nepravilno ime rpm datoteke [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "nepoznati podaci asocirani sa %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "poku¹avam zaobièi postojeæi medij \"%s\", izbjegavam"
+msgid "What is your choice? (1-%d) "
+msgstr "Izaberite jedan? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ne mogu pristupiti list datoteci od \"%s\", medij ignoriran"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - koristi wget za dohvaæanje udaljenih datoteka.\n"
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "izbjegavam izabiranje %s po¹to neæe biti dovoljno datoteka dograðeno"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: po/placeholder.h:111
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "®alim, lo¹ odabir, poku¹ajte ponovo\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"uklanjam %s za dogradnju na %s...\n"
-" jer inaèe neæe biti ispravno dograðeno!"
+msgid "unable to access medium \"%s\""
+msgstr "ne mogu pristupiti mediju \"%s\""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "premje¹teno %s unosa u depslist-u"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - koristi curl za dohvaæanje udaljenih datoteka.\n"
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ne mogu pristupiti mediju \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "poku¹avam izabrati nepostojeæi medij \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr "ne mogu obraditi ispravno [%s] na vrijednosti \"%s\""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "poku¹avam izabrati nepostojeæi medij \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "nisu pronaðene rpm datoteke u [%s]"
+
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr "curl nedostaje\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Slijedeæi paketi sadr¾e %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ne mogu odrediti medij od navedene hdlist datoteke [%s]"
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr "  --help           - ispi¹i ovaj tekst s pomoæi.\n"
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "sve je veæ instalirano"
 
-#: po/placeholder.h:120
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr "dohvaæam rpms datoteku..."
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nisu pronaðene rpm datoteke u [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "koristim razlièite prenosive ureðaje [%s] za \"%s\""
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "èitam hdlist datoteku [%s]"
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Jedan od slijedeæih paketa je potreban:"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
-msgstr "nema unosa premje¹tenih u depslist"
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"ne mogu pristupiti prvom instalacijskom mediju (nije pronaðen Mandrake/base/"
+"hdlists)"
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
-msgstr "...dohvat zavr¹en"
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu proèitati rpm datoteku \"%s\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Instalacija nije uspjela"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr "ne mogu pristupiti prvom instalacijskom mediju"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -p             - dozvoli pretra¾ivanje u provides kako bi prona¹ao paket.\n"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "odabirem %s koristeæi zastare"
+msgid "unmounting %s"
+msgstr "odmontiravam %s"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl neuspje¹an: iza¹ao je sa %d ili sa signalom %d\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "uklanjam %d zastarjelih zaglavlja u priruènoj memoriji"
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "odabirem %s izabiranjem datoteka"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nije pronaðena hdlist datoteka za medij \"%s\""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
-msgstr "curl nedostaje\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr "<nema znakova koji se mogu ispisati>"
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - op¹iran mod.\n"
+
+#: po/placeholder.h:141 po/placeholder.h:233
+#, c-format
+msgid "removing medium \"%s\""
+msgstr "uklanjam medij \"%s\""
+
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "ne mogu napraviti sinteznu(synthesis) datoteku za medij \"%s\""
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "poku¹avam izabrati vi¹estruki medij: %s"
+
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - odaberi sve neprenosive medije.\n"
 
-#: po/placeholder.h:128
+#: po/placeholder.h:145 po/placeholder.h:354
+#, fuzzy
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr "  imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
+
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
+#, c-format
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
+"izbjegavam odabiranje %s kao lokalnog jezika jer on zapravo nije izabran"
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+"  --complete     - koristi parsehdlist poslu¾itelj za kompletan odabir.\n"
+
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "zapisana config datoteka [%s]"
+
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "ne mogu napraviti sinteznu(synthesis) datoteku za medij \"%s\""
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+"  --distrib      - automatski napravi sve medije iz instalacijskog medija.\n"
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"ne mogu se pobriniti za medij \"%s\" po¹to se list datoteka veæ koristi za "
+"drugi medij"
+
+#: po/placeholder.h:156 po/placeholder.h:254
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
+msgid "examining synthesis file [%s]"
+msgstr "èitanje synthesis datoteke [%s]"
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr "wget nedostaje\n"
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ne mogu dohvatiti putanju za prenosivi medij \"%s\""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ne mogu odrediti medij od navedene hdlist datoteke [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "postoji vi¹e paketa sa istim rpm imenom datoteke \"%s\""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
-msgstr "  --help           - ispi¹i ovaj tekst s pomoæi.\n"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Kako bi zadovoljili sve ovisnosti paketa slijedeæi moram instalirati "
+"slijedeæe pakete (%d MB)"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "sve je veæ instalirano"
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr "dohvaæam hdlists datoteku..."
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi: nepoznata opcija \"-%s\", provjerite uporabu sa --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  -v             - op¹iran mod.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ne mogu pristupiti hdlist datoteci od \"%s\", medij ignoriran"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Jedan od slijedeæih paketa je potreban:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "ne mogu registrirati rpm datoteku"
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ne mogu provjeriti list datoteku za \"%s\", medij ignoriran"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "previ¹e toèaka montiranja za prenosivi medij \"%s\""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "nepotpuna list datoteka za \"%s\", medij ignoriran"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - koristi samo medije za dogradnju.\n"
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\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"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "kopiranje [%s] neuspje¹no"
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
-msgstr "  --auto         - automatski izaberi dobar paket u izborima.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - pro¹iri ispitivanje ovisnosti paketa.\n"
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Instalacija nije uspjela"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "ne mogu obraditi synthesis podatke od %s"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
-msgstr "  --auto-select  - automatski izaberi pakete za dogradnju sustava.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "dohvaæam hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - koristi X suèelje.\n"
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr "...kopiranje zavr¹eno"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -698,124 +796,192 @@ msgstr ""
 "Kako bi zadovoljili sve ovisnosti paketa slijedeæi moram instalirati "
 "slijedeæe pakete (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-#, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -p             - dozvoli pretra¾ivanje u provides kako bi prona¹ao paket.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr "kopiram hdlists datoteku..."
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "gre¹ka u sintaksi u config datoteci na liniji %s"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Poku¹ati instalaciju bez provjere ovisnosti (d/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-#, fuzzy
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr "  --update       - koristi samo medije za dogradnju.\n"
-
-#: po/placeholder.h:152
-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"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "gre¹ka prilikom registriranja lokalnih paketa"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - op¹iran mod.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "uzimam prenosivi ureðaj kao \"%s\""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - dozvoli pretra¾ivanje u provides kako bi prona¹ao paket.\n"
 
-#: po/placeholder.h:158
-#, fuzzy
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr "  imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tihi mod.\n"
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr ""
-"  --complete     - koristi parsehdlist poslu¾itelj za kompletan odabir.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "kopiranje opisne datoteke od \"%s\"..."
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Izaberite jedan? (1-%d) "
+msgid "unable to build hdlist: %s"
+msgstr "ne mogu napraviti hdlist: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - koristi wget za dohvaæanje udaljenih datoteka.\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "medij \"%s\" nije izabran"
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"urpmi inaèica %s\n"
-"Autorska prava (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Ovo je slobodan software i mo¾e biti redistribuiran pod stavkama GNU GPLa.\n"
-"uporaba:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "poku¹avam zaobièi postojeæi medij \"%s\", izbjegavam"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Poku¹ati instalaciju jo¹ sna¾nije (--force)? (d/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tihi mod.\n"
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - prisili pozivanje iako neki paketi ne postoje.\n"
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "®alim, lo¹ odabir, poku¹ajte ponovo\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - odabire sve odgovarajuæe na komandnoj liniji.\n"
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - koristi curl za dohvaæanje udaljenih datoteka.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "instaliram %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Molim umetnite medij pod nazivom \"%s\" u ureðaj [%s]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Slijedeæi paketi sadr¾e %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "èitam hdlist datoteku [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr "nema unosa premje¹tenih u depslist"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - napravi medij za dogradnju.\n"
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+"  -d             - prisiljava kompletan izraèun depslist.ordered datoteke.\n"
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Pritisnite Enter kada ste gotovi..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr "...dohvat zavr¹en"
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "odabirem %s koristeæi zastare"
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl neuspje¹an: iza¹ao je sa %d ili sa signalom %d\n"
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "odabirem %s izabiranjem datoteka"
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
+
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 msgid "Only superuser is allowed to install packages"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr "wget nedostaje\n"
+
+#: po/placeholder.h:240
 #, 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 ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"uklanjam %s za dogradnju na %s...\n"
+" jer se neæe dograditi drugaèije"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"uklanjam %s za dogradnju na %s...\n"
+" jer inaèe neæe biti ispravno dograðeno!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\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"
+
+#: po/placeholder.h:348
+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"
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"urpmi inaèica %s\n"
+"Autorska prava (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"Ovo je slobodan software i mo¾e biti redistribuiran pod stavkama GNU GPLa.\n"
+"uporaba:\n"
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
 "%s\n"
@@ -824,7 +990,7 @@ msgstr ""
 "%s\n"
 "nema potrebe za davanje <relativne putanje do hdlist> sa --distrib"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -846,17 +1012,7 @@ msgstr ""
 "       removable://<putanja>\n"
 "i [opcije] su od\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ne mogu napraviti medij \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ne mogu a¾urirati medij \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -866,11 +1022,7 @@ msgstr ""
 "\n"
 "nepoznata opcija '%s'\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - oèisti ke¹ direktorij zaglavlja.\n"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -879,17 +1031,7 @@ msgstr ""
 "%s\n"
 "<relativna putanja do hdlist> nedostaje\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-"  -h             - poku¹aj pronaæi i koristiti synthesis ili hdlist "
-"datoteku.\n"
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -898,55 +1040,7 @@ msgstr ""
 "%s\n"
 "`with' nedostaje za ftp medij\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - napravi medij za dogradnju.\n"
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-"  --distrib      - automatski napravi sve medije iz instalacijskog medija.\n"
-
-#: po/placeholder.h:218
-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"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"nedostaje unos za nadogradnju\n"
-"(jedan od %s)\n"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - prisiljava kompletan izraèun depslist.ordered datoteke.\n"
-
-#: po/placeholder.h:235 urpmi.update:57
-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"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - odaberi sve neprenosive medije.\n"
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-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"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -955,12 +1049,7 @@ msgstr ""
 "nedostaje unos za uklanjanje\n"
 "(jedan od %s)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - odaberi sve neprenosive medije.\n"
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -969,32 +1058,24 @@ msgstr ""
 "uporaba: urpmi.update [opcije] <ime> ...\n"
 "gdje je <ime> ime medija za dogradnju.\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr "  -h             - ispi¹i ovaj tekst o pomoæi.\n"
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr "  -g             - ispi¹i groupe takoðer sa imenom.\n"
+#: po/placeholder.h:429
+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"
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne mogu proèitati rpm datoteku \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr "  -r             - ispi¹i verzije i izdanja takoðer sa imenom.\n"
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - ispi¹i verziju, izdanje i arhitekturu sa imenom.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr ""
+"nedostaje unos za nadogradnju\n"
+"(jedan od %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1008,36 +1089,7 @@ msgstr ""
 "Ovo je slobodan software i mo¾e biti redistribuiran pod stavkama GNU GPLa.\n"
 "uporaba:\n"
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - pro¹iri ispitivanje ovisnosti paketa.\n"
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - daj sve izvorne pakete prije skidanja (root samo).\n"
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-"  -c             - izaberi kompletnu metodu za rje¹avanje kruga ovisnosti.\n"
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"neki paketi moraju biti uklonjeni da bi mogli biti nadograðeni, ovo jo¹ "
-"uvijek nije podr¾ano\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nepoznate opcije \"-%s\", provjerite uporabu sa --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
@@ -1045,11 +1097,6 @@ msgstr ""
 "  --headers      - izdvoji zaglavlja za pakete popisane iz urpmi baze na\n"
 "                   stdout (root samo).\n"
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr "  -u             - ukloni paket ukoliko bolja inaèica veæ postoji.\n"
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1093,17 +1140,17 @@ msgstr ") . _("
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "uporaba: urpmi.update [opcije] <ime> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "uporaba: urpmi.removemedia [-a] <ime> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "uporaba: urpmi.removemedia [-a] <ime> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "uporaba: urpmi.update [opcije] <ime> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/hu.po b/po/hu.po
index 9f29888a..b59fbf67 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.2\n"
-"POT-Creation-Date: 2002-01-30 22:25+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2002-01-30 20:59GMT+1\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -29,27 +29,31 @@ msgstr ""
 "A csomagok automatikus telepítése...\n"
 "A(z) $rpm csomag telepítését kérte...\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Így rendben van?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "OK"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "IiyY"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (I/n) "
 
@@ -57,660 +61,763 @@ msgstr " (I/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: a parancs nem található\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) MandrakeSoft, 1999, 2000, 2001"
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 "Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthetõ."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "Használat: urpmf [opciók] <fájl>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - címke kiírásának elhagyása (ha nincs címke a "
 "parancssorban,"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 "                    akkor ez lép életbe; interaktív módban nem használható)"
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - az összes adat megjelenítése"
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - név megjelenítése (ha nincs megadva címke a "
 "parancssorban,"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    akkor automatikusan életbe lép)"
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - csoport megjelenítése"
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - méret megjelenítése"
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - sorozatszám megjelenítése"
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - összefoglaló megjelenítése"
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - leírás megjelenítése"
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr "  --provides      - szolgáltatásjegyzék megjelenítése (több sor)"
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr "  --requires      - követelmények megjelenítése (több sor)"
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files         - fájlnevek megjelenítése (több sor)"
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr "  --conflicts     - ütközések megjelenítése (több sor)"
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr "  --obsoletes     - túlhaladott csomagok megjelenítése (több sor)"
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr "  --prereqs       - elõfeltételek megjelenítése (több sor)"
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "további opciókért próbálja meg az \"urpmf --help\" parancsot"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr "teljes adatforráslista nem található"
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "a beállítások mentése nem sikerült: \"%s\""
 
-#: po/placeholder.h:30 urpm.pm:1890
-msgid "retrieving rpms files..."
-msgstr "RPM fájlok behozatala..."
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr "a teljes urpmi adatbázis vizsgálata"
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "eltérõ cserélhetõ eszköz (\"%s\") használata ehhez: \"%s\""
-
-#: po/placeholder.h:33
-#, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr "nincs mit írni a listafájlba: \"%s\""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"az elsõ telepítési adatforrás nem elérhetõ (Mandrake/base/hdlists fájl nem "
-"található)"
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  -y             - fuzzy keresés használata\n"
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 "\"%s\" listafájlja nem található; az adatforrás nem kerül feldolgozásra"
 
-#: po/placeholder.h:36
+#: po/placeholder.h:33 po/placeholder.h:218
+#, c-format
+msgid "nothing to write in list file for \"%s\""
+msgstr "nincs mit írni a listafájlba: \"%s\""
+
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "fejléclista nem elemezhetõ: \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "semmi nem került a listafájlba: \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - a csomagok elérési útjának listázása letöltés elõtt\n"
+"                   (rendszergazdai jogosultság szükséges)\n"
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+"  --auto-select  - automatikusan kiválasztja a frissíthetõ csomagokat\n"
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "\"%s\" leírásfájljának behozatala..."
 
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr "az elsõ telepítési adatforrás nem elérhetõ"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "a csomag nem található: \"%s\""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "%s leválasztása"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "%d elavult fejléc eltávolítása a gyorstárból"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "a(z) \"%s\" adatforráshoz nem található fejléclista (hdlist)"
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries 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"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr "<nem nyomtatható karakterek>"
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr "hiba a fejléclista olvasásakor; újabb próbálkozás..."
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
+msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, 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"
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "\"%s\" adatforrás eltávolítása"
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr "hiba a fejléclista olvasásakor; újabb próbálkozás..."
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, 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"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "csak a szolgáltatásjegyzékben szereplõ fájlok lesznek megtartva"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-"nem készíthetõ kiterjesztett függõséglista ehhez az adatforráshoz: \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d fejléc található a gyorstárban"
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "több adatforrás kijelölése: \"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2123
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "ne jelölje ki ezt: \"%s\", mivel annak nyelve még nincs kijelölve"
+msgid "unable to update medium \"%s\"\n"
+msgstr "a(z) \"%s\" adatforrás frissítése nem sikerült\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"\"%s\" eltávolítása a következõre való frissítés\n"
-"érdekében: \"%s\" (különben nem kerülne frissítésre)"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - a fejlécgyorstár könyvtárának kiürítése\n"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "\"%s\" adatforrás már létezik"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "a(z) \"%s\" listafájlja nem írható"
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "beállítások mentése: \"%s\""
+#: po/placeholder.h:54 po/placeholder.h:452
+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"
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "nincs ilyen nevû csomag: %s"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "kiterjesztett függõséglista készítése ehhez: \"%s\""
-
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr ""
-"nem készíthetõ kiterjesztett függõséglista; parsehdlist módszer lesz "
-"használva"
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Mindenképpen megkíséreljem a telepítést (--force)? (i/N) "
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, 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"
 
-#: po/placeholder.h:66
+#: po/placeholder.h:58 po/placeholder.h:248
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "kiterjesztett függõséglista készítése ehhez: \"%s\""
+
+#: po/placeholder.h:59 po/placeholder.h:251
 msgid "urpmi database locked"
 msgstr "az urpmi adatbázis zárolt"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, c-format
-msgid "mounting %s"
-msgstr "%s csatlakoztatása"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (I/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - kijelölés a parancssorban megadott minta szerint\n"
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
-"a(z) \"%s\" adatforrás nem kezelhetõ, mivel a listafájlt már használja egy "
-"másik adatforrás"
+"néhány csomagot el kell távolítani a frissítés elõtt, de ezt a programnak ez "
+"a verziója még nem képes végrehajtani\n"
 
-#: po/placeholder.h:69
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "kiterjesztett függõséglista vizsgálata: \"%s\""
+msgid "mounting %s"
+msgstr "%s csatlakoztatása"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - fejléclista-fájlok létrehozásának kikényszerítése\n"
+
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "a wget hibával lépett ki: \"%d\" hibakód vagy \"%d\" szignál\n"
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "a következõ cserélhetõ adatforrás útvonala nem érhetõ el: \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+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"
 
-#: po/placeholder.h:72 urpm.pm:1885
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "hibás bevitel: \"%s\""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+"  -u             - csomag kihagyása, ha már van újabb verzió telepítve\n"
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, 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 "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:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Utána nyomja le az Enter billentyût..."
 
-#: po/placeholder.h:74
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr "...a másolás sikertelen"
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 "a(z) \"%s\" adatforrás egy használatban levõ listát próbált használni; az "
 "adatforrás nem kerül feldolgozásra"
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr "fejléclista behozatala..."
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr "  -h             - jelen segítség megjelenítése\n"
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr ""
-"\"%s\" fejléclistája nem elérhetõ; az adatforrás nem kerül feldolgozásra"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr "  -g             - a névvel együtt a csoportok is jelenjenek meg\n"
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "a csomagfájl (RPM) nem regisztrálható"
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - az összes adatforrás kijelölése\n"
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "érvénytelen fejléclista-leírás a fejléclista-fájlban: \"%s\""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
-"\"%s\" listafájljának vizsgálata sikertelen; az adatforrás nem kerül "
-"feldolgozásra"
-
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "túl sok csatlakoztatási pont ehhez a cserélhetõ adatforráshoz: \"%s\""
+"  -h             - kiterj. függõséglista illetve fejléclista keresése/"
+"használata\n"
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "érvénytelen fejléclista-leírás a fejléclista-fájlban: \"%s\""
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
+msgstr ""
+"  -r             - a névvel együtt a verzió és a kiadásszám is jelenjen meg\n"
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"hibás listafájl a(z) \"%s\" adatforráshoz; az adatforrás nem kerül "
-"feldolgozásra"
+"  -f             - a névvel együtt a verzió, a kiadásszám és az\n"
+"                   architektúra is jelenjen meg\n"
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "a(z) \"%s\" másolása nem sikerült"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
+"  --auto         - választási lehetõségnél automatikusan kiválasztja a\n"
+"                   megfelelõ csomagokat\n"
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "\"%s\" nem elemezhetõ"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+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"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
 msgid "read synthesis file [%s]"
 msgstr "kiterjesztett függõséglista olvasása: \"%s\""
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "\"%s\" kiterjesztett függõséglistájának elemzése sikertelen"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "nem található webes letöltõprogram (curl vagy wget)\n"
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr ""
-"\"%s\" forrás-fejléclistájának (illetve kiterjesztett függõséglistájának) "
-"behozatala..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
+msgstr "  -c             - teljes lekérdezés a függõségek ellenõrzésénél\n"
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr "...másolás megtörtént"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "a(z) \"%s\" adatforrás létrehozása nem sikerült\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 "\"%s\" forrás-fejléclistájának (illetve kiterjesztett függõséglistájának) "
 "másolása..."
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
-msgstr "fejléclista másolása..."
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, 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 "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: ismeretlen paraméter: \"-%s\". A lehetséges paramétereket a --help "
+"paraméter megadásával lehet kilistázni.\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "Használat: urpmi.removemedia [-a] <név> ..."
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "fejléclista készítése: \"%s\""
 
-#: po/placeholder.h:95 urpm.pm:1820
-#, 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"
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
+"  --media        - csak a felsorolt (elválasztás: vesszõ) adatforrások "
+"használata\n"
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr "%s adatforrás felvéve"
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, 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"
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 "a forrás-fejléclista (vagy a kiterjesztett függõséglista) beolvasása nem "
 "sikerült"
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "hiba a helyi csomagok regisztrálásakor"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "a cserélhetõ eszköz a következõnek lesz véve: \"%s\""
-
-#: po/placeholder.h:100 urpm.pm:1897
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...a behozatal sikertelen: %s"
 
-#: po/placeholder.h:101 urpm.pm:1836
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, 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"
 
-#: po/placeholder.h:102
-#, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\" leírásfájljának másolása..."
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "fejléclista készítése nem sikerült: %s"
-
-#: po/placeholder.h:104 urpm.pm:1810 urpm.pm:1813 urpm.pm:1832
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "a(z) \"%s\" adatforrás nincs kijelölve"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "érvénytelen csomagfájlnév: \"%s\""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "ismeretlen adat van ehhez rendelve: %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "a(z) \"%s\" néven létezõ adatforrás elkerülése"
+msgid "What is your choice? (1-%d) "
+msgstr "Melyiket választja? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, 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"
 
-#: po/placeholder.h:109 urpm.pm:2111
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - a wget használata távoli fájlok letöltésére\n"
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "ne jelölje ki ezt: \"%s\", mivel nem lenne elég fájl frissítve"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "a csomagfájl nem érhetõ el: \"%s\""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Ezt nem lehet választani, próbálja meg újra\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"\"%s\" eltávolítása a következõre való frissítés\n"
-"érdekében: \"%s\" (különben helytelenül lenne frissítve)"
+msgid "unable to access medium \"%s\""
+msgstr "a(z) \"%s\" adatforrás nem érhetõ el"
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "bejegyzések áthelyezve a függõséglistában: %s"
 
-#: po/placeholder.h:116 urpm.pm:1847
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - a curl használata távoli fájlok letöltésére\n"
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "a(z) \"%s\" adatforrás nem érhetõ el"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "nem létezõ adatforrás: \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr "\"%s\" elemzése sikertelen; a helytelen érték: \"%s\""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "nem létezõ adatforrás: \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "csomagfájlok (RPM) nem találhatók: \"%s\""
+
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr "a curl nem található\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "A következõ csomagok tartalmazzák a(z) %s komponenst: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "a fejléclistához tartozó adatforrás nem határozható meg: \"%s\""
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - jelen segítség megjelenítése\n"
 
-#: po/placeholder.h:120
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "már minden telepítve van"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr "RPM fájlok behozatala..."
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "csomagfájlok (RPM) nem találhatók: \"%s\""
+msgid "using different removable device [%s] for \"%s\""
+msgstr "eltérõ cserélhetõ eszköz (\"%s\") használata ehhez: \"%s\""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "A következõ csomagok valamelyikére szükség van:"
 
-#: po/placeholder.h:121
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"az elsõ telepítési adatforrás nem elérhetõ (Mandrake/base/hdlists fájl nem "
+"található)"
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "fejléclista vizsgálata: \"%s\""
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: egy RPM fájl nem olvasható: \"%s\"\n"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
-msgstr "egyetlen bejegyzés sem került áthelyezésre a függõséglistában"
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1895
-msgid "...retrieving done"
-msgstr "...behozatal megtörtént"
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "A telepítés nem sikerült"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr "az elsõ telepítési adatforrás nem elérhetõ"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -P             - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
 
-#: po/placeholder.h:124 urpm.pm:2004
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "%s kijelölése törlésre (elavulttá vált)"
+msgid "unmounting %s"
+msgstr "%s leválasztása"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "a curl hibával lépett ki: \"%d\" hibakód vagy \"%d\" szignál\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "%d elavult fejléc eltávolítása a gyorstárból"
 
-#: po/placeholder.h:126 urpm.pm:2120
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "%s kijelölése frissítésre (fájl-ütközések miatt)"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "a(z) \"%s\" adatforráshoz nem található fejléclista (hdlist)"
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
-msgstr "a curl nem található\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr "<nem nyomtatható karakterek>"
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - részletes kimenet (verbose mode)\n"
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "\"%s\" forráslistájának másolása..."
+msgid "removing medium \"%s\""
+msgstr "\"%s\" adatforrás eltávolítása"
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr "a wget nem található\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr ""
+"nem készíthetõ kiterjesztett függõséglista ehhez az adatforráshoz: \"%s\""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:143 po/placeholder.h:238
 #, 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 "trying to select multiple medium: %s"
+msgstr "több adatforrás kijelölése: \"%s\""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - jelen segítség megjelenítése\n"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - az összes nem cserélhetõ adatforrás kijelölése\n"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "már minden telepítve van"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr ""
+"  a parancssorban megadott csomagok illetve RPM fájlok lesznek telepítve\n"
+
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
+#, c-format
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "ne jelölje ki ezt: \"%s\", mivel annak nyelve még nincs kijelölve"
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+"  --complete     - parsehdlist szolgáltatás használata a kijelölés "
+"kiegészítéséhez\n"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "beállítások mentése: \"%s\""
+
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr ""
+"nem készíthetõ kiterjesztett függõséglista; parsehdlist módszer lesz "
+"használva"
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+"  --distrib      - az összes adatforrás létrehozása telepítési "
+"adatforrásból\n"
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+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"
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
+msgstr "kiterjesztett függõséglista vizsgálata: \"%s\""
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "a következõ cserélhetõ adatforrás útvonala nem érhetõ el: \"%s\""
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, 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\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"A függõségek feloldásához a következõ csomagokat fogom telepíteni (%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr "fejléclista behozatala..."
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 "urpmi: ismeretlen paraméter: \"-%s\". A lehetséges paramétereket\n"
 "a --help paraméter megadásával lehet kilistázni.\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  -y             - fuzzy keresés használata\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
+"\"%s\" fejléclistája nem elérhetõ; az adatforrás nem kerül feldolgozásra"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "A következõ csomagok valamelyikére szükség van:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "a csomagfájl (RPM) nem regisztrálható"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - csak frissítési adatforrás legyen használva\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
-"A telepítés nem sikerült, mivel bizonyos fájlok hiányoznak.\n"
-"Érdemes lehet frissíteni az urpmi adatbázist."
+"\"%s\" listafájljának vizsgálata sikertelen; az adatforrás nem kerül "
+"feldolgozásra"
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "túl sok csatlakoztatási pont ehhez a cserélhetõ adatforráshoz: \"%s\""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
-"  --auto         - választási lehetõségnél automatikusan kiválasztja a\n"
-"                   megfelelõ csomagokat\n"
+"hibás listafájl a(z) \"%s\" adatforráshoz; az adatforrás nem kerül "
+"feldolgozásra"
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "A telepítés nem sikerült"
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - csak frissítési adatforrás legyen használva\n"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "a(z) \"%s\" másolása nem sikerült"
+
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - a lekérdezés terjedjen ki a csomagfüggõségekre is\n"
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "\"%s\" kiterjesztett függõséglistájának elemzése sikertelen"
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
-"  --auto-select  - automatikusan kiválasztja a frissíthetõ csomagokat\n"
+"\"%s\" forrás-fejléclistájának (illetve kiterjesztett függõséglistájának) "
+"behozatala..."
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - futtatás az X grafikus felületen\n"
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr "...másolás megtörtént"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -718,126 +825,192 @@ msgid ""
 msgstr ""
 "A függõségek feloldásához a következõ csomagokat fogom telepíteni (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -P             - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr "fejléclista másolása..."
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, 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"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 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) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-"  --media        - csak a felsorolt (elválasztás: vesszõ) adatforrások "
-"használata\n"
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-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"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "hiba a helyi csomagok regisztrálásakor"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - részletes kimenet (verbose mode)\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "a cserélhetõ eszköz a következõnek lesz véve: \"%s\""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - csomag keresése a szolgáltatásjegyzékben\n"
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-"  a parancssorban megadott csomagok illetve RPM fájlok lesznek telepítve\n"
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - néma üzemmód\n"
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr ""
-"  --complete     - parsehdlist szolgáltatás használata a kijelölés "
-"kiegészítéséhez\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\" leírásfájljának másolása..."
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Melyiket választja? (1-%d) "
+msgid "unable to build hdlist: %s"
+msgstr "fejléclista készítése nem sikerült: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - a wget használata távoli fájlok letöltésére\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "a(z) \"%s\" adatforrás nincs kijelölve"
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"urpmi %s\n"
-"Copyright (C) 1999, 2000, 2001, MandrakeSoft.\n"
-"Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthetõ.\n"
-"Használat:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "a(z) \"%s\" néven létezõ adatforrás elkerülése"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Mindenképpen megkíséreljem a telepítést (--force)? (i/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - néma üzemmód\n"
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - akkor is elindítja a mûveletet, ha néhány szükséges\n"
 "                   csomag nem érhetõ el\n"
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Ezt nem lehet választani, próbálja meg újra\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - kijelölés a parancssorban megadott minta szerint\n"
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - a curl használata távoli fájlok letöltésére\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "%s telepítése folyik\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, 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"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "A következõ csomagok tartalmazzák a(z) %s komponenst: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr "fejléclista vizsgálata: \"%s\""
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr "egyetlen bejegyzés sem került áthelyezésre a függõséglistában"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - frissítési adatforrás létrehozása\n"
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  -d             - teljes depslist.ordered fájl készítése\n"
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "a forráscsomagok nem érhetõk el, ezért a mûvelet félbeszakad"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Utána nyomja le az Enter billentyût..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr "...behozatal megtörtént"
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "%s kijelölése törlésre (elavulttá vált)"
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "a curl hibával lépett ki: \"%d\" hibakód vagy \"%d\" szignál\n"
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "%s kijelölése frissítésre (fájl-ütközések miatt)"
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "\"%s\" forráslistájának másolása..."
+
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 msgid "Only superuser is allowed to install packages"
 msgstr "Csomagok telepítéséhez rendszergazdai jogosultság szükséges"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr "a wget nem található\n"
+
+#: po/placeholder.h:240
 #, 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 ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"\"%s\" eltávolítása a következõre való frissítés\n"
+"érdekében: \"%s\" (különben nem kerülne frissítésre)"
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"\"%s\" eltávolítása a következõre való frissítés\n"
+"érdekében: \"%s\" (különben helytelenül lenne frissítve)"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+"A telepítés nem sikerült, mivel bizonyos fájlok hiányoznak.\n"
+"Érdemes lehet frissíteni az urpmi adatbázist."
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+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"
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"urpmi %s\n"
+"Copyright (C) 1999, 2000, 2001, MandrakeSoft.\n"
+"Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthetõ.\n"
+"Használat:\n"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
 "%s\n"
@@ -846,7 +1019,7 @@ msgstr ""
 "%s\n"
 "<a fejléclista relatív útvonala> --distrib esetén szükségtelen"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -868,17 +1041,7 @@ msgstr ""
 "       removable://<elérési út>\n"
 "az [opciók] pedig a következõk lehetnek:\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "a(z) \"%s\" adatforrás létrehozása nem sikerült\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "a(z) \"%s\" adatforrás frissítése nem sikerült\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -888,11 +1051,7 @@ msgstr ""
 "\n"
 "ismeretlen opciók: \"%s\"\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - a fejlécgyorstár könyvtárának kiürítése\n"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -901,17 +1060,7 @@ msgstr ""
 "%s\n"
 "<a fejléclista relatív útvonala> hiányzik\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - fejléclista-fájlok létrehozásának kikényszerítése\n"
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-"  -h             - kiterj. függõséglista illetve fejléclista keresése/"
-"használata\n"
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -920,57 +1069,7 @@ msgstr ""
 "%s\n"
 "hiányzó \"with\" paraméter az FTP-s címnél\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - frissítési adatforrás létrehozása\n"
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-"  --distrib      - az összes adatforrás létrehozása telepítési "
-"adatforrásból\n"
-
-#: po/placeholder.h:218
-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"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, 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"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  -d             - teljes depslist.ordered fájl készítése\n"
-
-#: po/placeholder.h:235 urpmi.update:57
-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"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - az összes nem cserélhetõ adatforrás kijelölése\n"
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-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"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -979,11 +1078,7 @@ msgstr ""
 "a törlendõ bejegyzés hiányzik\n"
 "(valamelyik ezek közül: %s)\n"
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - az összes adatforrás kijelölése\n"
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
@@ -991,36 +1086,24 @@ msgstr ""
 "Használat: urpmi.removemedia [-a] <név> ...\n"
 "ahol <név> az eltávolítandó adatforrás neve.\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr "  -h             - jelen segítség megjelenítése\n"
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr "  -g             - a névvel együtt a csoportok is jelenjenek meg\n"
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: egy RPM fájl nem olvasható: \"%s\"\n"
-
-#: po/placeholder.h:256
-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"
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  -r             - a névvel együtt a verzió és a kiadásszám is jelenjen meg\n"
+"Használat: urpmi.update [opciók] <név> ...\n"
+"ahol <név> a frissítendõ adatforrás neve.\n"
 
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  -f             - a névvel együtt a verzió, a kiadásszám és az\n"
-"                   architektúra is jelenjen meg\n"
+"a frissítendõ bejegyzés hiányzik\n"
+"(valamelyik ezek közül: %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1034,38 +1117,7 @@ msgstr ""
 "Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthetõ.\n"
 "Használat:\n"
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - a lekérdezés terjedjen ki a csomagfüggõségekre is\n"
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - a csomagok elérési útjának listázása letöltés elõtt\n"
-"                   (rendszergazdai jogosultság szükséges)\n"
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr "  -c             - teljes lekérdezés a függõségek ellenõrzésénél\n"
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"néhány csomagot el kell távolítani a frissítés elõtt, de ezt a programnak ez "
-"a verziója még nem képes végrehajtani\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: ismeretlen paraméter: \"-%s\". A lehetséges paramétereket a --help "
-"paraméter megadásával lehet kilistázni.\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
@@ -1074,32 +1126,26 @@ msgstr ""
 "                   a standard kimenetre (stdout) - a mûvelethez\n"
 "                   rendszergazdai jogosultság szükséges\n"
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-"  -u             - csomag kihagyása, ha már van újabb verzió telepítve\n"
-
-#: urpm.pm:2028 urpm.pm:2037
+#: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
 msgstr ""
 "\"%s\" eltávolítása a következõre való frissítés\n"
 "érdekében: \"%s\""
 
-#: urpm.pm:2029 urpm.pm:2038
+#: urpm.pm:2031 urpm.pm:2040
 msgid ", $otherPackage, "
 msgstr ", $otherPackage, "
 
-#: urpm.pm:2029 urpm.pm:2038
+#: urpm.pm:2031 urpm.pm:2040
 msgid "));"
 msgstr "));"
 
-#: urpm.pm:2034
+#: urpm.pm:2036
 msgid "$p->{name}-$p->{version}-$p->{release}"
 msgstr "$p->{name}-$p->{version}-$p->{release}"
 
-#: urpm.pm:2044
+#: urpm.pm:2046
 msgid "$prefix/$_"
 msgstr "$prefix/$_"
 
@@ -1125,17 +1171,17 @@ msgstr ") . _("
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "Használat: urpmi.update [opciók] <név> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "Használat: urpmi.removemedia [-a] <név> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "Használat: urpmi.removemedia [-a] <név> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "Használat: urpmi.update [opciók] <név> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/id.po b/po/id.po
index 41057870..0f8f9c80 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.2\n"
-"POT-Creation-Date: 2002-01-31 20:51+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2002-02-05 00:00+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Indonesian <rac@linux-mandrake.com>\n"
@@ -25,27 +25,31 @@ msgstr ""
 "Instalasi paket otomatis...\n"
 "Anda telah meminta instalasi paket $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Semua beres?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ok"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Batal"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "TtNn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "Yy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (Y/t) "
 
@@ -53,629 +57,711 @@ msgstr " (Y/t) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: perintah tak tercari\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf versi %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Hakcipta (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr "Ini software gratis dan boleh disebar sesuai lisensi publik GNU."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "pemakaian: urpmf [options] <file>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - jangan cetak nama tag (standar jika tiada tag pada baris"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    perintah, tak kompatibel dg mode interaktif)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - cetak semua tag."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - cetak nama tag: rpm namafile (jika tiada diberikan pada"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    baris perintah tapi tanpa nama paket)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - cetak grup tag: grup."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - cetak ukuran tag: ukuran."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - cetak no. seri tag: serial."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - cetak ringkasan tag: ringkasan."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - cetak penjelasan tag: penjelasan."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr "  --provides      - cetak sediaan tag: semua sediaan (bbrp baris)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr "  --requires      - cetak kebutuhan tag: semua kebutuhan (bbrp baris)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files         - cetak file tag: semua file (bbrp baris)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr "  --conflicts     - cetak konflik tag: semua konflik (bbrp baris)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - cetak kadaluarsa tag: semua kadaluarsa (bbrp baris)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr "  --prereqs       - cetak syarat tag: semua syarat (bbrp baris)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "coba urpmf --help utk opsi lain"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr "tak ditemukan daftar media lengkap"
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "gagal tulis file konfigurasi [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1891
-msgid "retrieving rpms files..."
-msgstr "ambil file rpms..."
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr "pemeriksaan seluruh database urpmi"
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  -y             - lakukan pencarian fuzzy.\n"
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "pakai removable device lain [%s] untuk \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "gagal cari file daftar \"%s\", media diabaikan"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "tiada yg ditulis dlm file daftar \"%s\""
 
-#: po/placeholder.h:34
-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)"
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "gagal cari file daftar \"%s\", media diabaikan"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "gagal olah file hdlist \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "tak ada yg ditulis dlm file daftar \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - beri semua paket source sebelum download (hanya only).\n"
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr "  --auto-select  - otomatis menyeleksi paket utk upgrade sistem.\n"
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "ambil file deskripsi \"%s\"..."
 
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr "gagal mengakses media instalasi pertama"
-
-#: po/placeholder.h:40 urpm.pm:1769
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "paket %s tak tertemukan."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "lepas mount %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "hapus %d header kadaluarsa dlm cache"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "file hdlist utk media \"%s\" tak ditemukan"
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr "media \"%s\" coba memakai hdlist yg telah dipakai, media diabaikan"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr "<huruf tak tercetak>"
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr "sulit baca file hdlist, coba lagi..."
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
+msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, 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"
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "hapus media \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr "sulit baca file hdlist, coba lagi..."
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, 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"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "hanya simpan file yg tertulis di sediaan (provides)"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "gagal buat file sintesis media \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "temukan %d header di cache"
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "sedang mencoba memilih media majemuk: %s"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "abaikan %s karena bahasa lokalnya belum dipilih"
+msgid "unable to update medium \"%s\"\n"
+msgstr "gagal update media \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"hapus %s utk upgrade ke %s ...\n"
-"  karena jika tidak, update akan gagal"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - bersihkan direktori cache header.\n"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "media \"%s\" telah ada"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "gagal baca file list \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "tulis file konfigurasi [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  dicarikan nama atau file rpm yg tertera pada baris perintah.\n"
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "tiada paket bernama %s"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "bangun file sintesa hdlist utk media \"%s\""
-
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "gagal bangun sintesa hdlist, gunakan metode parsehdlist"
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Coba instalasi lebih keras (--force)? (y/T) "
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "gagal temukan file hdlist \"%s\", media diabaikan"
 
-#: po/placeholder.h:66
+#: po/placeholder.h:58 po/placeholder.h:248
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "bangun file sintesa hdlist utk media \"%s\""
+
+#: po/placeholder.h:59 po/placeholder.h:251
 msgid "urpmi database locked"
 msgstr "database urpmi terkunci"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, c-format
-msgid "mounting %s"
-msgstr "gandeng %s"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (Y/t) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - pilih semua yg cocok dg baris perintah.\n"
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 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"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr "bbrpp paket harus dihapus agr ter-upgrade, ini belum ter-support\n"
 
-#: po/placeholder.h:69
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "periksa file sintesa [%s]"
+msgid "mounting %s"
+msgstr "gandeng %s"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - paksa buat file hdlist.\n"
+
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget gagal: keluar dg %d atau sinyal %d\n"
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "tak dapat mengambil nama path utk media removable \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "tak ada penghapusan (pakailah urpmi.addmedia utk tambah media)\n"
 
-#: po/placeholder.h:72 urpm.pm:1886
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "input cacat: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1722 urpm.pm:1748
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+"  -u             - hapus paket jika versi yg lebih baik telah diinstal.\n"
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "banyak paket dg nama file rpm sama \"%s\""
+msgid "One of the following packages is needed to install %s:"
+msgstr "Salah satu paket berikut dibutuhkan utk instalasi %s:"
 
-#: po/placeholder.h:74
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Tekan [Enter] jika selesai.."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr "...gagal disalin"
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr "media \"%s\" mencoba memakai list yg telah dipakai, media diabaikan"
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr "ambil file hdlist..."
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "gagal mengakses file hdlist \"%s\", media diabaikan"
-
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "registrasi file rpm gagal"
-
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr "  -h             - cetak pesan pertolongan ini.\n"
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "gagal periksa file daftar \"%s\", media diabaikan"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr "  -g             - juga cetak grup dg nama.\n"
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "terlalu banyak titik sambung utk media removable \"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - pilih semua media.\n"
 
-#: po/placeholder.h:82
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "deskripsi hdlist \"%s\" di file hdlist tak berlaku"
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "file list \"%s\" tak koheren, media diabaikan"
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  -h             - coba temukan dan pakai file sintesa atau hdlist.\n"
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "gagal salin [%s]"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
+msgstr "  -r             - juga cetak versi dan release dg nama.\n"
+
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - cetak versi, release dan arch dg nama.\n"
+
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr "  --auto         - otomatis menyeleksi paket yg baik dalam pilihan.\n"
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "gagal olah [%s] dg benar"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "tak ada update (pakailah urpmi.addmedia utk tambah media)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
 msgid "read synthesis file [%s]"
 msgstr "baca file sintesa [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "tak dapat menganalisa data sintesa %s"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "tiada webfetch (curl / wget) ditemukan\n"
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "ambil hdlist source (atau sintesa) \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
+msgstr "  -c             - pilih metode lengkap utk solusi kebutuhan.\n"
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr "copy selesai"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "gagal membuat media \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "sedang menyalin sumber/sintesa hdlist \"%s\"..."
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
-msgstr "sedang menyalin file hdlist..."
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "salah syntax dlm file konfigurasi baris %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opsi asing \"-%s\", cek pemakaian dg --help\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr ""
+"cara pakai: urpmi [-h] [--auto] [--force] [-a] nama_paket [nama_paket...]\n"
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "bangun hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1821
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "gagal baca file rpm [%s] dari media \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr "  --media        - pakai hanya media terdaftar dg koma.\n"
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr "media %s ditambahkan"
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "gagal baca file rpm [%s] dari media \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "gagal mengambil hdlist (atau sintesa) source"
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "salah registrasi paket lokal"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "ambil perangkat removable sbg \"%s\""
-
-#: po/placeholder.h:100 urpm.pm:1898
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...gagal terambil: %s"
 
-#: po/placeholder.h:101 urpm.pm:1837
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "media nonkoheren \"%s\" bertanda removable, seharusnya tidak"
 
-#: po/placeholder.h:102
-#, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "file deskripsi \"%s\" sedang disalin"
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "gagal bangun hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1811 urpm.pm:1814 urpm.pm:1833
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "media \"%s\" tak dipilih"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nama file rpm [%s] tak berlaku"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "data tak dikenal terasosiasi dg %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "coba bypass media \"%s\", abaikan"
+msgid "What is your choice? (1-%d) "
+msgstr "Pilihan Anda? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "gagal mengakses file list \"%s\", media diabaikan"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - pakai wget utk mengambil file jauh.\n"
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "hindari pilih %s karena file yg diupdate tak cukup"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "gagal akses file rpm [%s]"
 
-#: po/placeholder.h:111
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Salah pilih, coba lagi\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"hapus %s utk upgrade ke %s ...\n"
-"  karena upgrade takkan berjalan dg benar!"
+msgid "unable to access medium \"%s\""
+msgstr "gagal akses media \"%s\""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "%s entri di depslist direlokasikan"
 
-#: po/placeholder.h:116 urpm.pm:1848
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - pakai curl utk mengambil file jauh.\n"
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "gagal akses media \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "sedang mencoba memilih media tak eksis \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1757
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr "gagal olah dg benar [%s] pada nilai \"%s\""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "sedang mencoba memilih media tak eksis \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "tiada file rpm tertemukan dari [%s]"
+
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr "curl hilang\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Paket berikut berisi %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "gagal tentukan media file hdlist [%s] ini"
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - cetak pesan pertolongan ini.\n"
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "semua telah terinstal"
 
-#: po/placeholder.h:120
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr "ambil file rpms..."
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "tiada file rpm tertemukan dari [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "pakai removable device lain [%s] untuk \"%s\""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Salah satu paket berikut dibutuhkan:"
 
-#: po/placeholder.h:121
+#: po/placeholder.h:125 po/placeholder.h:219
+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)"
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "periksa baca file hdlist [%s]"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: tak dapat membaca file rpm \"%s\"\n"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
-msgstr "tiada entri di depslist direlokasikan"
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1896
-msgid "...retrieving done"
-msgstr "pengambilan selesai"
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Instalasi gagal"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr "gagal mengakses media instalasi pertama"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - jangan cari di provides utk mencari paket.\n"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "pilih %s menggunakan daftar kadaluarsa"
+msgid "unmounting %s"
+msgstr "lepas mount %s"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl gagal: keluar dg %d atau sinyal %d\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "hapus %d header kadaluarsa dlm cache"
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "pilih %s menggunakan pilihan file"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "file hdlist utk media \"%s\" tak ditemukan"
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
-msgstr "curl hilang\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr "<huruf tak tercetak>"
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - mode detil.\n"
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "penyalinan daftar sumber \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "hapus media \"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr "wget hilang\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "gagal buat file sintesis media \"%s\""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:143 po/placeholder.h:238
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "gagal tentukan media file hdlist [%s] ini"
+msgid "trying to select multiple medium: %s"
+msgstr "sedang mencoba memilih media majemuk: %s"
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - cetak pesan pertolongan ini.\n"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - pilih semua media non-removable.\n"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "semua telah terinstal"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr "  nama atau file rpm yg tertera pada baris perintah telah diinstal.\n"
+
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
+#, c-format
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "abaikan %s karena bahasa lokalnya belum dipilih"
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr "  --complete     - pakai server parsehdlist utk selesaikan pilihan.\n"
+
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "tulis file konfigurasi [%s]"
+
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "gagal bangun sintesa hdlist, gunakan metode parsehdlist"
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+"  --distrib      - buat semua media dari media instalasi dg otomatis.\n"
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, 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"
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
+msgstr "periksa file sintesa [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "tak dapat mengambil nama path utk media removable \"%s\""
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "banyak paket dg nama file rpm sama \"%s\""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Paket berikut akan di-install agar syarat ketergantungan terpenuhi (%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr "ambil file hdlist..."
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi: opsi \"-%s\" tak dikenal, cek pemakaian dg --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  -y             - lakukan pencarian fuzzy.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "gagal mengakses file hdlist \"%s\", media diabaikan"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Salah satu paket berikut dibutuhkan:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "registrasi file rpm gagal"
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "gagal periksa file daftar \"%s\", media diabaikan"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "terlalu banyak titik sambung utk media removable \"%s\""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "file list \"%s\" tak koheren, media diabaikan"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - pakai hanya media update.\n"
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Instalasi gagal, beberapa file hilanga.\n"
-"Anda mungkin perlu meng-update database urpmi"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "gagal salin [%s]"
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
-msgstr "  --auto         - otomatis menyeleksi paket yg baik dalam pilihan.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - tambah pencarian ke ketergantungan paket.\n"
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Instalasi gagal"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "tak dapat menganalisa data sintesa %s"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
-msgstr "  --auto-select  - otomatis menyeleksi paket utk upgrade sistem.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "ambil hdlist source (atau sintesa) \"%s\"..."
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - pakai antarmuka X.\n"
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr "copy selesai"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -683,117 +769,189 @@ msgid ""
 msgstr ""
 "Paket berikut akan di-install agar syarat ketergantungan terpenuhi (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - jangan cari di provides utk mencari paket.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr "sedang menyalin file hdlist..."
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "salah syntax dlm file konfigurasi baris %s"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Coba instalasi tanpa cek ketergantungan? (y/T) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr "  --media        - pakai hanya media terdaftar dg koma.\n"
-
-#: po/placeholder.h:152
-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"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "salah registrasi paket lokal"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - mode detil.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "ambil perangkat removable sbg \"%s\""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - izinkan search di provides utk mencari paket.\n"
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr "  nama atau file rpm yg tertera pada baris perintah telah diinstal.\n"
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - mode diam.\n"
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr "  --complete     - pakai server parsehdlist utk selesaikan pilihan.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "file deskripsi \"%s\" sedang disalin"
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Pilihan Anda? (1-%d) "
+msgid "unable to build hdlist: %s"
+msgstr "gagal bangun hdlist: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - pakai wget utk mengambil file jauh.\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "media \"%s\" tak dipilih"
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"urpmi versi %s\n"
-"Hakcipta (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Ini software gratis dan boleh disebar sesuai lisensi publik GNU.\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "coba bypass media \"%s\", abaikan"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Coba instalasi lebih keras (--force)? (y/T) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mode diam.\n"
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - paksa instal meski bbrp paket tak ada.\n"
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Salah pilih, coba lagi\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - pilih semua yg cocok dg baris perintah.\n"
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - pakai curl utk mengambil file jauh.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "instalasi %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Masukkan media \"%s\" ke perangkat [%s]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Paket berikut berisi %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr "periksa baca file hdlist [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr "tiada entri di depslist direlokasikan"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - buat media update.\n"
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  -d             - paksa perhitungan lengkap file depslist.ordered.\n"
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "tak dapat mengambil paket asal, batal"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Tekan [Enter] jika selesai.."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr "pengambilan selesai"
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "pilih %s menggunakan daftar kadaluarsa"
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl gagal: keluar dg %d atau sinyal %d\n"
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "pilih %s menggunakan pilihan file"
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "penyalinan daftar sumber \"%s\"..."
+
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 msgid "Only superuser is allowed to install packages"
 msgstr "Hanya superuser yang boleh meng-instal paket"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr "wget hilang\n"
+
+#: po/placeholder.h:240
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Salah satu paket berikut dibutuhkan utk instalasi %s:"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"hapus %s utk upgrade ke %s ...\n"
+"  karena jika tidak, update akan gagal"
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"hapus %s utk upgrade ke %s ...\n"
+"  karena upgrade takkan berjalan dg benar!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Instalasi gagal, beberapa file hilanga.\n"
+"Anda mungkin perlu meng-update database urpmi"
+
+#: po/placeholder.h:348
+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"
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"urpmi versi %s\n"
+"Hakcipta (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"Ini software gratis dan boleh disebar sesuai lisensi publik GNU.\n"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
 "%s\n"
@@ -802,7 +960,7 @@ msgstr ""
 "%s\n"
 "tak perlu memberikan <path relatif hdlist> dg --distrib"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -823,17 +981,7 @@ msgstr ""
 "       removable://<path>\n"
 "dan [opsi] dari\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "gagal membuat media \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "gagal update media \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -843,11 +991,7 @@ msgstr ""
 "\n"
 "opsi tak dikenal '%s'\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - bersihkan direktori cache header.\n"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -856,15 +1000,7 @@ msgstr ""
 "%s\n"
 "<path relatif hdlist> hilang\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - paksa buat file hdlist.\n"
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  -h             - coba temukan dan pakai file sintesa atau hdlist.\n"
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -873,18 +1009,24 @@ msgstr ""
 "%s\n"
 "`with' tak tercantum utk media ftp\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - buat media update.\n"
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"masukan utk penghapusan hilang\n"
+"(satu dari %s)\n"
 
-#: po/placeholder.h:217
+#: po/placeholder.h:425
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --distrib      - buat semua media dari media instalasi dg otomatis.\n"
+"pemakaian: urpmi.removemedia [-a] <nama> ...\n"
+"<nama> adalah nama media yg akan dihapus.\n"
 
-#: po/placeholder.h:218
+#: po/placeholder.h:429
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -892,7 +1034,7 @@ msgstr ""
 "pemakaian: urpmi.update [opsi] <nama> ...\n"
 "<nama> adalah media yg akan di-update.\n"
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -901,70 +1043,7 @@ msgstr ""
 "masukan update hilang\n"
 "(satu dari %s)\n"
 
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  -d             - paksa perhitungan lengkap file depslist.ordered.\n"
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "tak ada update (pakailah urpmi.addmedia utk tambah media)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - pilih semua media non-removable.\n"
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "tak ada penghapusan (pakailah urpmi.addmedia utk tambah media)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
-#, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"masukan utk penghapusan hilang\n"
-"(satu dari %s)\n"
-
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - pilih semua media.\n"
-
-#: po/placeholder.h:248
-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"
-
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr "  -h             - cetak pesan pertolongan ini.\n"
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr "  -g             - juga cetak grup dg nama.\n"
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: tak dapat membaca file rpm \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  dicarikan nama atau file rpm yg tertera pada baris perintah.\n"
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr "  -r             - juga cetak versi dan release dg nama.\n"
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - cetak versi, release dan arch dg nama.\n"
-
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -978,33 +1057,7 @@ msgstr ""
 "Ini adalah perangkat lunak gratis dan boleh disebar sesuai GNU GPL.\n"
 "usage:\n"
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - tambah pencarian ke ketergantungan paket.\n"
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - beri semua paket source sebelum download (hanya only).\n"
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr "  -c             - pilih metode lengkap utk solusi kebutuhan.\n"
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr "bbrpp paket harus dihapus agr ter-upgrade, ini belum ter-support\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opsi asing \"-%s\", cek pemakaian dg --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
@@ -1012,12 +1065,6 @@ msgstr ""
 "  --headers      - keluarkan header packet terdaftar dari dalam db urpmi ke\n"
 "                   stdout (hanya root).\n"
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-"  -u             - hapus paket jika versi yg lebih baik telah diinstal.\n"
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1060,17 +1107,17 @@ msgstr ") . _("
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "pemakaian: urpmi.update [opsi] <nama> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "pemakaian: urpmi.removemedia [-a] <name> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "pemakaian: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "pemakaian: urpmi.update [opsi] <nama> ..."
 
 #: urpmq:34
 #, c-format
@@ -1293,13 +1340,6 @@ msgstr "urpmq versi %s"
 #~ msgid "Yes"
 #~ msgstr "Ya"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "cara pakai: urpmi [-h] [--auto] [--force] [-a] nama_paket "
-#~ "[nama_paket...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "Maaf, file %s tak tertemu, keluar.."
 
diff --git a/po/is.po b/po/is.po
index bb9c0fa3..c461a3a6 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2000-04-19 23:05-0400\n"
 "Last-Translator: Thorarinn R. Einarsson <thori@mindspring.com>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -24,27 +24,31 @@ msgid ""
 "You requested installation of package $rpm\n"
 msgstr ""
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Er það í lagi?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Í lagi"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "JjYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (J/n) "
 
@@ -52,618 +56,704 @@ msgstr " (J/n) "
 msgid "$rpm: command not found\n"
 msgstr ""
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr ""
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr ""
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr ""
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "Enginn '%s' pakki\n"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Prófa sterkari innsetningu (--force)? (j/N) "
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "rpm gagnaskrárbeiðni brást\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "Set inn %s\n"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (J/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, c-format
-msgid "examining synthesis file [%s]"
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "Set inn %s\n"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Sláðu á ENTER eftirá..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr ""
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:1421
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
-msgid "unable to analyse synthesis data of %s"
+msgid "read synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"notkun: urpmi [-h] [--auto] [--force] [-a] nafn_pakka [pakka_nöfn...]\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Hvað viltu? (1-%d) "
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "unable to build hdlist: %s"
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Slæmt val.  Reyndu aftur\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unknown data associated with %s"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr ""
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "Allt er nú þegar komið inn"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Innsetning brást"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Eftirfarandi pakkar innihalda %s: %s\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:121
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
-#, c-format
-msgid "selecting %s using obsoletes"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "Allt er nú þegar komið inn"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Til að uppfylla innsetningarkröfur verða eftirtaldir pakkar settir inn (%d "
+"MB)"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr ""
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Innsetning brást"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -672,258 +762,246 @@ msgstr ""
 "Til að uppfylla innsetningarkröfur verða eftirtaldir pakkar settir inn (%d "
 "MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr ""
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Prófa innsetningu án þess að athuga hvaða skrár þarf? (j/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Hvað viltu? (1-%d) "
-
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Prófa sterkari innsetningu (--force)? (j/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Slæmt val.  Reyndu aftur\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "Set inn %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vinsamlega settu inn %s %s"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr ""
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Eftirfarandi pakkar innihalda %s: %s\n"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Sláðu á ENTER eftirá..."
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
-msgid "Only superuser is allowed to install packages"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
-#, c-format
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:187
-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"
-"and [options] are from\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
-#: urpmi.addmedia:57
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:211 po/placeholder.h:313
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
+msgid "Only superuser is allowed to install packages"
 msgstr ""
 
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:240
 #, c-format
 msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:217
+#: po/placeholder.h:334 urpmi:321
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:218
+#: po/placeholder.h:348
 msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:359
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
 msgstr ""
 
-#: po/placeholder.h:234
+#: po/placeholder.h:379 urpmi.addmedia:70
+#, c-format
 msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:383
+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"
+"and [options] are from\n"
 msgstr ""
 
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
+#: urpmi.addmedia:57
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:401 urpmi.addmedia:82
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -933,42 +1011,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1011,16 +1059,16 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr ""
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
 msgstr ""
 
 #: urpmq:34
@@ -1031,11 +1079,5 @@ msgstr ""
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "notkun: urpmi [-h] [--auto] [--force] [-a] nafn_pakka [pakka_nöfn...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "Fann ekki skrána %s og hætti því"
diff --git a/po/it.po b/po/it.po
index 0c9097f5..78344904 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2002-01-23 16:50+0100\n"
 "Last-Translator: daniele <daniele@dcs.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -27,27 +27,31 @@ msgstr ""
 "Installazione automatica dei pacchetti...\n"
 "Hai richiesto l'installazione del pacchetto $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "E' corretto?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ok"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Cancella"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "Yy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
@@ -55,16 +59,16 @@ msgstr " (Y/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: comando non trovato\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf versione %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
@@ -72,623 +76,721 @@ msgstr ""
 "Questo software è gratuito e può essere ridistribuito sotto i termini della "
 "GNU GPL."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "uso: urpmf [options] <file>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - non stampare il nome del tag (default senza tag in riga"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    di comando, incompatibile col modo interattivo)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - stampa tutti i tag."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - stampa il nome del tag: rpm filename (supposto senza tag"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    in riga di comando ma senza nome del pacchetto)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - stampa il gruppo del tag: group."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - stampa la dimensione del tag: size."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - stampa il seriale del tag: serial."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --sommario      - stampa il sommario del tag: summary."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --descrizione   - stampa la descrizione del tag: description."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr "  --provides      - stampa i tag provides: all provides (più linee)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr "  --requires      - stampa i tag requires: all requires (più linee)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files         - stampa i tag files: all files (più linee)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --conflicts     - stampa i conflitti del tag: all conflicts (più linee)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr "  --obsoletes     - stampa i tag obsoletes: all obsoletes (più linee)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr "  --prereqs       - stampa i tag prereqs: all prereqs (più linee)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "prova urmpf --help per più opzioni"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr "non è stata trovata una lista completa dei media"
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "non riesco a scrivere sul file di configurazione [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr "recuper i file rpm..."
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr "sto procedendo ad un esame completo del database di urpmi"
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  -v             - modalità prolissa.\n"
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "sto usando un diverso device removibile [%s] per \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "non riesco a trovare il list file per \"%s\", ignoro il supporto"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "niente da scrivere nel list file per \"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"non riesco ad accedere al primo media di installazione (non trovo il file "
-"Mandrake/base/hdlist)"
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "non riesco a trovare il list file per \"%s\", ignoro il supporto"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "non riesco ad analizzare l'hdlist file di \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "niente scritto nel list file per \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - dai tutti i pacchetti sorgenti prima del download (solo "
+"root).\n"
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+"  --auto-select  - seleziona automaticamente i pacchetti per aggiornare il "
+"sistema.\n"
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "recupero il file descrittivo di \"%s\"..."
 
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr "non riesco ad accedere il primo media di installazione"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "il pacchetto %s non è stato trovato"
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "sto smontando %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "sto rimuovendo %d intestazioni obsolete in cache"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "non trovo l'hdlist file per il supporto \"%s\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr "il supporto \"%s\" cerca di usare una hdlist già usata, lo ignoro"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr "<caratteri non visualizzabili>"
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr "problema in lettura dell'hdlist file, riprovo"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
+msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "non riesco ad usare il nome \"%s\" per il supporto perchè è già in uso"
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "rimuovo il media \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr "problema in lettura dell'hdlist file, riprovo"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, 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 "
 "un list file [%s]"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "sto tenendo solo i file referenziati in provides"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "non riesco a costruire un file di sintesi per il supporto \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d intestazioni trovate in cache"
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "tentativo di selezionare un media multiplo: %s"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "evita di selezionare %s, linguaggio locale non ancora selezionato"
+msgid "unable to update medium \"%s\"\n"
+msgstr "non riesco ad aggiornare il supporto \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"rimuovo %s per aggiornare a %s ...\n"
-"  poichè altrimenti non si aggiornerebbe"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - ripulisci la cache directory delle intestazioni.\n"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "il supporto \"%s\" già esiste"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "non riesco a scrivere il list file di \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "scrivi il file di configurazione [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+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"
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "nessun pacchettto denominato %s"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "ho costruito la sintesi dell'hdlist file per il supporto \"%s\""
-
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr ""
-"non riesco a costruira la sintesi dell'hdlist, uso il metodo parsehdlist"
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Provo l'installazione ancora più forzata (--force)? (y/N) "
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "non riesco a trovare l'hdlist file per \"%s\", supporto ignorato"
 
-#: po/placeholder.h:66
+#: po/placeholder.h:58 po/placeholder.h:248
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "ho costruito la sintesi dell'hdlist file per il supporto \"%s\""
+
+#: po/placeholder.h:59 po/placeholder.h:251
 msgid "urpmi database locked"
 msgstr "database urpmi bloccato"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, c-format
-msgid "mounting %s"
-msgstr "sto montando %s"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (Y/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - seleziona tutti i match da riga di comando.\n"
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
-"non risco ad occuparmi del supporto \"%s\", il list file è già usato da un "
-"altro supporto"
+"alcuni pacchetti devono essere rimossi per venire aggiornati, questo non è\n"
+"ancora supportato\n"
 
-#: po/placeholder.h:69
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "esamino il file di sintesi [%s]"
+msgid "mounting %s"
+msgstr "sto montando %s"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - forza la generazione degli hdlist file.\n"
+
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget fallito: uscito con %d o segnale %d\n"
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "non riesco a recuperare il pathname per il media removibile \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "niente da rimuovere (usa urpmi.addmedia per aggiungere un supporto)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "input malformato: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+"  -u             - rimuovi i pacchetti se una versione migliore è già "
+"installata.\n"
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, 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 "One of the following packages is needed to install %s:"
+msgstr "Per installare %s è richiesto uno dei seguenti pacchetti:"
 
-#: po/placeholder.h:74
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Premi enter appena terminato..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr "...copia fallita"
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr "il supporto \"%s\" cerca di usare una lista già usata, lo ignoro"
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr "recupero i file hdlist..."
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "non riesco ad accedere all'hdlist file di \"%s\", ignoro il supporto"
-
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "non riesco a registrare il file rpm"
-
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr "  -h             - stampa questo messaggio di aiuto.\n"
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "non riesco ad analizzare il list file per \"%s\", ignoro il supporto"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr "  -g             - stampa anche i gruppi col nome.\n"
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "troppi mount point per il media removibile \"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - seleziona tutti i media.\n"
 
-#: po/placeholder.h:82
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "descrizione hdlist non valida \"%s\" nei file di hdlist"
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "list file incoerente per \"%s\", ignoro il supporto"
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr ""
+"  -h             - prova a trovare ed usare la sintesi o l'hdlist file.\n"
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "copia di [%s] fallita"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
+msgstr "  -r             - stampa anche versione e release col nome.\n"
+
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - stampa versione, release e architettura con il nome.\n"
+
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
+"  --auto         - seleziona automaticamente un pacchetto valido nelle "
+"scelte.\n"
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "non riesco ad analizzare correttamente [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "niente da aggiornare (usa urpmi.addmedia per aggiungere un supporto)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
 msgid "read synthesis file [%s]"
 msgstr "leggo il file di sintesi [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "non riesco ad analizzare la sintesi dei dati di %s"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "programmi di webfetch (attualmente curl o wget) non trovati\n"
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "recupero la source hdlist (o una sitntesi) di \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
+msgstr ""
+"  -c             - scegli il metodo completo per risolvere la chiusura dei "
+"requisiti.\n"
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr "...copia terminata"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "non riesco a creare il supporto \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copio la source hdlist (o una sintesi) di \"%s\"..."
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
-msgstr "copio l'hdlist file..."
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "errore di sintassi nel file di configurazione alla linea %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "uso: urpmi.removemedia [-a] <nome> ..."
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "sto costruendo l'hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "non riesco a leggere il file rpm [%s] dal supporto \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
+"  --media        - usa solo i media nella lista, separati da virgole.\n"
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr "media %s aggiunto"
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "non riesco a leggere il file rpm [%s] dal supporto \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "recupero della source hdlist (o sintesi) fallito"
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "errore durante la registrazione dei pacchetti locali"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "prendo il device removibile come \"%s\""
-
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...recupero fallito: %s"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "supporto incoerente \"%s\", segnato come removibile ma non tale"
 
-#: po/placeholder.h:102
-#, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "copio il file di descrizione di \"%s\"..."
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "non riesco a scrivere l'hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "il supporto \"%s\" non è selezionato"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nome del file rpm non valido [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "dati sconosciuti associati a %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "cerco di bypassare il supporto esistente \"%s\", evito"
+msgid "What is your choice? (1-%d) "
+msgstr "Qual'è la tua scelta? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "non riesco ad accedere il list file di \"%s\", ignoro il supporto"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - usa wget per recuperare file remoti.\n"
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "evita di selezionare %s poichè non saranno aggiornati abbastanza file"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "non riesco ad accedere al file rpm [%s]"
 
-#: po/placeholder.h:111
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Spiacente, scelta errata, prova di nuovo\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"rimuovo %s per aggiornare %s ...\n"
-" poichè altrimenti non si aggiornerebbe correttamente!"
+msgid "unable to access medium \"%s\""
+msgstr "non riesco ad accedere al supporto \"%s\""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "%s lemmi riposizionati nella deplist"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - usa curl per recuperare i file remoti.\n"
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "non riesco ad accedere al supporto \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "tentativo di selezionare un supporto inesistente \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr "non riesco ad analizzare correttamente [%s] al valore \"%s\""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "tentativo di selezionare un supporto inesistente \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "nessun file rpm trovato da [%s]"
+
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr "curl mancante\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "I seguenti pacchetti contengono %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "non riesco a determinare il supporto di questo hdlist file [%s]"
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - stampa questo messaggio di aiuto.\n"
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "tutto già installato"
 
-#: po/placeholder.h:120
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr "recuper i file rpm..."
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nessun file rpm trovato da [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "sto usando un diverso device removibile [%s] per \"%s\""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "E' richiesto uno dei seguenti pacchetti:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"non riesco ad accedere al primo media di installazione (non trovo il file "
+"Mandrake/base/hdlist)"
 
-#: po/placeholder.h:121
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "esamino l'hdlist file [%s]"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: non posso leggere il file rpm \"%s\"\n"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
-msgstr "nessuna entry riallocata nella depslist"
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
-msgstr "...recupero terminato"
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Installazione fallita"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr "non riesco ad accedere il primo media di installazione"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -p             - abilita la ricerca tra i provides per trovare il "
+"pacchetto.\n"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "sto selezionando %s usando obsoletes"
+msgid "unmounting %s"
+msgstr "sto smontando %s"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl fallito: uscito con %d o segnale %d\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "sto rimuovendo %d intestazioni obsolete in cache"
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "sto selezionando %s attraverso selezione su file"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "non trovo l'hdlist file per il supporto \"%s\""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
-msgstr "curl mancante\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr "<caratteri non visualizzabili>"
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modalità prolissa.\n"
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "copio la source list di \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "rimuovo il media \"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr "wget mancante\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "non riesco a costruire un file di sintesi per il supporto \"%s\""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:143 po/placeholder.h:238
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "non riesco a determinare il supporto di questo hdlist file [%s]"
+msgid "trying to select multiple medium: %s"
+msgstr "tentativo di selezionare un media multiplo: %s"
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - stampa questo messaggio di aiuto.\n"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - seleziona tutti i media non removibili.\n"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "tutto già installato"
+#: po/placeholder.h:145 po/placeholder.h:354
+#, fuzzy
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr ""
+"  i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "evita di selezionare %s, linguaggio locale non ancora selezionato"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  -v             - modalità prolissa.\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+"  --complete     - usa il server parsehdlist per completare la selezione.\n"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "E' richiesto uno dei seguenti pacchetti:"
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "scrivi il file di configurazione [%s]"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
-msgstr "--update       - usa solo media di aggiornamento.\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr ""
+"non riesco a costruira la sintesi dell'hdlist, uso il metodo parsehdlist"
 
-#: po/placeholder.h:138 urpmi:321
+#: po/placeholder.h:151 po/placeholder.h:413
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
-"installazione fallita, alcuni file sono mancanti.\n"
-"Potresti voler aggiornare il tuo database di urpmi"
+"  --distrib      - crea automaticamente tutti i media da un media di "
+"installazione.\n"
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --auto         - seleziona automaticamente un pacchetto valido nelle "
-"scelte.\n"
+"non risco ad occuparmi del supporto \"%s\", il list file è già usato da un "
+"altro supporto"
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Installazione fallita"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
+msgstr "esamino il file di sintesi [%s]"
 
-#: po/placeholder.h:145 po/placeholder.h:270
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "non riesco a recuperare il pathname per il media removibile \"%s\""
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, 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\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
 msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --auto-select  - seleziona automaticamente i pacchetti per aggiornare il "
-"sistema.\n"
+"Per soddisfare le dipendenze, saranno installati i seguenti pacchetti(%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr "recupero i file hdlist..."
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
+
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "non riesco ad accedere all'hdlist file di \"%s\", ignoro il supporto"
+
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "non riesco a registrare il file rpm"
 
-#: po/placeholder.h:147
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "non riesco ad analizzare il list file per \"%s\", ignoro il supporto"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "troppi mount point per il media removibile \"%s\""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "list file incoerente per \"%s\", ignoro il supporto"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
+msgstr "--update       - usa solo media di aggiornamento.\n"
+
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "copia di [%s] fallita"
+
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - estendi la query alle dipendenze del pacchetto.\n"
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "non riesco ad analizzare la sintesi dei dati di %s"
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "recupero la source hdlist (o una sitntesi) di \"%s\"..."
+
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - usa X per l'interfaccia.\n"
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr "...copia terminata"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -696,131 +798,197 @@ msgid ""
 msgstr ""
 "Per soddisfare le dipendenze, saranno installati i seguenti pacchetti(%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-#, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -p             - abilita la ricerca tra i provides per trovare il "
-"pacchetto.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr "copio l'hdlist file..."
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "errore di sintassi nel file di configurazione alla linea %s"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Provo l'installazione senza controllare le dipendenze? (y/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-"  --media        - usa solo i media nella lista, separati da virgole.\n"
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - scegli l'interfaccia migliore a seconda dell'ambiente:\n"
-"                   X o modalità testuale.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "errore durante la registrazione dei pacchetti locali"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modalità prolissa.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "prendo il device removibile come \"%s\""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - abilita la ricerca tra i provides per trovare il "
 "pacchetto.\n"
 
-#: po/placeholder.h:158
-#, fuzzy
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-"  i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modalità silenziosa.\n"
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr ""
-"  --complete     - usa il server parsehdlist per completare la selezione.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "copio il file di descrizione di \"%s\"..."
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Qual'è la tua scelta? (1-%d) "
+msgid "unable to build hdlist: %s"
+msgstr "non riesco a scrivere l'hdlist: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - usa wget per recuperare file remoti.\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "il supporto \"%s\" non è selezionato"
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"urpmi versione %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Questo è software gratuito e può essere ridistribuito sotto i termini della "
-"GNU GPL.\n"
-"uso:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "cerco di bypassare il supporto esistente \"%s\", evito"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Provo l'installazione ancora più forzata (--force)? (y/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modalità silenziosa.\n"
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - forza l'invocazione anche se alcuni pacchetti non "
 "esistono.\n"
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Spiacente, scelta errata, prova di nuovo\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - seleziona tutti i match da riga di comando.\n"
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - usa curl per recuperare i file remoti.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "sto installando %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 "Per favore inserisci il supporto denominato \"%s\" nel dispositivo [%s]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "I seguenti pacchetti contengono %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr "esamino l'hdlist file [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr "nessuna entry riallocata nella depslist"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - crea un media di update.\n"
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+"  -d             - forza la computazione completa del file deplist.ordered.\n"
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "non riesco a recuperare pacchetto sorgente, interrompo"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Premi enter appena terminato..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr "...recupero terminato"
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "sto selezionando %s usando obsoletes"
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl fallito: uscito con %d o segnale %d\n"
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "sto selezionando %s attraverso selezione su file"
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "copio la source list di \"%s\"..."
+
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 msgid "Only superuser is allowed to install packages"
 msgstr "Solo superuser è abilitato ad installare pacchetti"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr "wget mancante\n"
+
+#: po/placeholder.h:240
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Per installare %s è richiesto uno dei seguenti pacchetti:"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"rimuovo %s per aggiornare a %s ...\n"
+"  poichè altrimenti non si aggiornerebbe"
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"rimuovo %s per aggiornare %s ...\n"
+" poichè altrimenti non si aggiornerebbe correttamente!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+"installazione fallita, alcuni file sono mancanti.\n"
+"Potresti voler aggiornare il tuo database di urpmi"
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+"  --best-output  - scegli l'interfaccia migliore a seconda dell'ambiente:\n"
+"                   X o modalità testuale.\n"
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"urpmi versione %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"Questo è software gratuito e può essere ridistribuito sotto i termini della "
+"GNU GPL.\n"
+"uso:\n"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
 "%s\n"
@@ -829,7 +997,7 @@ msgstr ""
 "%s\n"
 "non c'è bisogno di fornire <relativo percorso di hdlist> con --distrib"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -851,17 +1019,7 @@ msgstr ""
 "       removable://<path>\n"
 "e le [opzioni] una combinazione di\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "non riesco a creare il supporto \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "non riesco ad aggiornare il supporto \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -871,11 +1029,7 @@ msgstr ""
 "\n"
 "opzioni sconosciute '%s'\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - ripulisci la cache directory delle intestazioni.\n"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -884,16 +1038,7 @@ msgstr ""
 "%s\n"
 "manca <relativo percorso di hdlist>\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - forza la generazione degli hdlist file.\n"
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-"  -h             - prova a trovare ed usare la sintesi o l'hdlist file.\n"
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -902,54 +1047,7 @@ msgstr ""
 "%s\n"
 "`with` mancante per media ftp\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - crea un media di update.\n"
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-"  --distrib      - crea automaticamente tutti i media da un media di "
-"installazione.\n"
-
-#: po/placeholder.h:218
-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 media da aggiornare.\n"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"il lemma da aggiornare è mancante\n"
-"(uno di %s)\n"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - forza la computazione completa del file deplist.ordered.\n"
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "niente da aggiornare (usa urpmi.addmedia per aggiungere un supporto)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - seleziona tutti i media non removibili.\n"
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "niente da rimuovere (usa urpmi.addmedia per aggiungere un supporto)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -958,11 +1056,7 @@ msgstr ""
 "il lemma da rimuovere è mancante\n"
 "(uno di %s)\n"
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - seleziona tutti i media.\n"
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
@@ -970,34 +1064,24 @@ msgstr ""
 "uso: urpmi.removemedia [-a] <nome> ...\n"
 "dove <nome> è il nome del supporto da rimuovere.\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr "  -h             - stampa questo messaggio di aiuto.\n"
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr "  -g             - stampa anche i gruppi col nome.\n"
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: non posso leggere il file rpm \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr "  -r             - stampa anche versione e release col nome.\n"
+"uso: urpmi.update [opzioni] <nome> ...\n"
+"dove <nome> è il nome del media da aggiornare.\n"
 
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  -f             - stampa versione, release e architettura con il nome.\n"
+"il lemma da aggiornare è mancante\n"
+"(uno di %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1012,38 +1096,7 @@ msgstr ""
 "GNU GPL.\n"
 "uso:\n"
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - estendi la query alle dipendenze del pacchetto.\n"
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - dai tutti i pacchetti sorgenti prima del download (solo "
-"root).\n"
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-"  -c             - scegli il metodo completo per risolvere la chiusura dei "
-"requisiti.\n"
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"alcuni pacchetti devono essere rimossi per venire aggiornati, questo non è\n"
-"ancora supportato\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
@@ -1052,13 +1105,6 @@ msgstr ""
 "database\n"
 "                   di urpmi allo stdout (solo root).\n"
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-"  -u             - rimuovi i pacchetti se una versione migliore è già "
-"installata.\n"
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1101,17 +1147,17 @@ msgstr ") . _("
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "uso: urpmi.update [opzioni] <nome> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "uso: urpmi.removemedia [-a] <nome> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "uso: urpmi.removemedia [-a] <nome> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "uso: urpmi.update [opzioni] <nome> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index d15d8bed..a4dcc24f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 1999-12-19 14:43+0100\n"
 "Last-Translator: Taisuke Yamada <tai@imasy.or.jp>\n"
 "Language-Team: Japanese\n"
@@ -24,28 +24,32 @@ msgid ""
 "You requested installation of package $rpm\n"
 msgstr "»ØÄꤵ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¡Ê%s¡Ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹¡Ä\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "¤è¤í¤·¤¤¤Ç¤·¤ç¤¦¤«¡©"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "¤Ï¤¤¡Ê³¹Ô¤¹¤ë¡Ë"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "¤¤¤¤¤¨¡ÊÃæ»ß¤¹¤ë¡Ë"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn£Î£î¤¤¥¤"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "Yy£Ù£ù¤Ï¥Ï"
 
 # £ù
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (¤Ï¤¤(Y)/¤¤¤¤¤¨(n)) [¤Ï¤¤] "
 
@@ -53,741 +57,900 @@ msgstr " (¤Ï¤¤(Y)/¤¤¤¤¤¨(n)) [¤Ï¤¤] "
 msgid "$rpm: command not found\n"
 msgstr "¥³¥Þ¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, fuzzy, c-format
 msgid "urpmf version %s"
 msgstr "urpmi ¥Ð¡¼¥¸¥ç¥ó %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 #, fuzzy
 msgid "usage: urpmf [options] <file>"
 msgstr "»ÈÍÑÊýË¡: rpmf [¥Õ¥¡¥¤¥ë̾]"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "¥¢¥Ã¥×¥Ç¡¼¥È¤ò¡Ö%s¡×¤Ë¤Ä¤¤¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "¥¢¥Ã¥×¥Ç¡¼¥È¤ò¡Ö%s¡×¤Ë¤Ä¤¤¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr ""
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, fuzzy, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "¥¢¥Ã¥×¥Ç¡¼¥È¤ò¡Ö%s¡×¤Ë¤Ä¤¤¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "¥¢¥Ã¥×¥Ç¡¼¥È¤ò¡Ö%s¡×¤Ë¤Ä¤¤¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "%s ¤È¤¤¤¦¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
+"ºÆÅÙ¥¤¥ó¥¹¥È¡¼¥ë¤ò»î¤ß¤Þ¤¹¤«¡©¡Ê--force ÁêÅö¤Ç¤¹¡Ë (¤Ï¤¤(y)/¤¤¤¤¤¨(N)) [¤¤¤¤"
+"¤¨] "
 
-#: po/placeholder.h:64
-#, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "¥¢¥Ã¥×¥Ç¡¼¥È¤ò¡Ö%s¡×¤Ë¤Ä¤¤¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
-
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:58 po/placeholder.h:248
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ¡Ä\n"
+# £ù
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (¤Ï¤¤(Y)/¤¤¤¤¤¨(n)) [¤Ï¤¤] "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¤¿¤á¤Ë¤Ï¤¤¤¯¤Ä¤«¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë\n"
+"ɬÍפ¬¤¢¤ê¤Þ¤¹¡Ê¤³¤ì¤Ï̤¼ÂÁõ¤Ç¤¹¡Ë\n"
 
-#: po/placeholder.h:69
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
+msgid "mounting %s"
+msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ¡Ä\n"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr ""
+
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"\"ºï½ü¤¬É¬Íפʤâ¤Î¤Ï¤¢¤ê¤Þ¤»¤ó¡£\\n\"\n"
+"\"¥á¥Ç¥£¥¢¤òÄɲ乤ë¾ì¹ç¤Ï urpmi.addmedia ¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\\n\"\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "¼¡¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤¤¤º¤ì¤«¤¬É¬ÍפǤ¹:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "½ª¤ï¤Ã¤¿¸å¤Ï¥ê¥¿¡¼¥ó¥­¡¼¤ò²¡¤·¤Æ²¼¤µ¤¤¡£"
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
-
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, fuzzy, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "¥¢¥Ã¥×¥Ç¡¼¥È¤ò¡Ö%s¡×¤Ë¤Ä¤¤¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"¥¢¥Ã¥×¥Ç¡¼¥È¤¬É¬Íפʤâ¤Î¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
+"¥á¥Ç¥£¥¢¤òÄɲ乤ë¾ì¹ç¤Ï urpmi.addmedia ¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "¥¢¥Ã¥×¥Ç¡¼¥È¤ò¡Ö%s¡×¤Ë¤Ä¤¤¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr ""
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
+"̤ÃΤΥª¥×¥·¥ç¥ó¡Ê\"-$1\"¡Ë¤Ç¤¹¡£\n"
+"»ÈÍÑÊýË¡¤ò --help ¥ª¥×¥·¥ç¥ó¤Ç³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"»ÈÍÑÊýË¡¡§urpmi [-h] [--auto] [--force] [-a] ¥Ñ¥Ã¥±¡¼¥¸Ì¾ [¥Ñ¥Ã¥±¡¼¥¸Ì¾¡Ä]\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, fuzzy, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "¤É¤ì¤òÁª¤Ó¤Þ¤¹¤«¡©(1-%d) "
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
+#, c-format
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, fuzzy, c-format
-msgid "unable to build hdlist: %s"
+msgid "unable to access rpm file [%s]"
+msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
+
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Í­¸ú¤ÊÁªÂò¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤â¤¦°ìÅÙ¤ª´ê¤¤¤·¤Þ¤¹\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\""
 msgstr "¥¢¥Ã¥×¥Ç¡¼¥È¤ò¡Ö%s¡×¤Ë¤Ä¤¤¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
-#, c-format
-msgid "invalid rpm file name [%s]"
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:114 po/placeholder.h:303
+#, fuzzy, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
+
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unknown data associated with %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
-#, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
-#, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
 
-#: po/placeholder.h:111
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "¤¹¤Ù¤Æ´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "¼¡¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤¤¤º¤ì¤«¤¬É¬ÍפǤ¹:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: RPM¥Õ¥¡¥¤¥ë¡Ê$_¡Ë¤òÆɤळ¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
 msgstr "¥¢¥Ã¥×¥Ç¡¼¥È¤ò¡Ö%s¡×¤Ë¤Ä¤¤¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "unmounting %s"
+msgstr ""
+
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr ""
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "removing medium \"%s\""
 msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:142 po/placeholder.h:236
 #, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "%s ¤Ï¼¡¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÎÃæ¤Ë¤¢¤ê¤Þ¤¹: %s\n"
-
-#: po/placeholder.h:120
-#, c-format
-msgid "no rpm files found from [%s]"
-msgstr ""
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "¥¢¥Ã¥×¥Ç¡¼¥È¤ò¡Ö%s¡×¤Ë¤Ä¤¤¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: po/placeholder.h:121
+#: po/placeholder.h:143 po/placeholder.h:238
 #, fuzzy, c-format
-msgid "examining hdlist file [%s]"
+msgid "trying to select multiple medium: %s"
 msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "¥¢¥Ã¥×¥Ç¡¼¥È¤ò¡Ö%s¡×¤Ë¤Ä¤¤¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr ""
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
-msgstr ""
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "°Í¸´Ø·¸¤Î¤¿¤á¡¢¼¡¤Î¥Ñ¥Ã¥±¡¼¥¸¤â¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹ (%d MB)"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "¤¹¤Ù¤Æ´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 "̤ÃΤΥª¥×¥·¥ç¥ó¡Ê\"-$1\"¡Ë¤Ç¤¹¡£\n"
 "»ÈÍÑÊýË¡¤ò --help ¥ª¥×¥·¥ç¥ó¤Ç³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "¼¡¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤¤¤º¤ì¤«¤¬É¬ÍפǤ¹:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+#, fuzzy
+msgid "unable to register rpm file"
+msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "¥¢¥Ã¥×¥Ç¡¼¥È¤ò¡Ö%s¡×¤Ë¤Ä¤¤¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "°Í¸´Ø·¸¤Î¤¿¤á¡¢¼¡¤Î¥Ñ¥Ã¥±¡¼¥¸¤â¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹ (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr ""
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 "°Í¸´Ø·¸¤ò³Îǧ¤»¤º¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤ò»î¤ß¤Þ¤¹¤«¡© (¤Ï¤¤(y)/¤¤¤¤¤¨(N)) [¤¤¤¤¤¨] "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
-msgid "  -p             - allow search in provides to find package.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, fuzzy, c-format
+msgid "unable to build hdlist: %s"
+msgstr "¥¢¥Ã¥×¥Ç¡¼¥È¤ò¡Ö%s¡×¤Ë¤Ä¤¤¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr ""
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:191 po/placeholder.h:355
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "¤É¤ì¤òÁª¤Ó¤Þ¤¹¤«¡©(1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ¡Ä\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "¥á¥Ç¥£¥¢¡Ê%s¡Ë¤ò %s ¤ËÁÞÆþ¤·¤Æ²¼¤µ¤¤¡£"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "%s ¤Ï¼¡¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÎÃæ¤Ë¤¢¤ê¤Þ¤¹: %s\n"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
 msgstr ""
-"ºÆÅÙ¥¤¥ó¥¹¥È¡¼¥ë¤ò»î¤ß¤Þ¤¹¤«¡©¡Ê--force ÁêÅö¤Ç¤¹¡Ë (¤Ï¤¤(y)/¤¤¤¤¤¨(N)) [¤¤¤¤"
-"¤¨] "
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Í­¸ú¤ÊÁªÂò¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤â¤¦°ìÅÙ¤ª´ê¤¤¤·¤Þ¤¹\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£¤³¤Î¤Þ¤Þ½ªÎ»¤·¤Þ¤¹"
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "installing %s\n"
-msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ¡Ä\n"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "¥á¥Ç¥£¥¢¡Ê%s¡Ë¤ò %s ¤ËÁÞÆþ¤·¤Æ²¼¤µ¤¤¡£"
-
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£¤³¤Î¤Þ¤Þ½ªÎ»¤·¤Þ¤¹"
+msgid "selecting %s by selection on files"
+msgstr ""
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "½ª¤ï¤Ã¤¿¸å¤Ï¥ê¥¿¡¼¥ó¥­¡¼¤ò²¡¤·¤Æ²¼¤µ¤¤¡£"
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 "¥í¡¼¥«¥ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¡¼¤Ç¤Ê¤¯¤Æ¤Ï¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "¼¡¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤¤¤º¤ì¤«¤¬É¬ÍפǤ¹:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -796,7 +959,7 @@ msgstr ""
 "%s\n"
 "¡Ö<relative path of hdlist>¡×Éôʬ¤Î»ØÄ꤬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -817,17 +980,7 @@ msgstr ""
 "  http://<host>/<path> with <relative filename of hdlist>\n"
 "  removable_<device>://<path>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "¡Ö%s¡×¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "¥¢¥Ã¥×¥Ç¡¼¥È¤ò¡Ö%s¡×¤Ë¤Ä¤¤¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, fuzzy, c-format
 msgid ""
@@ -835,11 +988,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr "̤ÃΤΥª¥×¥·¥ç¥ó¡Ê%s¡Ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -848,15 +997,7 @@ msgstr ""
 "%s\n"
 "¡Ö<relative path of hdlist>¡×Éôʬ¤Î»ØÄ꤬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -865,17 +1006,28 @@ msgstr ""
 "%s\n"
 "¡Öwith ...¡×°Ê¹ß¤Î»ØÄ꤬ ftp ¤Ë¤Ä¤¤¤Æ¤ÏɬÍפǤ¹\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"ºï½üÂоݤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
+"(%s ¤ÎÃæ¤Î¤¤¤º¤ì¤«)\n"
 
-#: po/placeholder.h:217
+#: po/placeholder.h:425
+#, fuzzy
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
+"»ÈÍÑÊýË¡: urpmi.removemedia [-a] <name> ...\n"
+"¤³¤³¤Ç <name> ¤Ïºï½üÂоݤΥá¥Ç¥£¥¢¤Î̾Á°¤Ç¤¹¡£\n"
+"  -a    ¤¹¤Ù¤Æ¤Î¥á¥Ç¥£¥¢¤òÁªÂò¤·¤Þ¤¹\n"
+"\n"
+"¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹: %s\n"
 
-#: po/placeholder.h:218
+#: po/placeholder.h:429
 #, fuzzy
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -887,7 +1039,7 @@ msgstr ""
 "\n"
 "¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹: %s\n"
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -896,78 +1048,7 @@ msgstr ""
 "¥¢¥Ã¥×¥Ç¡¼¥ÈÂоݤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 "(%s ¤ÎÃæ¤Î¤¤¤º¤ì¤«)\n"
 
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"¥¢¥Ã¥×¥Ç¡¼¥È¤¬É¬Íפʤâ¤Î¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
-"¥á¥Ç¥£¥¢¤òÄɲ乤ë¾ì¹ç¤Ï urpmi.addmedia ¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"\"ºï½ü¤¬É¬Íפʤâ¤Î¤Ï¤¢¤ê¤Þ¤»¤ó¡£\\n\"\n"
-"\"¥á¥Ç¥£¥¢¤òÄɲ乤ë¾ì¹ç¤Ï urpmi.addmedia ¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\\n\"\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
-#, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"ºï½üÂоݤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
-"(%s ¤ÎÃæ¤Î¤¤¤º¤ì¤«)\n"
-
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
-#, fuzzy
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"»ÈÍÑÊýË¡: urpmi.removemedia [-a] <name> ...\n"
-"¤³¤³¤Ç <name> ¤Ïºï½üÂоݤΥá¥Ç¥£¥¢¤Î̾Á°¤Ç¤¹¡£\n"
-"  -a    ¤¹¤Ù¤Æ¤Î¥á¥Ç¥£¥¢¤òÁªÂò¤·¤Þ¤¹\n"
-"\n"
-"¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹: %s\n"
-
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:255 urpmq:90
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: RPM¥Õ¥¡¥¤¥ë¡Ê$_¡Ë¤òÆɤळ¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -977,46 +1058,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¤¿¤á¤Ë¤Ï¤¤¤¯¤Ä¤«¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë\n"
-"ɬÍפ¬¤¢¤ê¤Þ¤¹¡Ê¤³¤ì¤Ï̤¼ÂÁõ¤Ç¤¹¡Ë\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"̤ÃΤΥª¥×¥·¥ç¥ó¡Ê\"-$1\"¡Ë¤Ç¤¹¡£\n"
-"»ÈÍÑÊýË¡¤ò --help ¥ª¥×¥·¥ç¥ó¤Ç³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1060,18 +1107,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "»ÈÍÑÊýË¡: urpmi.update [-a] <name> <url>"
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "»ÈÍÑÊýË¡: urpmi.removemedia [-a] <name>"
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "»ÈÍÑÊýË¡: urpmi.removemedia [-a] <name>"
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "»ÈÍÑÊýË¡: urpmi.update [-a] <name> <url>"
 
 #: urpmq:34
 #, c-format
@@ -1203,13 +1250,6 @@ msgstr "urpmq version %s"
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "»ÈÍÑÊýË¡¡§urpmi [-h] [--auto] [--force] [-a] ¥Ñ¥Ã¥±¡¼¥¸Ì¾ [¥Ñ¥Ã¥±¡¼¥¸"
-#~ "̾¡Ä]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "%s ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£¤³¤Î¤Þ¤Þ½ªÎ»¤·¤Þ¤¹"
 
diff --git a/po/ka.po b/po/ka.po
index 045aa3ac..6c91f71e 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2000-05-15 18:58+0200\n"
 "Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
 "Language-Team: Georgian\n"
@@ -23,27 +23,31 @@ msgid ""
 "You requested installation of package $rpm\n"
 msgstr ""
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "თ�ნ�ხმ� ხ�რთ?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "�-ქეი"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "გ�მ�ქცევ�"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "nNaA�"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "yYkKxXხ"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (ხ/�) [ხ] "
 
@@ -51,879 +55,952 @@ msgstr " (ხ/�) [ხ] "
 msgid "$rpm: command not found\n"
 msgstr ""
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr ""
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr ""
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr ""
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "�რც ერთ პ�კეტს �რ ქვი� %s\n"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "გნებ�ვთ ვც�დ� ჩ�წერ� ძ�ლით (--force)? (ხ/�) [�] "
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "ჩ�იშ�ლ� RPM მ�ნ�ცემთ� ბ�ზ�ში შეკითხვ�.\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "ვ�ინსტ�ლირებ: %s\n"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (ხ/�) [ხ] "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, c-format
-msgid "examining synthesis file [%s]"
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "ვ�ინსტ�ლირებ: %s\n"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "ერთერთი შემდეგი პ�კეტი ს�ჭირ��:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "გთხ�ვთ დ�გვიდ�სტურ�თ Enter ღილ�კზე დ�ჭერით..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr ""
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:1421
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
-msgid "unable to analyse synthesis data of %s"
+msgid "read synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"გ�მ�ყენებ�: urpmi [-h] [--auto] [--force] [-a] პ�კეტის_ს�ხელი "
+"[პ�კეტის_ს�ხელები ...]\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "თქვენი �რჩევ�ნი? (1-%d) "
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "unable to build hdlist: %s"
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "ცუდი �რჩევ�ნი�, კიდევ სც�დეთ\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unknown data associated with %s"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "უკვე ყველ�ფერი ჩ�წერილი�"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "ერთერთი შემდეგი პ�კეტი ს�ჭირ��:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "ინსტ�ლ�ცი� ჩ�იშ�ლ�"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr ""
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "%s შედმეგ პ�კეტებში�: %s\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:121
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
-#, c-format
-msgid "selecting %s using obsoletes"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "უკვე ყველ�ფერი ჩ�წერილი�"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "დ�მ�კიდებულებების შეს�სრულებლ�დ შემდეგი პ�კეტები ჩ�იწერებ� (%d მბ)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "ერთერთი შემდეგი პ�კეტი ს�ჭირ��:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "ინსტ�ლ�ცი� ჩ�იშ�ლ�"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "დ�მ�კიდებულებების შეს�სრულებლ�დ შემდეგი პ�კეტები ჩ�იწერებ� (%d მბ)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr ""
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "გნებ�ვთ ვც�დე ჩ�წერ� დ�მ�კიდებულებების შემ�წმების გ�რეშე? (ხ/�) [�] "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "თქვენი �რჩევ�ნი? (1-%d) "
-
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "გნებ�ვთ ვც�დ� ჩ�წერ� ძ�ლით (--force)? (ხ/�) [�] "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "ცუდი �რჩევ�ნი�, კიდევ სც�დეთ\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "ვ�ინსტ�ლირებ: %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "გთხ�ვთ ჩ�დ�თ: %s ს�ხელით: %s"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr ""
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "%s შედმეგ პ�კეტებში�: %s\n"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "გთხ�ვთ დ�გვიდ�სტურ�თ Enter ღილ�კზე დ�ჭერით..."
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
 msgstr ""
-"მხ�ლ�დ სრულუფლები�ნ მ�მხმ�რებელს �ქვს უფლებ� \n"
-"ჩ�წერ�ს პ�კეტები."
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "ერთერთი შემდეგი პ�კეტი ს�ჭირ��:"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
-#, c-format
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:187
-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"
-"and [options] are from\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
-#: urpmi.addmedia:57
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:211 po/placeholder.h:313
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
 msgstr ""
+"მხ�ლ�დ სრულუფლები�ნ მ�მხმ�რებელს �ქვს უფლებ� \n"
+"ჩ�წერ�ს პ�კეტები."
 
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:240
 #, c-format
 msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:217
+#: po/placeholder.h:334 urpmi:321
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:218
+#: po/placeholder.h:348
 msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:359
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
 msgstr ""
 
-#: po/placeholder.h:234
+#: po/placeholder.h:379 urpmi.addmedia:70
+#, c-format
 msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:383
+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"
+"and [options] are from\n"
 msgstr ""
 
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
+#: urpmi.addmedia:57
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:401 urpmi.addmedia:82
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -933,42 +1010,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1011,16 +1058,16 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr ""
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
 msgstr ""
 
 #: urpmq:34
@@ -1036,13 +1083,6 @@ msgstr ""
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "გ�მ�ყენებ�: urpmi [-h] [--auto] [--force] [-a] პ�კეტის_ს�ხელი "
-#~ "[პ�კეტის_ს�ხელები ...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "ს�მწუხ�რ�დ ფ�ილი %s ვერ ვიპ�ვე. გ�მ�ვდივ�რ."
 
diff --git a/po/ko.po b/po/ko.po
index 1441b0c9..5012c837 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-09-22 03:14+0900\n"
 "Last-Translator: Jaegeum Choe <baedaron@hananet.net>\n"
 "Language-Team: Korean <baedaron@hananet.net>\n"
@@ -25,27 +25,31 @@ msgstr ""
 "ÆÑÅ°Áö ÀÚµ¿ ¼³Ä¡...\n"
 "´ÔÀº ÆÑÅ°Áö $rpmÀÇ ¼³Ä¡¸¦ ¿äûÇß½À´Ï´Ù.\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "°è¼ÓÇÒ±î¿ä?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "È®ÀÎ"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Ãë¼Ò"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "Yy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
@@ -53,746 +57,900 @@ msgstr " (Y/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: ¸í·É¾î¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù.\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf ¹öÀü %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "»ç¿ë¹ý: urpmf [¿É¼Çµé] <ÆÄÀÏ>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "´õ ¸¹Àº ¿É¼ÇÀ» º¸·Á¸é urpmf --help¶ó°í Ä¡¼¼¿ä."
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "¼³Á¤ ÆÄÀÏ [%s]¿¡ ±â·ÏÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: po/placeholder.h:30 urpm.pm:1892
-#, fuzzy
-msgid "retrieving rpms files..."
-msgstr "[%s] ÃßÃâ Áß"
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:33
-#, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr "¡¸%s¡¹¿¡ ´ëÇØ ¸ñ·Ï ÆÄÀÏ¿¡ ±â·ÏÇÒ °ÍÀÌ ¾ø½À´Ï´Ù."
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "¡¸%s¡¹¿¡ ´ëÇÑ ¸ñ·Ï ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù. ¸Åü ¹«½ÃµÊ."
 
-#: po/placeholder.h:36
+#: po/placeholder.h:33 po/placeholder.h:218
+#, c-format
+msgid "nothing to write in list file for \"%s\""
+msgstr "¡¸%s¡¹¿¡ ´ëÇØ ¸ñ·Ï ÆÄÀÏ¿¡ ±â·ÏÇÒ °ÍÀÌ ¾ø½À´Ï´Ù."
+
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "¡¸%s¡¹ÀÇ ¸ñ·ÏÆÄÀÏÀ» ºÐ¼®ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "¸ñ·Ï ÆÄÀÏ¿¡¡¸%s¡¹¿¡ ´ëÇÑ ±â·ÏÀÌ ¾ø½À´Ï´Ù."
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, fuzzy, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "[%s] ÃßÃâ Áß"
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "¡¸%s¡¹ÀÇ ¸ñ·Ï ÆÄÀÏ¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù. ¸Åü ¹«½ÃµÊ."
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "ÆÑÅ°Áö %s¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "%s ¸¶¿îÆ® ÇØÁ¦ Áß"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "ij½¬¿¡¼­ %d ³°Àº Çì´õ Á¦°Å Áß"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "¸Åü¡¸%s¡¹¿¡ ´ëÇÑ ¸ñ·Ï ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù."
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr "¸Åü ¡¸%s¡¹´Â ÀÌ¹Ì »ç¿ë ÁßÀÎ ¸ñ·ÏÆÄÀÏÀ» »ç¿ëÇÏ·Á ÇÕ´Ï´Ù. ¸Åü ¹«½ÃµÊ."
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "¸ñ·Ï ÆÄÀÏ [%s] Àд Áß"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "¸Åü À̸§ ¡¸%s¡¹À» »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù. ¹ú½á »ç¿ë ÁßÀÔ´Ï´Ù."
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "Á¸ÀçÇÏÁö ¾Ê´Â ¸Åü¡¸%s¡¹ÀÇ Á¦°Å ½Ãµµ"
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "¸ñ·Ï ÆÄÀÏ [%s] Àд Áß"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "¸ñ·Ï ÆÄÀÏ [%2$s]°¡ Á¸ÀçÇÏÁö ¾Ê±â ¶§¹®¿¡, ¸Åü¡¸%1$s¡¹À» ó¸®ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "Á¦°ø ¸ñ·Ï¿¡¼­ ÂüÁ¶µÇ´Â ÆÄÀϵ鸸 º¸Á¸ Áß"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "¡¸%s¡¹¸Åü¿¡ ´ëÇÑ ÇÕ¼º ÆÄÀÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù."
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "ij½¬¿¡¼­ %d Çì´õ¸¦ ã¾Ò½À´Ï´Ù."
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "Á¸ÀçÇÏÁö ¾Ê´Â ¸Åü¡¸%s¡¹ ¼±Åà ½Ãµµ"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "·ÎÄÉÀÏ ¾ð¾î°¡ ¾ÆÁ÷ ¼±ÅõÇÁö ¾Ê¾ÒÀ¸¹Ç·Î, %sÀÇ ¼±ÅÃÀ» ÇÇÇϼ¼¿ä."
+msgid "unable to update medium \"%s\"\n"
+msgstr "¡¸%s¡¹¸Åü¸¦ ¾÷µ¥ÀÌÆ®ÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
 
-#: po/placeholder.h:55
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
-"%2$s·Î ¾÷±×·¹À̵带 À§ÇØ %s Á¦°Å Áß ...\n"
-"ÀÌ ¹æ¹ý¿Ü¿¡´Â ´Þ¸® ¾÷±×·¹ÀÌµå ¹æ¹ýÀÌ ¾ø½À´Ï´Ù."
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "¸Åü¡¸%s¡¹´Â ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù."
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "¡¸%s¡¹ÀÇ ¸ñ·Ï ÆÄÀÏÀ» ±â·ÏÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "¼³Á¤ ÆÄÀÏ [%s]¿¡ ±â·Ï"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "%s¶ó´Â ÆÑÅ°Áö´Â ¾ø½À´Ï´Ù."
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "¼³Ä¡¸¦ °­Á¦ ÃßÁøÇմϱî? (y/N) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "¡¸%s¡¹¿¡ ´ëÇÑ ¸ñ·Ï ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù. ¸Åü ¹«½ÃµÊ."
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "¸Åü¡¸%s¡¹¿¡ ´ëÇÑ ¸ñ·Ï ÇÕ¼º ÆÄÀÏ »ý¼º ¿Ï·á."
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "¡¸%s¡¹¸Åü¿¡ ´ëÇÑ ÇÕ¼º ÆÄÀÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù."
+msgid " (y/N) "
+msgstr " (Y/n) "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "¡¸%s¡¹¿¡ ´ëÇÑ ¸ñ·Ï ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù. ¸Åü ¹«½ÃµÊ."
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"¾÷±×·¹À̵åÇϱâ À§Çؼ­´Â ÀϺΠÆÑÅ°Áö°¡ Á¦°ÅµÇ¾î¾ß ÇÕ´Ï´Ù. ÀÌ ±â´ÉÀº ¾ÆÁ÷ Áö¿ø"
+"µÇÁö ¾Ê½À´Ï´Ù.\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "%s ¸¶¿îÆ® Áß"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
-"¸ñ·Ï ÆÄÀÏÀÌ ´Ù¸¥ ¸Åü¿¡ ÀÇÇØ ÀÌ¹Ì »ç¿ëµÇ°í Àֱ⠶§¹®¿¡, ¸Åü ¡¸%s¡¹¸¦ »ç¿ëÇÒ "
-"¼ö ¾ø½À´Ï´Ù."
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "ÀÇÁ¸¸ñ·Ï ÆÄÀÏ [%s] Àбâ"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "¡¸%s¡¹¸Åü¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"Á¦°ÅÇÒ °ÍÀÌ ¾ø½À´Ï´Ù. (¹Ìµð¾î¸¦ Ãß°¡ÇÏ·Á¸é ¡¸urpmi.addmedia¡¹¸¦ »ç¿ëÇϼ¼¿ä.\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "À߸øµÈ Çü½ÄÀÇ ÀÔ·Â: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "µ¿ÀÏÇÑ ÆÄÀÏ À̸§ ¡¸%s¡¹¸¦ °¡Áø ¿©·¯ °³ÀÇ ÆÑÅ°Áö°¡ Á¸ÀçÇÕ´Ï´Ù."
+msgid "One of the following packages is needed to install %s:"
+msgstr "´ÙÀ½ ÆÑÅ°Áöµé Áß Çϳª°¡ %s¸¦ ¼³Ä¡Çϴµ¥ ÇÊ¿äÇÕ´Ï´Ù:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "´Ù µÇ¾úÀ¸¸é ENTERÅ°¸¦ ´©¸£¼¼¿ä..."
 
-#: po/placeholder.h:74
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr "¸Åü ¡¸%s¡¹°¡ ÀÌ¹Ì »ç¿ëµÇ´Â ¸ñ·ÏÀ» »ç¿ëÇÏ·Á ÇÕ´Ï´Ù. ¸Åü ¹«½ÃµÊ."
 
-#: po/placeholder.h:76
-#, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "[%s] ÃßÃâ Áß"
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "¡¸%s¡¹ÀÇ ¸ñ·Ï ÆÄÀÏ¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù. ¸Åü ¹«½ÃµÊ."
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "RPM ÆÄÀÏÀ» µî·ÏÇÒ ¼ö ¾ø½À´Ï´Ù."
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "[%s] º¹»ç ½ÇÆÐ."
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "¡¸%s¡¹À» ¿Ã¹Ù¸£°Ô ºÐ¼®ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"¾÷µ¥ÀÌÆ®ÇÒ °ÍÀÌ ¾ø½À´Ï´Ù. (¹Ìµð¾î¸¦ Ãß°¡ÇÏ·Á¸é ¡¸urpmi.addmedia¡¹¸¦ »ç¿ëÇϼ¼"
+"¿ä.\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "ÀÇÁ¸¸ñ·Ï ÆÄÀÏ [%s] Àбâ"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "¡¸%s¡¹ÀÇ ¸ñ·ÏÆÄÀÏÀ» ºÐ¼®ÇÒ ¼ö ¾ø½À´Ï´Ù."
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-#, fuzzy
-msgid "...copying done"
-msgstr "[%s] ÃßÃâ Áß"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "¡¸%s¡¹¸Åü¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "¸ñ·Ï ÆÄÀÏ [%s] Àд Áß"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "¼³Á¤ ÆÄÀÏÀÇ %s ÁÙ¿¡ ¹®¹ý ¿À·ù"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ¾Ë ¼ö ¾ø´Â ¿É¼Ç ¡¸-%s¡¹, ¡¸--help¡¹¿É¼ÇÀ¸·Î »ç¿ë¹ýÀ» º¸¼¼¿ä.\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "»ç¿ë¹ý: urpmi.removemedia [-a] <À̸§> ..."
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "¸ñ·Ï [%s] »ý¼º Áß"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "¸Åü¡¸%2$s¡¹¿¡¼­ RPM ÆÄÀÏ¡¸%1$s¡¹¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù."
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "Áö¿ª ÆÑÅ°Áö µî·Ï ¿À·ù"
-
-#: po/placeholder.h:99
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "¸Åü¡¸%2$s¡¹¿¡¼­ RPM ÆÄÀÏ¡¸%1$s¡¹¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù."
+
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "[%s] ÃßÃâ Áß"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "¸ñ·Ï ÆÄÀÏ¿¡¡¸%s¡¹¿¡ ´ëÇÑ ±â·ÏÀÌ ¾ø½À´Ï´Ù."
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "¸ñ·Ï ÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "¸Åü [%s]´Â ¼±ÅõÇÁö ¾Ê¾Ò½À´Ï´Ù."
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "À¯È¿ÇÏÁö ¾ÊÀº RPM ÆÄÀÏ À̸§ [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "%s¿Í °ü·ÃµÈ ¾Ë ¼ö ¾ø´Â µ¥ÀÌÅÍ"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "¾î´À °ÍÀ» ¼±ÅÃÇϽðڽÀ´Ï±î? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "¡¸%s¡¹ÀÇ ¸ñ·Ï ÆÄÀÏ¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù. ¸Åü ¹«½ÃµÊ."
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "RPM ÆÄÀÏ¡¸%s¡¹¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: po/placeholder.h:111
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"%2$s·Î ¾÷±×·¹À̵åÇϱâ À§ÇØ %1$s Á¦°ÅÁß...\n"
-"¿Ã¹Ù¸¥ ¾÷±×·¹À̵带 À§ÇØ ÇÊ¿äÇÕ´Ï´Ù!"
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "ÀÇÁ¸¸ñ·Ï¿¡¼­ %s Ç׸ñ À§Ä¡ ÀçÁöÁ¤"
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "¼±ÅÃÀÌ À߸øµÇ¾ú½À´Ï´Ù. ´Ù½Ã ½ÃµµÇϼ¼¿ä.\n"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "¸Åü¡¸%s¡¹¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "relocated %s entries in depslist"
+msgstr "ÀÇÁ¸¸ñ·Ï¿¡¼­ %s Ç׸ñ À§Ä¡ ÀçÁöÁ¤"
+
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "Á¸ÀçÇÏÁö ¾Ê´Â ¸Åü¡¸%s¡¹ ¼±Åà ½Ãµµ"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "´ÙÀ½ ÆÑÅ°ÁöµéÀº %s¸¦ ´ã°í ÀÖ½À´Ï´Ù: %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s]¿¡¼­ RPM ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù."
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "¸ñ·Ï ÆÄÀÏ [%s] Àд Áß"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-#, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "ÀÇÁ¸¸ñ·Ï¿¡¼­ %s Ç׸ñ À§Ä¡ ÀçÁöÁ¤"
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ÀÌ ¸ñ·ÏÆÄÀÏ [%s]ÀÇ ¸Åü¸¦ °áÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "¸ðµç °ÍÀÌ ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù."
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
 #, fuzzy
-msgid "...retrieving done"
+msgid "retrieving rpms files..."
 msgstr "[%s] ÃßÃâ Áß"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "´ÙÀ½ ÆÑÅ°Áöµé Áß Çϳª°¡ ÇÊ¿äÇÕ´Ï´Ù:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: RPM ÆÄÀÏ ¡¸%s¡¹À» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù.\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "¼³Ä¡ ½ÇÆÐ."
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr "¡¸%s¡¹ÀÇ ¸ñ·Ï ÆÄÀÏ¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù. ¸Åü ¹«½ÃµÊ."
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "unmounting %s"
+msgstr "%s ¸¶¿îÆ® ÇØÁ¦ Áß"
+
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "ij½¬¿¡¼­ %d ³°Àº Çì´õ Á¦°Å Áß"
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "¸Åü¡¸%s¡¹¿¡ ´ëÇÑ ¸ñ·Ï ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù."
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "¸ñ·Ï ÆÄÀÏ¿¡¡¸%s¡¹¿¡ ´ëÇÑ ±â·ÏÀÌ ¾ø½À´Ï´Ù."
+msgid "removing medium \"%s\""
+msgstr "Á¸ÀçÇÏÁö ¾Ê´Â ¸Åü¡¸%s¡¹ÀÇ Á¦°Å ½Ãµµ"
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "¡¸%s¡¹¸Åü¿¡ ´ëÇÑ ÇÕ¼º ÆÄÀÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù."
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "Á¸ÀçÇÏÁö ¾Ê´Â ¸Åü¡¸%s¡¹ ¼±Åà ½Ãµµ"
+
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ÀÌ ¸ñ·ÏÆÄÀÏ [%s]ÀÇ ¸Åü¸¦ °áÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù."
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "·ÎÄÉÀÏ ¾ð¾î°¡ ¾ÆÁ÷ ¼±ÅõÇÁö ¾Ê¾ÒÀ¸¹Ç·Î, %sÀÇ ¼±ÅÃÀ» ÇÇÇϼ¼¿ä."
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "¸ðµç °ÍÀÌ ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù."
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "¼³Á¤ ÆÄÀÏ [%s]¿¡ ±â·Ï"
+
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "¡¸%s¡¹¸Åü¿¡ ´ëÇÑ ÇÕ¼º ÆÄÀÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù."
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"¸ñ·Ï ÆÄÀÏÀÌ ´Ù¸¥ ¸Åü¿¡ ÀÇÇØ ÀÌ¹Ì »ç¿ëµÇ°í Àֱ⠶§¹®¿¡, ¸Åü ¡¸%s¡¹¸¦ »ç¿ëÇÒ "
+"¼ö ¾ø½À´Ï´Ù."
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "ÀÇÁ¸¸ñ·Ï ÆÄÀÏ [%s] Àбâ"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "¡¸%s¡¹¸Åü¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "µ¿ÀÏÇÑ ÆÄÀÏ À̸§ ¡¸%s¡¹¸¦ °¡Áø ¿©·¯ °³ÀÇ ÆÑÅ°Áö°¡ Á¸ÀçÇÕ´Ï´Ù."
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "ÀÇÁ¸¼ºÀ» ÃÑÁ·½ÃÅ°±â À§ÇØ, ´ÙÀ½ ÆÑÅ°Áöµéµµ ¼³Ä¡µÉ °ÍÀÔ´Ï´Ù. (%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "[%s] ÃßÃâ Áß"
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi: ¾Ë ¼ö ¾ø´Â ¿É¼Ç ¡¸-%s¡¹, ¡¸--help¡¹¿É¼ÇÀ¸·Î »ç¿ë¹ýÀ» º¸¼¼¿ä.\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "¡¸%s¡¹ÀÇ ¸ñ·Ï ÆÄÀÏ¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù. ¸Åü ¹«½ÃµÊ."
+
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "RPM ÆÄÀÏÀ» µî·ÏÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "´ÙÀ½ ÆÑÅ°Áöµé Áß Çϳª°¡ ÇÊ¿äÇÕ´Ï´Ù:"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "¼³Ä¡ ½ÇÆÐ."
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "[%s] º¹»ç ½ÇÆÐ."
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "¡¸%s¡¹ÀÇ ¸ñ·ÏÆÄÀÏÀ» ºÐ¼®ÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr ""
+
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+#, fuzzy
+msgid "...copying done"
+msgstr "[%s] ÃßÃâ Áß"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "ÀÇÁ¸¼ºÀ» ÃÑÁ·½ÃÅ°±â À§ÇØ, ´ÙÀ½ ÆÑÅ°Áöµéµµ ¼³Ä¡µÉ °ÍÀÔ´Ï´Ù. (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
+#: po/placeholder.h:180 po/placeholder.h:277
+#, fuzzy
+msgid "copying hdlists file..."
+msgstr "¸ñ·Ï ÆÄÀÏ [%s] Àд Áß"
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "¼³Á¤ ÆÄÀÏÀÇ %s ÁÙ¿¡ ¹®¹ý ¿À·ù"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "ÀÇÁ¸¼º °Ë»ç¾øÀÌ ¼³Ä¡Çմϱî? (y/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "Áö¿ª ÆÑÅ°Áö µî·Ï ¿À·ù"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr ""
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "¸ñ·Ï ÆÄÀÏ¿¡¡¸%s¡¹¿¡ ´ëÇÑ ±â·ÏÀÌ ¾ø½À´Ï´Ù."
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "¾î´À °ÍÀ» ¼±ÅÃÇϽðڽÀ´Ï±î? (1-%d) "
+msgid "unable to build hdlist: %s"
+msgstr "¸ñ·Ï ÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "¸Åü [%s]´Â ¼±ÅõÇÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "¼³Ä¡¸¦ °­Á¦ ÃßÁøÇմϱî? (y/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "¼±ÅÃÀÌ À߸øµÇ¾ú½À´Ï´Ù. ´Ù½Ã ½ÃµµÇϼ¼¿ä.\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "%s ¼³Ä¡ Áß...\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "ÀåÄ¡ [%2$s]¿¡ ¡¸%1$s¡¹¹Ìµð¾î¸¦ ³ÖÀ¸¼¼¿ä."
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "´ÙÀ½ ÆÑÅ°ÁöµéÀº %s¸¦ ´ã°í ÀÖ½À´Ï´Ù: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "¸ñ·Ï ÆÄÀÏ [%s] Àд Áß"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "ÀÇÁ¸¸ñ·Ï¿¡¼­ %s Ç׸ñ À§Ä¡ ÀçÁöÁ¤"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "¼Ò½º ÆÑÅ°Áö¸¦ ±¸ÇÒ ¼ö ¾ø½À´Ï´Ù, Áß´ÜÇÕ´Ï´Ù."
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "´Ù µÇ¾úÀ¸¸é ENTERÅ°¸¦ ´©¸£¼¼¿ä..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+#, fuzzy
+msgid "...retrieving done"
+msgstr "[%s] ÃßÃâ Áß"
+
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr ""
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr ""
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "¸ñ·Ï ÆÄÀÏ¿¡¡¸%s¡¹¿¡ ´ëÇÑ ±â·ÏÀÌ ¾ø½À´Ï´Ù."
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "·çÆ® »ç¿ëÀÚ¸¸ÀÌ Áö¿ª ÆÑÅ°Áö¸¦ ¼³Ä¡ÇÒ ¼ö ÀÖ½À´Ï´Ù."
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"%2$s·Î ¾÷±×·¹À̵带 À§ÇØ %s Á¦°Å Áß ...\n"
+"ÀÌ ¹æ¹ý¿Ü¿¡´Â ´Þ¸® ¾÷±×·¹ÀÌµå ¹æ¹ýÀÌ ¾ø½À´Ï´Ù."
+
+#: po/placeholder.h:296
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"%2$s·Î ¾÷±×·¹À̵åÇϱâ À§ÇØ %1$s Á¦°ÅÁß...\n"
+"¿Ã¹Ù¸¥ ¾÷±×·¹À̵带 À§ÇØ ÇÊ¿äÇÕ´Ï´Ù!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "´ÙÀ½ ÆÑÅ°Áöµé Áß Çϳª°¡ %s¸¦ ¼³Ä¡Çϴµ¥ ÇÊ¿äÇÕ´Ï´Ù:"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -801,7 +959,7 @@ msgstr ""
 "%s\n"
 "<ÆÑÅ°Áö ¸ñ·Ï ÆÄÀÏÀÇ »ó´ë°æ·Î>°¡ ºüÁ® ÀÖ½À´Ï´Ù.\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -823,17 +981,7 @@ msgstr ""
 "       http://<È£½ºÆ®>/<°æ·Î> with <ÆÑÅ°Áö ¸ñ·Ï ÆÄÀÏÀÇ »ó´ë°æ·Î>\n"
 "       removable_<ÀåÄ¡>://<°æ·Î>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "¡¸%s¡¹¸Åü¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "¡¸%s¡¹¸Åü¸¦ ¾÷µ¥ÀÌÆ®ÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -841,11 +989,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -854,15 +998,7 @@ msgstr ""
 "%s\n"
 "<ÆÑÅ°Áö ¸ñ·Ï ÆÄÀÏÀÇ »ó´ë°æ·Î>°¡ ºüÁ® ÀÖ½À´Ï´Ù.\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -871,58 +1007,7 @@ msgstr ""
 "%s\n"
 "FTP ¹Ìµð¾î¿¡ ´ëÇØ ¡¸with¡¹°¡ ºüÁ®ÀÖ½À´Ï´Ù.\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-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"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"¾÷µ¥ÀÌÆ®ÇÏ·Á´Â Ç׸ñÀÌ ºüÁ®ÀÖ½À´Ï´Ù.\n"
-"(%s Áß Çϳª)\n"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"¾÷µ¥ÀÌÆ®ÇÒ °ÍÀÌ ¾ø½À´Ï´Ù. (¹Ìµð¾î¸¦ Ãß°¡ÇÏ·Á¸é ¡¸urpmi.addmedia¡¹¸¦ »ç¿ëÇϼ¼"
-"¿ä.\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"Á¦°ÅÇÒ °ÍÀÌ ¾ø½À´Ï´Ù. (¹Ìµð¾î¸¦ Ãß°¡ÇÏ·Á¸é ¡¸urpmi.addmedia¡¹¸¦ »ç¿ëÇϼ¼¿ä.\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -931,11 +1016,7 @@ msgstr ""
 "Á¦°ÅÇÏ·Á´Â Ç׸ñÀÌ ºüÁ®ÀÖ½À´Ï´Ù.\n"
 "(%s Áß Çϳª)\n"
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -947,32 +1028,28 @@ msgstr ""
 "\n"
 "¾Ë ¼ö ¾ø´Â ¿É¼Ç ¡¸%s¡¹\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+#, fuzzy
+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"
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: RPM ÆÄÀÏ ¡¸%s¡¹À» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù.\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"¾÷µ¥ÀÌÆ®ÇÏ·Á´Â Ç׸ñÀÌ ºüÁ®ÀÖ½À´Ï´Ù.\n"
+"(%s Áß Çϳª)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -982,44 +1059,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"¾÷±×·¹À̵åÇϱâ À§Çؼ­´Â ÀϺΠÆÑÅ°Áö°¡ Á¦°ÅµÇ¾î¾ß ÇÕ´Ï´Ù. ÀÌ ±â´ÉÀº ¾ÆÁ÷ Áö¿ø"
-"µÇÁö ¾Ê½À´Ï´Ù.\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ¾Ë ¼ö ¾ø´Â ¿É¼Ç ¡¸-%s¡¹, ¡¸--help¡¹¿É¼ÇÀ¸·Î »ç¿ë¹ýÀ» º¸¼¼¿ä.\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1063,18 +1108,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "»ç¿ë¹ý: urpmi.update [-a] <À̸§> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "»ç¿ë¹ý: urpmi.removemedia [-a] <À̸§> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "»ç¿ë¹ý: urpmi.removemedia [-a] <À̸§> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "»ç¿ë¹ý: urpmi.update [-a] <À̸§> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/lt.po b/po/lt.po
index 875b9323..35dc7feb 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-03-04 15:40+0200\n"
 "Last-Translator: Mykolas Norvaiðas <Myka@centras.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -26,27 +26,31 @@ msgstr ""
 "Automatinis paketø ádiegimas...\n"
 "Jûsø uþklaustø paketø ádiegimas $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Ar taip gerai?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Gerai"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "TtYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (T/n) "
 
@@ -54,733 +58,886 @@ msgstr " (T/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: komanda nerasta\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, fuzzy, c-format
 msgid "urpmf version %s"
 msgstr "urpmi versija %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 #, fuzzy
 msgid "usage: urpmf [options] <file>"
 msgstr "naudojimas: rpmf [<byla>]"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr ""
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "nëra paketo su tokiu pavadinimu %s\n"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Pabandyti ádiegimà priverstinai (--force)? (t/N) "
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "rpm duomenø bazës patikrinimas nepavyko\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "ádiegiamas %s\n"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (T/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"kaikuriuos paketus reikia iðmesti prieð atnaujinant, tai dar nepalaikoma \n"
 
-#: po/placeholder.h:69
-#, c-format
-msgid "examining synthesis file [%s]"
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "ádiegiamas %s\n"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr ""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nëra kà atnaujinti (pridëti laikmenai naudokite urpmi.addmedia)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Vienas ið ðiø paketø yra reikalingas."
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Praðome spausti 'enter', kada bus baigta..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr ""
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:1421
-#, c-format
-msgid "read synthesis file [%s]"
-msgstr ""
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nëra kà atnaujinti (pridëti laikmenai naudokite urpmi.addmedia)\n"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
-msgid "unable to analyse synthesis data of %s"
+msgid "read synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
+"urpmq: neþinomas nustatymas \"-$1\", patikrinkite naudojimà su --help\n"
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"vartojimas: urpmi [-h] [--auto] [--force] [-a] paketo_pavadinimas "
+"[paketo_pavadinimai...]\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Koks Jûsø pasirinkimas? (1-%d)"
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "unable to build hdlist: %s"
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Atsipraðau, blogas pasirinkimas, pakartokit\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unknown data associated with %s"
+msgid "relocated %s entries in depslist"
+msgstr ""
+
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "no rpm files found from [%s]"
+msgstr ""
+
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr ""
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "viskas ir taip jau ádiegta"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Vienas ið ðiø paketø yra reikalingas."
+
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
+#, fuzzy, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: negai perskaityti rpm bylos \"$_\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Ádiegimas nepavyko"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr ""
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Ðiuose paketuose yra %s: %s\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:121
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
-#, c-format
-msgid "selecting %s using obsoletes"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "viskas ir taip jau ádiegta"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "Priklausomybiø patenkinimui, bus ádiegti ðie paketai(%d Mb)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 "urpmq: neþinomas nustatymas \"-$1\", patikrinkite naudojimà su --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Vienas ið ðiø paketø yra reikalingas."
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Ádiegimas nepavyko"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "Priklausomybiø patenkinimui, bus ádiegti ðie paketai(%d Mb)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr ""
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Pabandyti ádiegimà be priklausomybiø tikrinimo? (t/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Koks Jûsø pasirinkimas? (1-%d)"
-
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Pabandyti ádiegimà priverstinai (--force)? (t/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Atsipraðau, blogas pasirinkimas, pakartokit\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "ádiegiamas %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Praðome ákiðti laikmenà pavadintà \"%s\", á árenginá [%s]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Ðiuose paketuose yra %s: %s\n"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr ""
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr ""
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "negaliu gauti pirminiø bylø, nutraukiu"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Praðome spausti 'enter', kada bus baigta..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr ""
+
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr ""
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr ""
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "Tik root vartotojas gali ádiegti vietinius paketus"
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Vienas ið ðiø paketø yra reikalingas."
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -789,7 +946,7 @@ msgstr ""
 "%s\n"
 "<relatyviu keliu iki hdlist> trûksta\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -811,17 +968,7 @@ msgstr ""
 "       http://<host>/<path> with <relatyviu hdlist bylos vardu>\n"
 "       removable_<device>://<path>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, fuzzy, c-format
 msgid ""
@@ -829,11 +976,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr "neþinomi nustatymai \"%s\"\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -842,15 +985,7 @@ msgstr ""
 "%s\n"
 "<relatyviu keliu iki hdlist> trûksta\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -859,49 +994,7 @@ msgstr ""
 "%s\n"
 "`with' tûkstama ftp laikmena\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"trûksta áraðo atnaujinimui\n"
-"(vienas ið %s)\n"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nëra kà atnaujinti (pridëti laikmenai naudokite urpmi.addmedia)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nëra kà atnaujinti (pridëti laikmenai naudokite urpmi.addmedia)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -910,43 +1003,29 @@ msgstr ""
 "tûksta áraðo iðmetimui\n"
 "(vienas ið %s)\n"
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
 msgstr "naudojimas: urpmi.addmedia <vardas> <url>"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:255 urpmq:90
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: negai perskaityti rpm bylos \"$_\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"trûksta áraðo atnaujinimui\n"
+"(vienas ið %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -956,44 +1035,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"kaikuriuos paketus reikia iðmesti prieð atnaujinant, tai dar nepalaikoma \n"
-
-#: po/placeholder.h:272 urpmq:87
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: neþinomas nustatymas \"-$1\", patikrinkite naudojimà su --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1037,18 +1084,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
+#: urpmi.removemedia:34
 #, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
+msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr "naudojimas: urpmi.addmedia <vardas> <url>"
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
+#: urpmi.update:41
 #, fuzzy
-msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgid "usage: urpmi.update [options] <name> ..."
 msgstr "naudojimas: urpmi.addmedia <vardas> <url>"
 
 #: urpmq:34
@@ -1120,13 +1167,6 @@ msgstr "urpmq versija %s"
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "vartojimas: urpmi [-h] [--auto] [--force] [-a] paketo_pavadinimas "
-#~ "[paketo_pavadinimai...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "Atsipraðau, nerandu bylos %s, iðeinu"
 
diff --git a/po/lv.po b/po/lv.po
index 6ac2ea62..d09191a5 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-08-25 16:06+0200\n"
 "Last-Translator: Juris Kudiòð <cooker@inbox.lv>\n"
 "Language-Team: Latvian\n"
@@ -27,27 +27,31 @@ msgstr ""
 "Automâtikâ pakotòu uzstâdîðana...\n"
 "Jûs lûdzât uzstâdît pakotni $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Vai piekrîtat?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Labi"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "jJYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (J/n) "
 
@@ -55,744 +59,908 @@ msgstr " (J/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: komanda nav atrata\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf versja %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Autortiesîbas (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 "Ðî ir brîvâ programmatûra, un drîkst tikt izplatîta saskaòâ ar GNU GPL."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "pielietojums: urpmf [options] <file>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - nedrukât iezîmes vârdu (noklusçtais, ja iezîme nav dota"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    komandrindâ, nesavienojams ar interaktîvo reþîmu)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - drukât visas iezîmes."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - drukât iezîmes vârdu: rpm fila vârds (pieòem, ja iezîme "
 "nav"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    dota komandrindâ; bez pakotnes vârda)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - drukât iezîmi: grupa."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - drukât iezîmi: izmçrs."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - drukât iezîmi: seriâlais numurs."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - drukât iezîmi: kopsavilkums."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - drukât iezîmui: apraksts."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr "  --provides      - drukât iezîmi: nodroðina (vairâkas rindiòas)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr "  --requires      - drukât iezîmi: nepiecieðamas (vairâkas rindiòas)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files         - drukât iezîmi: faili (vairâkas rindiòas)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr "  --conflicts     - drukât iezîmi: konflikti (vairâkas rindiòas)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr "  --obsoletes     - drukât iezîmi: novecojuðas (vairâkas rindiòas)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr "  --prereqs       - drukât iezîmi: prereqs (vairâkas rindiòas)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "mçìiniet urpmf --help priekð palpildus palîdzîbas"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "nevar saglabât konfigurâcijas failu [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  --all           - drukât visas iezîmes."
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
+"nevar atrasta saraksta failu priekð \"%s\", datu nesçjs neiks òemts vçrâ"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "nav ko rakstît saraksa failâ \"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
-"nevar atrasta saraksta failu priekð \"%s\", datu nesçjs neiks òemts vçrâ"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "nevaru izanalizçt \"%s\" hdlist failu"
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "saraksta fails priekð \"%s\" ir tukðs"
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr ""
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 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"
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "nevar atjaunot datu nesçju \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+#, fuzzy
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  --all           - drukât visas iezîmes."
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "nav pakotnes ar nosaukumu %s"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+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) "
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "rpm datubâzes pârbaude bija neveiksmîga\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, c-format
-msgid "mounting %s"
-msgstr "montçju %s"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (J/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"kâda no pakotnçm ir jânoòem, lai tiktu uzlabota, diemþçl tas pagaidâm netiek "
+"atbalstîts\n"
 
-#: po/placeholder.h:69
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr ""
+msgid "mounting %s"
+msgstr "montçju %s"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+#, fuzzy
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --group         - drukât iezîmi: grupa."
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nevar izveidot datu nesçju \"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+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"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Ir nepiecieðama viena no sekojoðâm pakotnçm:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Nospiediet ievada taustiòu, kad tas izdarîts..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr ""
+#: po/placeholder.h:74 po/placeholder.h:448
+#, fuzzy
+msgid "  -h             - print this help message.\n"
+msgstr "  --all           - drukât visas iezîmes."
+
+#: po/placeholder.h:75 po/placeholder.h:450
+#, fuzzy
+msgid "  -g             - print groups too with name.\n"
+msgstr "  --group         - drukât iezîmi: grupa."
 
-#: po/placeholder.h:77 urpm.pm:253
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  --all           - drukât visas iezîmes."
+
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:78 po/placeholder.h:407
+#, fuzzy
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  --group         - drukât iezîmi: grupa."
+
+#: po/placeholder.h:79 po/placeholder.h:454
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr "                    dota komandrindâ; bez pakotnes vârda)."
+
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+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"
 
-#: po/placeholder.h:82
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "read synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
 #, c-format
-msgid "unable to parse correctly [%s]"
-msgstr ""
+msgid "unable to create medium \"%s\"\n"
+msgstr "nevar izveidot datu nesçju \"%s\"\n"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
-msgid "read synthesis file [%s]"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "nevaru izanalizçt \"%s\" hdlist failu"
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nezinâms parametrs \"-%s\", pârbaudiet lietojumu --help\n"
 
-#: po/placeholder.h:88 urpm.pm:93
-msgid "no webfetch (curl or wget currently) found\n"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"Lietojums: urpmi [-h] [--auto] [--force] [-a] pakotnes_nos "
+"[pakotnes_nos...]\n"
 
-#: po/placeholder.h:89
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:94
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
-msgid "building hdlist [%s]"
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "added medium %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
+#, c-format
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr ""
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Kâda ir jûsu izvçle? (1-%d) "
 
-#: po/placeholder.h:99
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "saraksta fails priekð \"%s\" ir tukðs"
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Atvainojiet, nepareiza izvçle. Mçìiniet vçlreiz\n"
 
-#: po/placeholder.h:103
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid "unable to build hdlist: %s"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
-#, c-format
-msgid "invalid rpm file name [%s]"
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "unknown data associated with %s"
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
-#, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr ""
+
+#: po/placeholder.h:119 po/placeholder.h:328
+#, fuzzy
+msgid "  --help         - print this help message.\n"
+msgstr "  --all           - drukât visas iezîmes."
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "viss jau ir instalçts"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Ir nepiecieðama viena no sekojoðâm pakotnçm:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nav iespçjams nolasît rpm failu \"%s\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
-#, c-format
-msgid "unable to access medium \"%s\""
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Instalçðana neizdevâs"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  --group         - drukât iezîmi: grupa."
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Sekojoðas pakotnes satur %s: %s"
+msgid "no hdlist file found for medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:121
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:144 po/placeholder.h:447
+#, fuzzy
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --all           - drukât visas iezîmes."
+
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
 
-#: po/placeholder.h:128
-#, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "saraksta fails priekð \"%s\" ir tukðs"
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:156 po/placeholder.h:254
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:132
-#, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr "  --all           - drukât visas iezîmes."
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "nevar izveidot datu nesçju \"%s\"\n"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "viss jau ir instalçts"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "Lai apmierinâtu atkarîbas, tiks instalçtas sekojoðas pakotnes (%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: nezinâms parametrs \"-%s\", pârbaudiet lietojumu --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  --all           - drukât visas iezîmes."
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Ir nepiecieðama viena no sekojoðâm pakotnçm:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Instalçðana neizdevâs"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:173 po/placeholder.h:462
+#, fuzzy
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "                    dota komandrindâ; bez pakotnes vârda)."
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "nevaru izanalizçt \"%s\" hdlist failu"
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr ""
+
+#: po/placeholder.h:177 po/placeholder.h:343
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr "  --all           - drukât visas iezîmes."
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "Lai apmierinâtu atkarîbas, tiks instalçtas sekojoðas pakotnes (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-#, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  --group         - drukât iezîmi: grupa."
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr ""
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Vai mçìinât instalçt bez atkarîbu pârbaudes? (j/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
-msgid "  -p             - allow search in provides to find package.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "saraksta fails priekð \"%s\" ir tukðs"
+
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr ""
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:191 po/placeholder.h:355
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "  --all           - drukât visas iezîmes."
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Kâda ir jûsu izvçle? (1-%d) "
-
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:163
-#, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "tiek instalçta %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
-"Ðî ir brîvâ programmatûra, un drîkst tikt izplatîta saskaòâ ar GNU GPL."
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-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) "
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lûdzu ielieciet datu nesçju \"%s\" ierîcç [%s]"
 
-#: po/placeholder.h:171 po/placeholder.h:269
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Sekojoðas pakotnes satur %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Atvainojiet, nepareiza izvçle. Mçìiniet vçlreiz\n"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr ""
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:205 po/placeholder.h:445
+#, fuzzy
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  --group         - drukât iezîmi: grupa."
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "nevar dabût koda pakotnes, pârtraucu"
+
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "installing %s\n"
-msgstr "tiek instalçta %s\n"
+msgid "selecting %s using obsoletes"
+msgstr ""
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Lûdzu ielieciet datu nesçju \"%s\" ierîcç [%s]"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "nevar dabût koda pakotnes, pârtraucu"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr ""
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Nospiediet ievada taustiòu, kad tas izdarîts..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "saraksta fails priekð \"%s\" ir tukðs"
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "Tikai root drîkst instalçt lokâlâs pakotnes"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
 #, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Ir nepiecieðama viena no sekojoðâm pakotnçm:"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"Ðî ir brîvâ programmatûra, un drîkst tikt izplatîta saskaòâ ar GNU GPL."
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -801,7 +969,7 @@ msgstr ""
 "%s\n"
 "<relative path of hdlist> trûkst\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -823,17 +991,7 @@ msgstr ""
 "       http://<host>/<path> with <relative filename of hdlist>\n"
 "       removable_<ierîcç>://<path>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "nevar izveidot datu nesçju \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "nevar atjaunot datu nesçju \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -841,12 +999,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  --all           - drukât visas iezîmes."
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -855,17 +1008,7 @@ msgstr ""
 "%s\n"
 "<relative path of hdlist> trûkst\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --group         - drukât iezîmi: grupa."
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  --group         - drukât iezîmi: grupa."
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -874,23 +1017,27 @@ msgstr ""
 "%s\n"
 "`with' trûkst priekð ftp datu avota\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:217
+#: po/placeholder.h:425
+#, fuzzy
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr "Lietojums: urpmi.removemedia [-a] <name> ..."
 
-#: po/placeholder.h:218
+#: po/placeholder.h:429
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -899,74 +1046,7 @@ msgstr ""
 "atjuninâjumâ trûkst kâda ieraksta\n"
 "(viens no %s)\n"
 
-#: po/placeholder.h:234
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  --group         - drukât iezîmi: grupa."
-
-#: po/placeholder.h:235 urpmi.update:57
-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"
-
-#: po/placeholder.h:236
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --all           - drukât visas iezîmes."
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-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"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
-#, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  --all           - drukât visas iezîmes."
-
-#: po/placeholder.h:248
-#, fuzzy
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr "Lietojums: urpmi.removemedia [-a] <name> ..."
-
-#: po/placeholder.h:252
-#, fuzzy
-msgid "  -h             - print this help message.\n"
-msgstr "  --all           - drukât visas iezîmes."
-
-#: po/placeholder.h:254
-#, fuzzy
-msgid "  -g             - print groups too with name.\n"
-msgstr "  --group         - drukât iezîmi: grupa."
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nav iespçjams nolasît rpm failu \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-#, fuzzy
-msgid "  -r             - print version and release too with name.\n"
-msgstr "                    dota komandrindâ; bez pakotnes vârda)."
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -977,45 +1057,12 @@ msgid ""
 msgstr ""
 "Ðî ir brîvâ programmatûra, un drîkst tikt izplatîta saskaòâ ar GNU GPL."
 
-#: po/placeholder.h:266
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                    dota komandrindâ; bez pakotnes vârda)."
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"kâda no pakotnçm ir jânoòem, lai tiktu uzlabota, diemþçl tas pagaidâm netiek "
-"atbalstîts\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nezinâms parametrs \"-%s\", pârbaudiet lietojumu --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1059,18 +1106,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "Lietojums: urpmi.update [-a] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "Lietojums: urpmi.removemedia [-a] <name> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "Lietojums: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "Lietojums: urpmi.update [-a] <name> ..."
 
 #: urpmq:34
 #, c-format
@@ -1184,13 +1231,6 @@ msgstr "urpmq versija %s"
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "Lietojums: urpmi [-h] [--auto] [--force] [-a] pakotnes_nos "
-#~ "[pakotnes_nos...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "Diemþçl neizdodas atrast failu %s, pârtraucu"
 
diff --git a/po/nl.po b/po/nl.po
index bf926b68..49a957a6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2000-09-18 23:40+0200\n"
 "Last-Translator: NIELS GRAS <niels.gras@wanadoo.nl>\n"
 "Language-Team: Dutch\n"
@@ -24,27 +24,31 @@ msgid ""
 "You requested installation of package $rpm\n"
 msgstr ""
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Is het goed?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ok"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "JjYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (J/n) "
 
@@ -52,618 +56,704 @@ msgstr " (J/n) "
 msgid "$rpm: command not found\n"
 msgstr ""
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr ""
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr ""
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr ""
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "geen archief genaamd %s\n"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Installatie forceren (--force)? (j/N) "
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "rpm database query mislukt\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "bezig met installeren van %s\n"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (J/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, c-format
-msgid "examining synthesis file [%s]"
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "bezig met installeren van %s\n"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Een van de volgende archieven is benodigd:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Druk op enter wanneer het klaar is..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr ""
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:1421
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
-msgid "unable to analyse synthesis data of %s"
+msgid "read synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"gebruik: urpmi [-h] [--auto] [--force] [-a] archief_naam [archief_namen...]\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Wat is uw keuze? (1-%d)"
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "unable to build hdlist: %s"
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Sorry, foute keuze, probeer een andere\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unknown data associated with %s"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "alles is al geïnstalleerd"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Een van de volgende archieven is benodigd:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Installatie mislukt"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr ""
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "De volgende archieven bevatten %s: %s\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:121
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
-#, c-format
-msgid "selecting %s using obsoletes"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "alles is al geïnstalleerd"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Om dependencies te gebruiken, worden de volgende archieven geïnstalleerd (%d "
+"MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Een van de volgende archieven is benodigd:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Installatie mislukt"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -672,259 +762,247 @@ msgstr ""
 "Om dependencies te gebruiken, worden de volgende archieven geïnstalleerd (%d "
 "MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr ""
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Proberen te installeren zonder de dependencies te controleren? (j/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Wat is uw keuze? (1-%d)"
-
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Installatie forceren (--force)? (j/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Sorry, foute keuze, probeer een andere\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "bezig met installeren van %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Voeg a.u.b. de %s genaamd %s in"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr ""
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "De volgende archieven bevatten %s: %s\n"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Druk op enter wanneer het klaar is..."
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Alleen de superuser kan locale archieven installeren"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr ""
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Een van de volgende archieven is benodigd:"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
-#, c-format
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:187
-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"
-"and [options] are from\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
-#: urpmi.addmedia:57
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:211 po/placeholder.h:313
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Alleen de superuser kan locale archieven installeren"
+
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:296
 #, c-format
 msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:217
+#: po/placeholder.h:348
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:218
+#: po/placeholder.h:359
+#, c-format
 msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
 msgstr ""
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: po/placeholder.h:234
+#: po/placeholder.h:383
 msgid ""
-"  -d             - force complete computation of depslist.ordered file.\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"
+"and [options] are from\n"
 msgstr ""
 
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
+#: urpmi.addmedia:57
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
+#: po/placeholder.h:401 urpmi.addmedia:82
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:408 urpmi.addmedia:84
+#, c-format
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -934,42 +1012,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1012,16 +1060,16 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr ""
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
 msgstr ""
 
 #: urpmq:34
@@ -1035,13 +1083,6 @@ msgstr ""
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "gebruik: urpmi [-h] [--auto] [--force] [-a] archief_naam "
-#~ "[archief_namen...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "Sorry, kan het bestand %s niet vinden, bezig met afsluiten"
 
diff --git a/po/no.po b/po/no.po
index c53413b7..33f6a530 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-09-23 13:59CET\n"
 "Last-Translator: Andreas Bergstrøm <abergstr@halden.net>\n"
 "Language-Team: Norsk\n"
@@ -27,27 +27,31 @@ msgstr ""
 "Automatisk installasjon av pakker...\n"
 "Du ba om installasjon av pakke $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Er det ok?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ok"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "Jj"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (J/n) "
 
@@ -55,642 +59,730 @@ msgstr " (J/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: kommando ikke funnet\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf versjon %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr "Dette er fri programvare og kan redistribueres uder vilkårene til GNU "
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "bruk: urpmf [valg] <fil>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    linje, ikke kompatibel med interaktivt modus)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - print all tags."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    kommandolinje, men uten pakkenavn)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - print tag group: group."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - print tag size: size."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - print tag serial: serial."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - print tag summary: summary."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - print tag description: description."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr "  --provides      - print tag provides: all provides (multiple lines)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr "  --requires      - print tag requires: all requires (multiple lines)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files         - print tag files: all files (multiple lines)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "prøv urpmf --help for flere valg"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "kunne ikke skrive config fil [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-#, fuzzy
-msgid "retrieving rpms files..."
-msgstr "mottar [%s]"
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  --all           - print all tags."
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "kunne ikke finne liste fil for \"%s\", media ignorert"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "ingenting å skrive i liste fil for \"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "kunne ikke finne liste fil for \"%s\", media ignorert"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "unable to parse hdlist file of \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ingenting skrevet i liste fil for \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, fuzzy, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "mottar [%s]"
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "kan ikke få tilgang til filen til \"%s\", media ignorert"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "pakke %s er ikke funnet."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "demonterer %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "fjerner %d obsolete hoder i cache"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "ingen hdlist fil funnet for media \"%s\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr "media \"%s\" prøver å bruke en allerede brukt hdlist, media ignorert"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "leser hdlist fil [%s]"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "kunne ikke bruke navn \"%s\" for media uten navn da det allerede er brukt"
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "prøver å fjerne media \"%s\" som ikke eksisterer"
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "leser hdlist fil [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "kunne ikke ta media \"%s\" inn til konto da ingen liste fil [%s] eksisterer"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "beholder bare provides filer"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "kunne ikke bygge synthesis fil for media \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "fant %d hoder i cache"
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "prøver å velge ikke eksisterende media \"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "ungå valg av %s da dens lokale språk ikke er valgt allerede"
+msgid "unable to update medium \"%s\"\n"
+msgstr "kunne ikke oppdatere medium \"%s\"\n"
 
-#: po/placeholder.h:55
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"fjerner %s for å oppgradere ...\n"
-" til %s siden den ikke vil bli oppdatert ellers"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+#, fuzzy
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  --all           - print all tags."
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "media \"%s\" eksisterer allerede"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "kunne ikke skrive liste fil av \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "skriv config fil [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "ingen pakke kalt %s"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Prøve å installere enda hardere (--force)? (j/N) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "kunne ikke finne hdlist fil for \"%s\", media ignorert"
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "bygd hdlist synthesis fil for media \"%s\""
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "kunne ikke finne alle synthesis file, bruker parsehdlist tjener"
+msgid " (y/N) "
+msgstr " (J/n) "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "kunne ikke finne hdlist fil for \"%s\", media ignorert"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"Noen pakker må fjernes for å bli oppgradert, dette er ikke støttet ennå\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "monterer %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, 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 media \"%s\" da liste fil allerede blir brukt av et "
-"annet media"
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "les depsliste fil [%s]"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+#, fuzzy
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --group         - print tag group: group."
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kunne ikke opprette medium \"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ingenting å fjerne (bruk urpmi.addmedia for å legge til et media)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "malformed input: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "det er flere pakker med samme rpm filnavn \"%s\""
+msgid "One of the following packages is needed to install %s:"
+msgstr "En av følgende pakker behøves for å installere %s:"
 
-#: po/placeholder.h:74
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Trykk enter når det er ferdig..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr "media \"%s\" prøver å bruke en allerede brukt liste, media ignorert"
 
-#: po/placeholder.h:76
+#: po/placeholder.h:74 po/placeholder.h:448
 #, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "mottar [%s]"
+msgid "  -h             - print this help message.\n"
+msgstr "  --all           - print all tags."
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "kunne ikke nå hdlist fil av \"%s\", media ignorert"
+#: po/placeholder.h:75 po/placeholder.h:450
+#, fuzzy
+msgid "  -g             - print groups too with name.\n"
+msgstr "  --group         - print tag group: group."
 
-#
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "kunne ikke registrere rpm-fil"
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  --all           - print all tags."
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "kunne ikke inspisere liste fil for \"%s\", media ignorert"
+#: po/placeholder.h:78 po/placeholder.h:407
+#, fuzzy
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  --group         - print tag group: group."
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
+#: po/placeholder.h:79 po/placeholder.h:454
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr "                    kommandolinje, men uten pakkenavn)."
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "incoherent list file for \"%s\", medium ignored"
-
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "kopi av [%s] mislykket"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "unable to parse correctly [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ingenting å oppdatere (bruk urpmi.addmedia for å legge til et media)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "les depsliste fil [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "unable to parse hdlist file of \"%s\""
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-#, fuzzy
-msgid "...copying done"
-msgstr "mottar [%s]"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "kunne ikke opprette medium \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "leser hdlist fil [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "syntaks feil i config fil ved linje %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "bruk: urpmi.removemedia [-a] <name> ..."
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "bygger hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "kunne ikke lese rpm fil [%s] fra media \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "feil ved registrering av lokale pakker"
-
-#: po/placeholder.h:99
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "kunne ikke lese rpm fil [%s] fra media \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "mottar [%s]"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "incoherent media \"%s\" merket fjernbart, men er det ikke"
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "ingenting skrevet i liste fil for \"%s\""
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "kunne ikke bygge hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "media \"%s\" er ikke valgt"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "invalid rpm filnavn [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "ukjent data assosiert med %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "prøver å gå forbi eksisterende media \"%s\", unngår"
+msgid "What is your choice? (1-%d) "
+msgstr "Hva er ditt valg? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "kan ikke få tilgang til filen til \"%s\", media ignorert"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "unngår å velge %s da ikke nok filer vil bli oppdatert"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kunne ikke nå rpm fil [%s]"
 
-#: po/placeholder.h:111
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"fjerner %s fra å oppgradere ...\n"
-" til %s siden den ikke vil oppgradere korrekt!"
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "fant igjen %s innganger i depsliste"
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Beklager, dårlig valg, prøv igjen\n"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "kunne ikke nå media \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr "unable to parse correctly [%s] on value \"%s\""
+msgid "relocated %s entries in depslist"
+msgstr "fant igjen %s innganger i depsliste"
 
-#: po/placeholder.h:118
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "prøver å velge ikke eksisterende media \"%s\""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Følgende pakker inneholder %s: %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "unable to parse correctly [%s] on value \"%s\""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "ingen rpm filer funnet fra [%s]"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "leser hdlist fil [%s]"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "kunne ikke bestemme media av denne hdlist filen [%s]"
 
-#: po/placeholder.h:122 urpm.pm:1191
+#: po/placeholder.h:119 po/placeholder.h:328
 #, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "fant igjen %s innganger i depsliste"
+msgid "  --help         - print this help message.\n"
+msgstr "  --all           - print all tags."
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "alt er allerede installert"
 
-#: po/placeholder.h:123 urpm.pm:1897
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
 #, fuzzy
-msgid "...retrieving done"
+msgid "retrieving rpms files..."
 msgstr "mottar [%s]"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "velger %s ved å bruke obsolete"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "En av følgende pakker behøves:"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan ikke lese rpm fil \"%s\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Installasjon mislykket"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr "kan ikke få tilgang til filen til \"%s\", media ignorert"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  --group         - print tag group: group."
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "velger %s ved valg av filer"
+msgid "unmounting %s"
+msgstr "demonterer %s"
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "fjerner %d obsolete hoder i cache"
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ingen hdlist fil funnet for media \"%s\""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "ingenting skrevet i liste fil for \"%s\""
+msgid "removing medium \"%s\""
+msgstr "prøver å fjerne media \"%s\" som ikke eksisterer"
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "kunne ikke bygge synthesis fil for media \"%s\""
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "prøver å velge ikke eksisterende media \"%s\""
+
+#: po/placeholder.h:144 po/placeholder.h:447
+#, fuzzy
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --all           - print all tags."
+
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "kunne ikke bestemme media av denne hdlist filen [%s]"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "ungå valg av %s da dens lokale språk ikke er valgt allerede"
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "skriv config fil [%s]"
 
-#: po/placeholder.h:132
+#: po/placeholder.h:150 po/placeholder.h:249
 #, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr "  --all           - print all tags."
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "kunne ikke finne alle synthesis file, bruker parsehdlist tjener"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "alt er allerede installert"
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, 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 media \"%s\" da liste fil allerede blir brukt av et "
+"annet media"
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "les depsliste fil [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "kunne ikke opprette medium \"%s\"\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "det er flere pakker med samme rpm filnavn \"%s\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Følgende pakker vil bli installert for å tilfredstille avhengigheter (%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "mottar [%s]"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  --all           - print all tags."
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "kunne ikke nå hdlist fil av \"%s\", media ignorert"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "En av følgende pakker behøves:"
+#
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "kunne ikke registrere rpm-fil"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "kunne ikke inspisere liste fil for \"%s\", media ignorert"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "incoherent list file for \"%s\", medium ignored"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Installasjon mislykket"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "kopi av [%s] mislykket"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+#, fuzzy
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "                    kommandolinje, men uten pakkenavn)."
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "unable to parse hdlist file of \"%s\""
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr "  --all           - print all tags."
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+#, fuzzy
+msgid "...copying done"
+msgstr "mottar [%s]"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -698,115 +790,188 @@ msgid ""
 msgstr ""
 "Følgende pakker vil bli installert for å tilfredstille avhengigheter (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
+#: po/placeholder.h:180 po/placeholder.h:277
 #, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  --group         - print tag group: group."
+msgid "copying hdlists file..."
+msgstr "leser hdlist fil [%s]"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "syntaks feil i config fil ved linje %s"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Prøve å installere uten å sjekke avhengigheter? (j/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "feil ved registrering av lokale pakker"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "ingenting skrevet i liste fil for \"%s\""
+
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
+msgstr "kunne ikke bygge hdlist: %s"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "media \"%s\" er ikke valgt"
 
-#: po/placeholder.h:159
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "prøver å gå forbi eksisterende media \"%s\", unngår"
+
+#: po/placeholder.h:191 po/placeholder.h:355
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "  --all           - print all tags."
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Hva er ditt valg? (1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "installerer %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Vennligst sett inn mediumet kalt \"%s\" på enhet [%s]"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Følgende pakker inneholder %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
 #, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr "Dette er fri programvare og kan redistribueres uder vilkårene til GNU "
+msgid "examining hdlist file [%s]"
+msgstr "leser hdlist fil [%s]"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Prøve å installere enda hardere (--force)? (j/N) "
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "fant igjen %s innganger i depsliste"
 
-#: po/placeholder.h:171 po/placeholder.h:269
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Beklager, dårlig valg, prøv igjen\n"
+#: po/placeholder.h:205 po/placeholder.h:445
+#, fuzzy
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  --group         - print tag group: group."
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "kunne ikke få tak i kildepakker, avslutter"
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+#, fuzzy
+msgid "...retrieving done"
+msgstr "mottar [%s]"
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "installing %s\n"
-msgstr "installerer %s\n"
+msgid "selecting %s using obsoletes"
+msgstr "velger %s ved å bruke obsolete"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Vennligst sett inn mediumet kalt \"%s\" på enhet [%s]"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "kunne ikke få tak i kildepakker, avslutter"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "velger %s ved valg av filer"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Trykk enter når det er ferdig..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "ingenting skrevet i liste fil for \"%s\""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "Bare superbruker har adgang til å installere lokale pakker"
 
-#: po/placeholder.h:182 urpmi:216
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "En av følgende pakker behøves for å installere %s:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"fjerner %s for å oppgradere ...\n"
+" til %s siden den ikke vil bli oppdatert ellers"
+
+#: po/placeholder.h:296
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"fjerner %s fra å oppgradere ...\n"
+" til %s siden den ikke vil oppgradere korrekt!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr "Dette er fri programvare og kan redistribueres uder vilkårene til GNU "
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -815,7 +980,7 @@ msgstr ""
 "%s\n"
 "<relative path of hdlist> mangler\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -837,17 +1002,7 @@ msgstr ""
 "       http://<vert>/<sti> with <relative filename of hdlist>\n"
 "       removable_<enhet>://<sti>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "kunne ikke opprette medium \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "kunne ikke oppdatere medium \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -855,12 +1010,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  --all           - print all tags."
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -869,17 +1019,7 @@ msgstr ""
 "%s\n"
 "<relative path of hdlist> mangler\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --group         - print tag group: group."
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  --group         - print tag group: group."
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -888,57 +1028,7 @@ msgstr ""
 "%s\n"
 "`with' mangler for ftp media\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"bruk: urpmi.removemedia [-a] <name> ...\n"
-"hvor <name> er et medium navn å fjerne.\n"
-"   -a    velg alle medier.\n"
-"\n"
-"ukjente valg '%s'\n"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"inngangen til oppdatering mangler\n"
-"(en av %s)\n"
-
-#: po/placeholder.h:234
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  --group         - print tag group: group."
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ingenting å oppdatere (bruk urpmi.addmedia for å legge til et media)\n"
-
-#: po/placeholder.h:236
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --all           - print all tags."
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ingenting å fjerne (bruk urpmi.addmedia for å legge til et media)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -947,12 +1037,7 @@ msgstr ""
 "inngangen til fjern mangler\n"
 "(en av %s)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  --all           - print all tags."
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -964,35 +1049,28 @@ msgstr ""
 "\n"
 "ukjente valg '%s'\n"
 
-#: po/placeholder.h:252
-#, fuzzy
-msgid "  -h             - print this help message.\n"
-msgstr "  --all           - print all tags."
-
-#: po/placeholder.h:254
+#: po/placeholder.h:429
 #, fuzzy
-msgid "  -g             - print groups too with name.\n"
-msgstr "  --group         - print tag group: group."
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kan ikke lese rpm fil \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"bruk: urpmi.removemedia [-a] <name> ...\n"
+"hvor <name> er et medium navn å fjerne.\n"
+"   -a    velg alle medier.\n"
+"\n"
+"ukjente valg '%s'\n"
 
-#: po/placeholder.h:258
-#, fuzzy
-msgid "  -r             - print version and release too with name.\n"
-msgstr "                    kommandolinje, men uten pakkenavn)."
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"inngangen til oppdatering mangler\n"
+"(en av %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1002,44 +1080,12 @@ msgid ""
 "usage:\n"
 msgstr "Dette er fri programvare og kan redistribueres uder vilkårene til GNU "
 
-#: po/placeholder.h:266
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                    kommandolinje, men uten pakkenavn)."
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"Noen pakker må fjernes for å bli oppgradert, dette er ikke støttet ennå\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1083,18 +1129,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "bruk: urpmi.update [-a] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "bruk: urpmi.removemedia [-a] <name> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "bruk: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "bruk: urpmi.update [-a] <name> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index aee9c325..c9931dd6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2000-09-08 12:48:03+0200\n"
 "Last-Translator: Pawel Jablonski <pj@linux-mandrake.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -23,27 +23,31 @@ msgid ""
 "You requested installation of package $rpm\n"
 msgstr ""
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "W porz±dku?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "OK"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "TtYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (T/n) "
 
@@ -51,618 +55,705 @@ msgstr " (T/n) "
 msgid "$rpm: command not found\n"
 msgstr ""
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr ""
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr ""
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr ""
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "brak pakietu o nazwie %s\n"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Próbowaæ wymusiæ instalacjê (--force)? (t/N) "
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "zapytanie bazy rpm nie powiod³o siê\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "instalowanie %s\n"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (T/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, c-format
-msgid "examining synthesis file [%s]"
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "instalowanie %s\n"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Potrzebny jest jeden z nastêpuj±cych pakietów:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Naci¶nij enter, gdy to zrobisz..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr ""
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:1421
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
-msgid "unable to analyse synthesis data of %s"
+msgid "read synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"u¿ycie: urpmi [-h] [--auto] [--force] [-a] nazwa_pakietu "
+"[nazwy_pakietów...]\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Jaki jest Twój wybór? (1-%d) "
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "unable to build hdlist: %s"
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Niestety, z³y wybór, spróbuj ponownie\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unknown data associated with %s"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "wszystko jest ju¿ zainstalowane"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Potrzebny jest jeden z nastêpuj±cych pakietów:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Instalacja nie powiod³a siê"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr ""
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Nastêpuj±ce pakiety zawieraj± %s: %s\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:121
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
-#, c-format
-msgid "selecting %s using obsoletes"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "wszystko jest ju¿ zainstalowane"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Zostan± zainstalowane nastêpuj±ce pakiety w celu spe³nienia zale¿no¶ci (%d "
+"MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Potrzebny jest jeden z nastêpuj±cych pakietów:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Instalacja nie powiod³a siê"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -671,259 +762,247 @@ msgstr ""
 "Zostan± zainstalowane nastêpuj±ce pakiety w celu spe³nienia zale¿no¶ci (%d "
 "MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr ""
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Próbowaæ instalowaæ bez sprawdzania zale¿no¶ci? (t/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Jaki jest Twój wybór? (1-%d) "
-
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Próbowaæ wymusiæ instalacjê (--force)? (t/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Niestety, z³y wybór, spróbuj ponownie\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "instalowanie %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Proszê w³o¿yæ %s o nazwie %s"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr ""
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Nastêpuj±ce pakiety zawieraj± %s: %s\n"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Naci¶nij enter, gdy to zrobisz..."
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Tylko root ma prawo instalowaæ pakiety lokalne"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr ""
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Potrzebny jest jeden z nastêpuj±cych pakietów:"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
-#, c-format
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:187
-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"
-"and [options] are from\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
-#: urpmi.addmedia:57
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:211 po/placeholder.h:313
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Tylko root ma prawo instalowaæ pakiety lokalne"
+
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:296
 #, c-format
 msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:217
+#: po/placeholder.h:348
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:218
+#: po/placeholder.h:359
+#, c-format
 msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
 msgstr ""
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: po/placeholder.h:234
+#: po/placeholder.h:383
 msgid ""
-"  -d             - force complete computation of depslist.ordered file.\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"
+"and [options] are from\n"
 msgstr ""
 
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
+#: urpmi.addmedia:57
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
+#: po/placeholder.h:401 urpmi.addmedia:82
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:408 urpmi.addmedia:84
+#, c-format
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -933,42 +1012,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1011,16 +1060,16 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr ""
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
 msgstr ""
 
 #: urpmq:34
@@ -1034,13 +1083,6 @@ msgstr ""
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "u¿ycie: urpmi [-h] [--auto] [--force] [-a] nazwa_pakietu "
-#~ "[nazwy_pakietów...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "Niestety nie mogê znale¼æ pliku %s, koñczê dzia³anie"
 
diff --git a/po/pt.po b/po/pt.po
index 0650feff..9481bf4a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-03-09 12:25GMT\n"
 "Last-Translator: Jorge Costa <Jorgercosta@netc.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -28,27 +28,31 @@ msgstr ""
 "Instalação automática de pacotes...\n"
 "Pediu a instalação do pacote $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Está bem assim?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Aceitar"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "SsYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (S/n) "
 
@@ -56,618 +60,705 @@ msgstr " (S/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: comando não encontrado\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, fuzzy, c-format
 msgid "urpmf version %s"
 msgstr "urpmi versão %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 #, fuzzy
 msgid "usage: urpmf [options] <file>"
 msgstr "Uso: rpmf [<ficheiro>]"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr ""
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr ""
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Tentar instalação ainda de forma mais insistente (--force)? (s/N) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (S/n) "
+
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"alguns pacotes têm que ser removidos para serem actualizados, isto ainda não "
+"é suportado\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, fuzzy, c-format
 msgid "mounting %s"
 msgstr "a instalar %s\n"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-
-#: po/placeholder.h:69
-#, c-format
-msgid "examining synthesis file [%s]"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr ""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nada a remover (use urpmi.addmedia para adicionar media)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Um dos seguintes pacotes é necessário:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Prima 'Enter' quando concluído..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr ""
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:1421
-#, c-format
-msgid "read synthesis file [%s]"
-msgstr ""
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nada a actualizar (use urpmi.addmedia para adicionar media)\n"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
-msgid "unable to analyse synthesis data of %s"
+msgid "read synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
-msgstr ""
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opção desconhecida \"-$1\", ver uso com --help\n"
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
-msgstr ""
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "uso: urpmi.addmedia <nome> <url>"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Qual é a sua escolha? (1-%d)"
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "unable to build hdlist: %s"
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Desculpe, opção incorrecta, tente de novo\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unknown data associated with %s"
+msgid "relocated %s entries in depslist"
+msgstr ""
+
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "no rpm files found from [%s]"
+msgstr ""
+
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr ""
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "já está tudo instalado"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Um dos seguintes pacotes é necessário:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
+#, fuzzy, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: é impossível ler o ficheiro rpm \"$_\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "A instalação falhou"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr ""
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Um dos seguintes pacotes é necessário:"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:121
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
-#, c-format
-msgid "selecting %s using obsoletes"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "já está tudo instalado"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Por forma a resolver as dependências, serão instalados os seguintes pacotes "
+"(%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: opção desconhecida \"-$1\", ver uso com --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Um dos seguintes pacotes é necessário:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "A instalação falhou"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -676,113 +767,179 @@ msgstr ""
 "Por forma a resolver as dependências, serão instalados os seguintes pacotes "
 "(%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr ""
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Tentar instalação sem verificar dependências? (s/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Qual é a sua escolha? (1-%d)"
-
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Tentar instalação ainda de forma mais insistente (--force)? (s/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Desculpe, opção incorrecta, tente de novo\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "a instalar %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Por favor insira o suporte de media \"%s\" no dispositivo [%s]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Um dos seguintes pacotes é necessário:"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr ""
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr ""
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "foi impossível obter pacotes fonte, a abortar"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Prima 'Enter' quando concluído..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr ""
+
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr ""
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr ""
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "Apenas o SuperUtilizador pode instalar pacotes localmente"
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Um dos seguintes pacotes é necessário:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -791,7 +948,7 @@ msgstr ""
 "%s\n"
 "<caminho relativo de hdlist> em falta\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -804,17 +961,7 @@ msgid ""
 "and [options] are from\n"
 msgstr ""
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, fuzzy, c-format
 msgid ""
@@ -822,11 +969,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr "opções desconhecidas \"%s\"\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -835,15 +978,7 @@ msgstr ""
 "%s\n"
 "<caminho relativo de hdlist> em falta\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -852,49 +987,7 @@ msgstr ""
 "%s\n"
 "`with' em falta para suporte ftp\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-
-#: po/placeholder.h:227 urpmi.update:59
-#, 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"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nada a actualizar (use urpmi.addmedia para adicionar media)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nada a remover (use urpmi.addmedia para adicionar media)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -903,43 +996,29 @@ msgstr ""
 "a entrada a remover está em falta\n"
 "(um de %s)\n"
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
 msgstr "uso: urpmi.addmedia <nome> <url>"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:255 urpmq:90
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: é impossível ler o ficheiro rpm \"$_\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, 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"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -949,44 +1028,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"alguns pacotes têm que ser removidos para serem actualizados, isto ainda não "
-"é suportado\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opção desconhecida \"-$1\", ver uso com --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1030,18 +1077,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
+#: urpmi.removemedia:34
 #, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
+msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr "uso: urpmi.addmedia <nome> <url>"
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
+#: urpmi.update:41
 #, fuzzy
-msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgid "usage: urpmi.update [options] <name> ..."
 msgstr "uso: urpmi.addmedia <nome> <url>"
 
 #: urpmq:34
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a47a9468..fbecb2d5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-05-07 14:41-0300\n"
 "Last-Translator: Andrei Bosco Bezerra Torres <andreibt@uol.com.br>\n"
 "Language-Team: Português Brasileiro <andreibt@uol.com.br>\n"
@@ -26,27 +26,31 @@ msgstr ""
 "Instalação automática de pacotes...\n"
 "Você pediu a instalação do pacote $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Tudo bem?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ok"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "SsYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (S/n) "
 
@@ -54,621 +58,708 @@ msgstr " (S/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: comando não encontrado\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, fuzzy, c-format
 msgid "urpmf version %s"
 msgstr "urpmi versão %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 #, fuzzy
 msgid "usage: urpmf [options] <file>"
 msgstr "utilização: rpmf [<arquivo>]"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "incapaz de atualizar mídia \"%s\"\n"
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "incapaz de atualizar mídia \"%s\"\n"
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr ""
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "incapaz de criar mídia \"%s\"\n"
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, fuzzy, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "incapaz de atualizar mídia \"%s\"\n"
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "incapaz de criar mídia \"%s\"\n"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "incapaz de atualizar mídia \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "incapaz de criar mídia \"%s\"\n"
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr ""
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Tentar instalar com ainda mais força (--force)? (s/N) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "incapaz de atualizar mídia \"%s\"\n"
+msgid " (y/N) "
+msgstr " (S/n) "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"alguns pacotes devem ser removidos para serem atualizados, isso ainda não é "
+"suportado\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, fuzzy, c-format
 msgid "mounting %s"
 msgstr "instalando %s\n"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "incapaz de criar mídia \"%s\"\n"
-
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "incapaz de criar mídia \"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+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"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Um dos pacotes a seguir é necessário:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Aperte enter quando estiver pronto..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "incapaz de criar mídia \"%s\"\n"
-
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, fuzzy, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "incapaz de atualizar mídia \"%s\"\n"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+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"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "incapaz de criar mídia \"%s\"\n"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "incapaz de atualizar mídia \"%s\"\n"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr ""
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "incapaz de criar mídia \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
-msgstr ""
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opção desconhecida \"-$1\", cheque a utilização com --help\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "utilização: urpmi.removemedia [-a] <nome> ..."
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
-msgid "syntax error in config file at line %s"
+msgid "building hdlist [%s]"
+msgstr ""
+
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:94
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
-msgid "building hdlist [%s]"
+msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, fuzzy, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "incapaz de criar mídia \"%s\"\n"
 
-#: po/placeholder.h:96
-#, c-format
-msgid "added medium %s"
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "What is your choice? (1-%d) "
+msgstr "Qual é a sua escolha? (1-%d) "
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, fuzzy, c-format
-msgid "unable to build hdlist: %s"
+msgid "unable to access rpm file [%s]"
+msgstr "incapaz de criar mídia \"%s\"\n"
+
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Desculpe, má escolha, tente novamente\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\""
 msgstr "incapaz de atualizar mídia \"%s\"\n"
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
-#, c-format
-msgid "invalid rpm file name [%s]"
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:114 po/placeholder.h:303
+#, fuzzy, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "incapaz de criar mídia \"%s\"\n"
+
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unknown data associated with %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
-#, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
-#, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "incapaz de criar mídia \"%s\"\n"
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
 
-#: po/placeholder.h:111
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "tudo já instalando"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Um dos pacotes a seguir é necessário:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: não posso ler arquim rpm \"$_\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Instalação falhou"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
 msgstr "incapaz de atualizar mídia \"%s\"\n"
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "unmounting %s"
+msgstr ""
+
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "removing medium \"%s\""
 msgstr "incapaz de criar mídia \"%s\"\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:142 po/placeholder.h:236
 #, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Um dos pacotes a seguir é necessário:"
-
-#: po/placeholder.h:120
-#, c-format
-msgid "no rpm files found from [%s]"
-msgstr ""
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "incapaz de atualizar mídia \"%s\"\n"
 
-#: po/placeholder.h:121
+#: po/placeholder.h:143 po/placeholder.h:238
 #, fuzzy, c-format
-msgid "examining hdlist file [%s]"
+msgid "trying to select multiple medium: %s"
 msgstr "incapaz de criar mídia \"%s\"\n"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "incapaz de atualizar mídia \"%s\"\n"
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr ""
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "incapaz de criar mídia \"%s\"\n"
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "incapaz de criar mídia \"%s\"\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"Para satisfazer as dependências, os seguintes pacotes irão ser instalados (%"
+"d MB)"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "tudo já instalando"
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: opção desconhecida \"-$1\", cheque a utilização com --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Um dos pacotes a seguir é necessário:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+#, fuzzy
+msgid "unable to register rpm file"
+msgstr "incapaz de criar mídia \"%s\"\n"
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Instalação falhou"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "incapaz de atualizar mídia \"%s\"\n"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -677,113 +768,179 @@ msgstr ""
 "Para satisfazer as dependências, os seguintes pacotes irão ser instalados (%"
 "d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr ""
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Tentar instalar sem checar as dependências? (s/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
-msgid "  -p             - allow search in provides to find package.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, fuzzy, c-format
+msgid "unable to build hdlist: %s"
+msgstr "incapaz de atualizar mídia \"%s\"\n"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr ""
+
+#: po/placeholder.h:191 po/placeholder.h:355
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Qual é a sua escolha? (1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "instalando %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Favor inserir a mídia chamada  \"%s\" no dispositivo [%s]"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Um dos pacotes a seguir é necessário:"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "incapaz de criar mídia \"%s\"\n"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Tentar instalar com ainda mais força (--force)? (s/N) "
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Desculpe, má escolha, tente novamente\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "incapaz de obter a pacotes fonte, abortando"
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "installing %s\n"
-msgstr "instalando %s\n"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Favor inserir a mídia chamada  \"%s\" no dispositivo [%s]"
-
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "incapaz de obter a pacotes fonte, abortando"
+msgid "selecting %s by selection on files"
+msgstr ""
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Aperte enter quando estiver pronto..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "Apenas um super-usuário tem permissão para instalar pacotes locais"
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Um dos pacotes a seguir é necessário:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -792,7 +949,7 @@ msgstr ""
 "%s\n"
 "<caminho relativo do hdlist> faltando\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -814,17 +971,7 @@ msgstr ""
 "       http://<host>/<caminho> with <nome relativo do arquivo do hdlist>\n"
 "       removable_<dispositivo>://<caminho>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "incapaz de criar mídia \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "incapaz de atualizar mídia \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -832,11 +979,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -845,15 +988,7 @@ msgstr ""
 "%s\n"
 "<caminho relativo do hdlist> faltando\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -862,17 +997,28 @@ msgstr ""
 "%s\n"
 "`with' faltando para mídia ftp\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, 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"
 
-#: po/placeholder.h:217
+#: po/placeholder.h:425
+#, fuzzy
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"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 da mídia a ser removida.\n"
+"   -a    seleciona todas as mídias.\n"
+"\n"
+"opções desconhecidas '%s'\n"
 
-#: po/placeholder.h:218
+#: po/placeholder.h:429
 #, fuzzy
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -884,7 +1030,7 @@ msgstr ""
 "\n"
 "opções desconhecidas '%s'\n"
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -893,74 +1039,7 @@ msgstr ""
 "a entrada a ser atualizada está faltando\n"
 "(uma de %s)\n"
 
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-
-#: po/placeholder.h:235 urpmi.update:57
-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"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-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"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
-#, 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"
-
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
-#, fuzzy
-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 da mídia a ser removida.\n"
-"   -a    seleciona todas as mídias.\n"
-"\n"
-"opções desconhecidas '%s'\n"
-
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:255 urpmq:90
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: não posso ler arquim rpm \"$_\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -970,44 +1049,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"alguns pacotes devem ser removidos para serem atualizados, isso ainda não é "
-"suportado\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opção desconhecida \"-$1\", cheque a utilização com --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1051,18 +1098,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "utilização: urpmi.update [-a] <nome> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "utilização: urpmi.removemedia [-a] <nome> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "utilização: urpmi.removemedia [-a] <nome> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "utilização: urpmi.update [-a] <nome> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/ro.po b/po/ro.po
index a4c50277..a807ea4c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2000-04-29 12:05+0100\n"
 "Last-Translator: Florin Grad <florin@mandrakesoft.com>\n"
 "Language-Team: Romanian\n"
@@ -24,27 +24,31 @@ msgid ""
 "You requested installation of package $rpm\n"
 msgstr ""
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "E ok?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ok"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Anuleazã"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "DdYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (D/n) "
 
@@ -52,618 +56,703 @@ msgstr " (D/n) "
 msgid "$rpm: command not found\n"
 msgstr ""
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr ""
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr ""
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr ""
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "nici un pachet cu numele %s\n"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Încearcã instalarea încã ºi mai dur (--force)? (d/N) "
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "examinarea bazei de date rpm a eºuat\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "instalez %s\n"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (D/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, c-format
-msgid "examining synthesis file [%s]"
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "instalez %s\n"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Unul din urmãtoarele pachete e necesar:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Apãsaþi enter cînd e gata..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr ""
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:1421
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
-msgid "unable to analyse synthesis data of %s"
+msgid "read synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"utilizare: urpmi [-h] [--auto] [--force] [-a] nume_pachet [nume_pachete...]\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Ce alegeþi? (1-%d) "
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "unable to build hdlist: %s"
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Aþi ales greºit, încercaþi din nou\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unknown data associated with %s"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr ""
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "totul e deja instalat"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Unul din urmãtoarele pachete e necesar:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Instalarea a eºuat"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Urmãtoarele pachete conþin %s: %s\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:121
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
-#, c-format
-msgid "selecting %s using obsoletes"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr ""
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "totul e deja instalat"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Pentru a satisface dependenþele, urmãtoarele pachete vor fi instalate (%d MB)"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Unul din urmãtoarele pachete e necesar:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Instalarea a eºuat"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -671,259 +760,247 @@ msgid ""
 msgstr ""
 "Pentru a satisface dependenþele, urmãtoarele pachete vor fi instalate (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr ""
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Încearcã instalarea fãrã verificarea dependenþelor? (d/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ce alegeþi? (1-%d) "
-
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Încearcã instalarea încã ºi mai dur (--force)? (d/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Aþi ales greºit, încercaþi din nou\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "instalez %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vã rog  introduceþi %s cu numele %s"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr ""
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Urmãtoarele pachete conþin %s: %s\n"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Apãsaþi enter cînd e gata..."
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Doar superutilizatorul poate instala pachetele locale"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr ""
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Unul din urmãtoarele pachete e necesar:"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
-#, c-format
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:187
-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"
-"and [options] are from\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
-#: urpmi.addmedia:57
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:211 po/placeholder.h:313
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Doar superutilizatorul poate instala pachetele locale"
+
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:296
 #, c-format
 msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:217
+#: po/placeholder.h:348
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:218
+#: po/placeholder.h:359
+#, c-format
 msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
 msgstr ""
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: po/placeholder.h:234
+#: po/placeholder.h:383
 msgid ""
-"  -d             - force complete computation of depslist.ordered file.\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"
+"and [options] are from\n"
 msgstr ""
 
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
+#: urpmi.addmedia:57
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
+#: po/placeholder.h:401 urpmi.addmedia:82
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:408 urpmi.addmedia:84
+#, c-format
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -933,42 +1010,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1011,16 +1058,16 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr ""
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
 msgstr ""
 
 #: urpmq:34
@@ -1034,13 +1081,6 @@ msgstr ""
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "utilizare: urpmi [-h] [--auto] [--force] [-a] nume_pachet "
-#~ "[nume_pachete...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "Nu pot sã gãsesc fiºierul %s, termin"
 
diff --git a/po/ru.po b/po/ru.po
index 66625c0a..4e3b278b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2000-08-01 16:24+0200\n"
 "Last-Translator: Aleksey Smirnov <smi@logic.ru>\n"
 "Language-Team: Russian\n"
@@ -27,27 +27,31 @@ msgstr ""
 "á×ÔÏÍÁÔÉÞÅÓËÁÑ ÕÓÔÁÎÏ×ËÁ ÐÁËÅÔÏ×...\n"
 "÷Ù ÚÁÐÒÏÓÉÌÉ ÕÓÔÁÎÏ×ËÕ ÐÁËÅÔÁ $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "üÔÏ ÐÒÁ×ÉÌØÎÏ?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ok"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "ïÔÍÅÎÉÔØ"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "îÎnN"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "äÄYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (ä/Î) "
 
@@ -55,624 +59,716 @@ msgstr " (ä/Î) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: ËÏÍÁÎÄÁ ÎÅ ÎÁÊÄÅÎÁ\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, fuzzy, c-format
 msgid "urpmf version %s"
 msgstr "urpmi ×ÅÒÓÉÑ %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 #, fuzzy
 msgid "usage: urpmf [options] <file>"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: rpmf [<ÆÁÊÌ>]"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr ""
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, fuzzy, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "ÐÁËÅÔÙ ÎÅ ÎÁÚ×ÁÎÙ %s\n"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "ðÏÐÒÏÂÏ×ÁÔØ ÕÓÔÁÎÏ×ÉÔØ ÅÝÅ ÂÏÌÅÅ ÎÁÓÔÏÊÞÉ×Ï (--force)? (Ä/î) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:64
-#, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
-
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "ÚÁÐÒÏÓ Ë ÂÁÚÅ rpm ÎÅ ÐÒÏÛÅÌ \n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "ÕÓÔÁÎÏ×ËÁ %s\n"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (ä/Î) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"ÎÅËÏÔÏÒÙÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ ÐÅÒÅÄ ÉÈ ÏÂÎÏ×ÌÅÎÉÅÍ, ÜÔÏ ÐÏËÁ ÎÅ "
+"ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
-#: po/placeholder.h:69
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
+msgid "mounting %s"
+msgstr "ÕÓÔÁÎÏ×ËÁ %s\n"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"ÎÅÞÅÇÏ ÕÄÁÌÑÔØ (ÉÓÐÏÌØÚÕÊÔÅ urpmi.addmedia ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ ÉÓÔÏÞÎÉËÁ ÄÁÎÎÙÈ)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "îÕÖÅÎ ÏÄÉÎ ÉÚ ÓÌÅÄÕÀÝÉÈ ÐÁËÅÔÏ×:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "ðÏ ÇÏÔÏ×ÎÏÓÔÉ ÎÁÖÍÉÔÅ enter..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
-
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, fuzzy, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"ÎÅÞÅÇÏ ÏÂÎÏ×ÌÑÔØ (ÉÓÐÏÌØÚÕÊÔÅ urpmi.addmedia ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ ÉÓÔÏÞÎÉËÁ "
+"ÄÁÎÎÙÈ)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr ""
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
+"urpmq: ÎÅÉÚÍÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ \"-$1\", ÐÒÏ×ÅÒØÔÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ , Ó ÐÁÒÁÍÅÔÒÏÍ "
+"--help\n"
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"ÎÁÂÒÁÔØ: urpmi [-h] [--auto] [--force] [-a] ÉÍÑ_ÐÁËÅÔÁ [ÉÍÅÎÁ_ÐÁËÅÔÏ×...]\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, fuzzy, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "þÔÏ ×Ù ×ÙÂÅÒÅÔÅ? (1-%d) "
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
+#, c-format
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, fuzzy, c-format
-msgid "unable to build hdlist: %s"
+msgid "unable to access rpm file [%s]"
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
+
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "éÚ×ÉÎÉÔÅ, ÜÔÏ ÐÌÏÈÏÊ ×ÙÂÏÒ, ÐÏÐÒÏÂÕÊÔÅ ÅÝÅ\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\""
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
-#, c-format
-msgid "invalid rpm file name [%s]"
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:114 po/placeholder.h:303
+#, fuzzy, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
+
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unknown data associated with %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
-#, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
-#, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
 
-#: po/placeholder.h:111
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "×ÓÅ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎÏ"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "îÕÖÅÎ ÏÄÉÎ ÉÚ ÓÌÅÄÕÀÝÉÈ ÐÁËÅÔÏ×:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ÎÅ ÕÄÁÅÔÓÑ ÐÒÏÞÉÔÁÔØ rpm ÆÁÊÌ \"$_\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "õÓÔÁÎÏ×ËÁ ÎÅ ÐÒÏÛÌÁ"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "unmounting %s"
+msgstr ""
+
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr ""
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "removing medium \"%s\""
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:142 po/placeholder.h:236
 #, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "üÔÉ ÐÁËÅÔÙ ÓÏÄÅÒÖÁÔ %s: %s\n"
-
-#: po/placeholder.h:120
-#, c-format
-msgid "no rpm files found from [%s]"
-msgstr ""
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
 
-#: po/placeholder.h:121
+#: po/placeholder.h:143 po/placeholder.h:238
 #, fuzzy, c-format
-msgid "examining hdlist file [%s]"
+msgid "trying to select multiple medium: %s"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr ""
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"äÌÑ ÕÄÏ×ÌÅÔ×ÏÒÅÎÉÑ ÚÁ×ÉÓÉÍÏÓÔÅÊ ÂÕÄÕÔ ÕÓÔÁÎÏ×ÌÅÎÙ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ  (%d MB)"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "×ÓÅ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎÏ"
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 "urpmq: ÎÅÉÚÍÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ \"-$1\", ÐÒÏ×ÅÒØÔÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ , Ó ÐÁÒÁÍÅÔÒÏÍ "
 "--help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "îÕÖÅÎ ÏÄÉÎ ÉÚ ÓÌÅÄÕÀÝÉÈ ÐÁËÅÔÏ×:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+#, fuzzy
+msgid "unable to register rpm file"
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "õÓÔÁÎÏ×ËÁ ÎÅ ÐÒÏÛÌÁ"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -680,115 +776,181 @@ msgid ""
 msgstr ""
 "äÌÑ ÕÄÏ×ÌÅÔ×ÏÒÅÎÉÑ ÚÁ×ÉÓÉÍÏÓÔÅÊ ÂÕÄÕÔ ÕÓÔÁÎÏ×ÌÅÎÙ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ  (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr ""
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "ðÏÐÒÏÂÏ×ÁÔØ ÕÓÔÁÎÏ×ÉÔØ ÂÅÚ ÐÒÏ×ÅÒËÉ ÚÁ×ÉÓÉÍÏÓÔÅÊ? (Ä/î) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
-msgid "  -p             - allow search in provides to find package.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, fuzzy, c-format
+msgid "unable to build hdlist: %s"
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr ""
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:191 po/placeholder.h:355
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "þÔÏ ×Ù ×ÙÂÅÒÅÔÅ? (1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "ÕÓÔÁÎÏ×ËÁ %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "÷ÓÔÁ×ØÔÅ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ Ó ÉÍÅÎÅÍ \"%s\" × ÕÓÔÒÏÊÓÔ×Ï [%s]"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "üÔÉ ÐÁËÅÔÙ ÓÏÄÅÒÖÁÔ %s: %s\n"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "ðÏÐÒÏÂÏ×ÁÔØ ÕÓÔÁÎÏ×ÉÔØ ÅÝÅ ÂÏÌÅÅ ÎÁÓÔÏÊÞÉ×Ï (--force)? (Ä/î) "
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "éÚ×ÉÎÉÔÅ, ÜÔÏ ÐÌÏÈÏÊ ×ÙÂÏÒ, ÐÏÐÒÏÂÕÊÔÅ ÅÝÅ\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÐÏÌÕÞÉÔØ ÉÓÈÏÄÎÙÅ (source) ÐÁËÅÔÙ, ×ÙÈÏÄÉÍ"
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "installing %s\n"
-msgstr "ÕÓÔÁÎÏ×ËÁ %s\n"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "÷ÓÔÁ×ØÔÅ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ Ó ÉÍÅÎÅÍ \"%s\" × ÕÓÔÒÏÊÓÔ×Ï [%s]"
-
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "ÎÅ ÕÄÁÅÔÓÑ ÐÏÌÕÞÉÔØ ÉÓÈÏÄÎÙÅ (source) ÐÁËÅÔÙ, ×ÙÈÏÄÉÍ"
+msgid "selecting %s by selection on files"
+msgstr ""
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "ðÏ ÇÏÔÏ×ÎÏÓÔÉ ÎÁÖÍÉÔÅ enter..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 "ôÏÌØËÏ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÀ (ÁÄÍÉÎÉÓÔÒÁÔÏÒÕ) ÒÁÚÒÅÛÁÅÔÓÑ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ "
 "ÌÏËÁÌØÎÙÅ ÐÁËÅÔÙ"
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "îÕÖÅÎ ÏÄÉÎ ÉÚ ÓÌÅÄÕÀÝÉÈ ÐÁËÅÔÏ×:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -797,7 +959,7 @@ msgstr ""
 "%s\n"
 "<ÏÔÎÏÓÉÔÅÌØÎÙÊ ÐÕÔØ Ë hdlist> ÎÅ ÕËÁÚÁÎ\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -821,17 +983,7 @@ msgstr ""
 "hdlist>\n"
 "       removable_<device>://<ÐÕÔØ>  (ÄÌÑ ÓØÅÍÎÙÈ ÕÓÔÒÏÊÓÔ×)\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ÎÅ ÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË ÄÁÎÎÙÈ \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -839,11 +991,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -852,15 +1000,7 @@ msgstr ""
 "%s\n"
 "<ÏÔÎÏÓÉÔÅÌØÎÙÊ ÐÕÔØ Ë hdlist> ÎÅ ÕËÁÚÁÎ\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -869,17 +1009,28 @@ msgstr ""
 "%s\n"
 "`with' ÏÔÓÕÔÓ×ÕÅÔ ÄÌÑ ftp media\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"ÐÕÎËÔ ÄÌÑ ÕÄÁÌÅÎÉÑ ÎÅ ÕËÁÚÁÎ\n"
+"(ÏÄÉÎ ÉÚ %s)\n"
 
-#: po/placeholder.h:217
+#: po/placeholder.h:425
+#, fuzzy
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\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"
 
-#: po/placeholder.h:218
+#: po/placeholder.h:429
 #, fuzzy
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -891,7 +1042,7 @@ msgstr ""
 "\n"
 "ÎÅÉÚ×ÅÓÔÎÙÅ ÐÁÒÁÍÅÔÒÙ '%s'\n"
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -900,77 +1051,7 @@ msgstr ""
 "ÐÕÎËÔ ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ ÎÅ ÕËÁÚÁÎ\n"
 "(ÏÄÉÎ ÉÚ %s)\n"
 
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"ÎÅÞÅÇÏ ÏÂÎÏ×ÌÑÔØ (ÉÓÐÏÌØÚÕÊÔÅ urpmi.addmedia ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ ÉÓÔÏÞÎÉËÁ "
-"ÄÁÎÎÙÈ)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"ÎÅÞÅÇÏ ÕÄÁÌÑÔØ (ÉÓÐÏÌØÚÕÊÔÅ urpmi.addmedia ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ ÉÓÔÏÞÎÉËÁ ÄÁÎÎÙÈ)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
-#, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"ÐÕÎËÔ ÄÌÑ ÕÄÁÌÅÎÉÑ ÎÅ ÕËÁÚÁÎ\n"
-"(ÏÄÉÎ ÉÚ %s)\n"
-
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
-#, fuzzy
-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"
-
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:255 urpmq:90
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ÎÅ ÕÄÁÅÔÓÑ ÐÒÏÞÉÔÁÔØ rpm ÆÁÊÌ \"$_\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -980,46 +1061,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"ÎÅËÏÔÏÒÙÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ ÐÅÒÅÄ ÉÈ ÏÂÎÏ×ÌÅÎÉÅÍ, ÜÔÏ ÐÏËÁ ÎÅ "
-"ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: ÎÅÉÚÍÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ \"-$1\", ÐÒÏ×ÅÒØÔÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ , Ó ÐÁÒÁÍÅÔÒÏÍ "
-"--help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1063,18 +1110,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: urpmi.update [-a] <ÉÍÑ> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: urpmi.removemedia [-a] <ÉÍÑ> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: urpmi.removemedia [-a] <ÉÍÑ> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: urpmi.update [-a] <ÉÍÑ> ..."
 
 #: urpmq:34
 #, c-format
@@ -1209,13 +1256,6 @@ msgstr "urpmq ×ÅÒÓÉÑ %s"
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "ÎÁÂÒÁÔØ: urpmi [-h] [--auto] [--force] [-a] ÉÍÑ_ÐÁËÅÔÁ "
-#~ "[ÉÍÅÎÁ_ÐÁËÅÔÏ×...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ %s, ×ÙÈÏÖÕ"
 
diff --git a/po/sk.po b/po/sk.po
index cf3160e3..a6745ddc 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-08-03 13:32+0100\n"
 "Last-Translator: Jan Matis <damned@hq.alert.sk>\n"
 "Language-Team: sk <i18n@hq.alert.sk>\n"
@@ -28,27 +28,31 @@ msgstr ""
 "Automatická in¹talácia balíèkov...\n"
 "®iadali ste in¹taláciu balíèka $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Je to v poriadku?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ok"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Zru¹"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "AaÁáYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (Á/n) "
 
@@ -56,629 +60,715 @@ msgstr " (Á/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: príkaz nebol nájdený\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf verzia %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr "Toto je free softvér a musí by» redistribuovaný pod licenciou GNU GPL."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "pou¾itie: urpmf [voµby] <súbor>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "skúste urpmf --help pre zobrazenie mo¾ností"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "nemô¾em zapísa» konfiguraèný súbor [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:33
-#, fuzzy, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr "nemô¾em zapisa» list súbor pre \"%s\""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, fuzzy, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 "nemô¾em pristúpi» k súboru so zoznamom pre \"%s\", médium je ignorované"
 
-#: po/placeholder.h:36
+#: po/placeholder.h:33 po/placeholder.h:218
+#, fuzzy, c-format
+msgid "nothing to write in list file for \"%s\""
+msgstr "nemô¾em zapisa» list súbor pre \"%s\""
+
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "nemô¾em parsova» hdlist súbor pre \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, fuzzy, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "nemô¾em zapisa» list súbor pre \"%s\""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
-"nemô¾em pristúpi» k súboru so zoznamom pre \"%s\", médium je ignorované"
 
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "package %s is not found."
-msgstr "nena¹iel som balíèek %s"
-
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "odpájam %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "hdlist súbor na médiu nebol nájdený \"%s\""
+msgid "package %s is not found."
+msgstr "nena¹iel som balíèek %s"
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "èítam hdlist súbor [%s]"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "pokus o odstránenie neexistujúceho média \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "èítam hdlist súbor [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "nemô¾em vytvori» synthesis súbor pre médium \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "pokus o výber neexistujúceho média \"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "nemô¾em aktualizova» médium \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "médium \"%s\" u¾ existuje"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "nemô¾em zapisa» list súbor pre \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "zápis konfiguraèného súboru [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "¾iaden balíèek s názvom %s"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Skúsi» \"tvrd¹iu\" in¹taláciu (--force)? (á/N) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, fuzzy, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+"nemô¾em pristúpi» k súboru so zoznamom pre \"%s\", médium je ignorované"
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "nemô¾em vytvori» synthesis súbor pre médium \"%s\""
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "nemô¾em vytvori» synthesis súbor pre médium \"%s\""
+msgid " (y/N) "
+msgstr " (Á/n) "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, fuzzy, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"nemô¾em pristúpi» k súboru so zoznamom pre \"%s\", médium je ignorované"
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"niektoré balíèky by mali by» odstránene pri aktualizácii, zatiaµ to nieje "
+"podorované\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "pripájam %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "èítanie depslist súboru [%s]"
-
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nemô¾em vytvori» médium \"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "niet niè na odstránenie (pou¾i urpmi.addmedia na pridanie média)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Jeden z nasledujúcich balíkov je potrebný:"
+
+# ******************fix me***********
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Po ukonèení stlaète enter..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-#, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "èítam hdlist súbor [%s]"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr ""
 
-#: po/placeholder.h:77 urpm.pm:253
-#, fuzzy, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
-"nemô¾em pristúpi» k súboru so zoznamom pre \"%s\", médium je ignorované"
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "nemô¾em registrova» rpm súbor"
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
+msgstr ""
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, fuzzy, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
-"nemô¾em pristúpi» k súboru so zoznamom pre \"%s\", médium je ignorované"
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "po¹kodený súbor zoznamu pre \"%s\", médium je ignorované"
-
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "kopírovanie [%s] zlýhalo"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "nemô¾em správne preèita» [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "niet niè na aktualizáciu (pou¾i urpmi.addmedia na pridanie média)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "èítanie depslist súboru [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "nemô¾em parsova» hdlist súbor pre \"%s\""
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr ""
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "nemô¾em vytvori» médium \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "èítam hdlist súbor [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "syntaktická chyba v konfiguraènom súbore na riadku %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: neznáma voµba \"-%s\", pou¾ítie zistíte s --help\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "pou¾itie: urpmi.removemedia [-a] <meno> ..."
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "vytváram hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nemô¾em preèíta» rpm súbor [%s] z média \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr ""
-
-#: po/placeholder.h:99
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nemô¾em preèíta» rpm súbor [%s] z média \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "nemô¾em zapisa» list súbor pre \"%s\""
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "nemô¾em vytvori» hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, fuzzy, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "nebolo vybraté vymeniteµné médium"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nesprávne meno rpm súboru [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
-#, fuzzy, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "pokus o výber neexistujúceho média \"%s\""
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Vá¹ výber? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 "nemô¾em pristúpi» k súboru so zoznamom pre \"%s\", médium je ignorované"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nemô¾em pristúpi» k rpm súboru [%s]"
 
-#: po/placeholder.h:111
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Prepáète, zlá voµba, skúste znova\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
+msgid "unable to access medium \"%s\""
+msgstr "nemô¾em pristúpi» na médium \"%s\""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "premiestnených %s polo¾iek v zozname závislosti"
 
-#: po/placeholder.h:116 urpm.pm:1849
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nemô¾em pristúpi» na médium \"%s\""
-
-#: po/placeholder.h:117 urpm.pm:1756
-#, fuzzy, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr "nemô¾em správne preèita» [%s]"
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "pokus o výber neexistujúceho média \"%s\""
 
-#: po/placeholder.h:119 urpm.pm:1305
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Nasledujúce balíèky obsahujú %s: %s"
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
+#, fuzzy, c-format
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "nemô¾em správne preèita» [%s]"
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, fuzzy, c-format
 msgid "no rpm files found from [%s]"
 msgstr "nesprávne meno rpm súboru [%s]"
 
-#: po/placeholder.h:121
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "èítam hdlist súbor [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "nemô¾em zapísa» depslist súbor [%s]"
 
-#: po/placeholder.h:122 urpm.pm:1191
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "v¹etko je u¾ nain¹talované"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:123 po/placeholder.h:217
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Jeden z nasledujúcich balíkov je potrebný:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nemô¾em preèíta» rpm súbor \"%s\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "In¹talácia zlyhala"
+
+#: po/placeholder.h:132 po/placeholder.h:224
 #, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "premiestnených %s polo¾iek v zozname závislosti"
+msgid "unable to access first installation medium"
+msgstr ""
+"nemô¾em pristúpi» k súboru so zoznamom pre \"%s\", médium je ignorované"
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "unmounting %s"
+msgstr "odpájam %s"
+
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "hdlist súbor na médiu nebol nájdený \"%s\""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:233
+#, fuzzy, c-format
+msgid "removing medium \"%s\""
+msgstr "pokus o odstránenie neexistujúceho média \"%s\""
+
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "nemô¾em vytvori» synthesis súbor pre médium \"%s\""
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "pokus o výber neexistujúceho média \"%s\""
+
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "zápis konfiguraèného súboru [%s]"
+
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "nemô¾em vytvori» synthesis súbor pre médium \"%s\""
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+
+#: po/placeholder.h:156 po/placeholder.h:254
 #, fuzzy, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "nemô¾em zapísa» depslist súbor [%s]"
+msgid "examining synthesis file [%s]"
+msgstr "èítanie depslist súboru [%s]"
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "nemô¾em vytvori» médium \"%s\"\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "v¹etko je u¾ nain¹talované"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Kvôli zachovaniu závislostí, by mali by» nain¹talované nasledujúce balíky (%"
+"d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "èítam hdlist súbor [%s]"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: neznáma voµba \"-%s\", pou¾ítie zistíte s --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, fuzzy, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
+"nemô¾em pristúpi» k súboru so zoznamom pre \"%s\", médium je ignorované"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Jeden z nasledujúcich balíkov je potrebný:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "nemô¾em registrova» rpm súbor"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, fuzzy, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
+"nemô¾em pristúpi» k súboru so zoznamom pre \"%s\", médium je ignorované"
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "In¹talácia zlyhala"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "po¹kodený súbor zoznamu pre \"%s\", médium je ignorované"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "kopírovanie [%s] zlýhalo"
+
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "nemô¾em parsova» hdlist súbor pre \"%s\""
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -687,115 +777,182 @@ msgstr ""
 "Kvôli zachovaniu závislostí, by mali by» nain¹talované nasledujúce balíky (%"
 "d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
+#: po/placeholder.h:180 po/placeholder.h:277
+#, fuzzy
+msgid "copying hdlists file..."
+msgstr "èítam hdlist súbor [%s]"
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "syntaktická chyba v konfiguraènom súbore na riadku %s"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Skúsi» in¹taláciu bez kontroly závislostí? (á/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr ""
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "nemô¾em zapisa» list súbor pre \"%s\""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Vá¹ výber? (1-%d) "
+msgid "unable to build hdlist: %s"
+msgstr "nemô¾em vytvori» hdlist: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, fuzzy, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "nebolo vybraté vymeniteµné médium"
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr "Toto je free softvér a musí by» redistribuovaný pod licenciou GNU GPL."
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "pokus o výber neexistujúceho média \"%s\""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Skúsi» \"tvrd¹iu\" in¹taláciu (--force)? (á/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Prepáète, zlá voµba, skúste znova\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "in¹talujem %s\n"
 
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
 # **************fix me****************
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Prosím vlo¾te médium \"%s\" do zariadenia [%s]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Nasledujúce balíèky obsahujú %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "èítam hdlist súbor [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "premiestnených %s polo¾iek v zozname závislosti"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "nemô¾em získa» zdrojové balíèky, preru¹ujem"
 
-# ******************fix me***********
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Po ukonèení stlaète enter..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr ""
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr ""
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr ""
+
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "In¹talova» balíky má dovolené jedine root"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
 #, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Jeden z nasledujúcich balíkov je potrebný:"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr "Toto je free softvér a musí by» redistribuovaný pod licenciou GNU GPL."
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -804,7 +961,7 @@ msgstr ""
 "%s\n"
 "chýba <relatívna cesta k hdlist>\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -826,17 +983,7 @@ msgstr ""
 "       http://<hostiteµ>/<cesta> with <relatívnym menom súboru hdlist>\n"
 "       removable_<zariadenie>://<cesta>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "nemô¾em vytvori» médium \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "nemô¾em aktualizova» médium \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -844,11 +991,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -857,15 +1000,7 @@ msgstr ""
 "%s\n"
 "chýba <relatívna cesta k hdlist>\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -874,55 +1009,7 @@ msgstr ""
 "%s\n"
 "`with' chýba pre ftp\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"pou¾itie: urpmi.update [-a] <meno> ...\n"
-"kde <meno> je meno média pre odstránenie.\n"
-"   -a   vyberie v¹etky média.\n"
-"\n"
-"neznáme voµby '%s'\n"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, 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"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "niet niè na aktualizáciu (pou¾i urpmi.addmedia na pridanie média)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "niet niè na odstránenie (pou¾i urpmi.addmedia na pridanie média)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -931,11 +1018,7 @@ msgstr ""
 "chýba polo¾ka pre odstránenie\n"
 "(jedna z %s)\n"
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -947,32 +1030,28 @@ msgstr ""
 "\n"
 "neznáme voµby '%s'\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+#, fuzzy
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"pou¾itie: urpmi.update [-a] <meno> ...\n"
+"kde <meno> je meno média pre odstránenie.\n"
+"   -a   vyberie v¹etky média.\n"
+"\n"
+"neznáme voµby '%s'\n"
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nemô¾em preèíta» rpm súbor \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+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"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -982,44 +1061,12 @@ msgid ""
 "usage:\n"
 msgstr "Toto je free softvér a musí by» redistribuovaný pod licenciou GNU GPL."
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"niektoré balíèky by mali by» odstránene pri aktualizácii, zatiaµ to nieje "
-"podorované\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: neznáma voµba \"-%s\", pou¾ítie zistíte s --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1063,18 +1110,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "pou¾itie: urpmi.update [-a] <meno> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "pou¾itie: urpmi.removemedia [-a] <meno> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "pou¾itie: urpmi.removemedia [-a] <meno> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "pou¾itie: urpmi.update [-a] <meno> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/sp.po b/po/sp.po
index 7a1a3a26..7f48da4d 100644
--- a/po/sp.po
+++ b/po/sp.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-09-19 07:53GMT+1\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: SERBIAN <office@mandrake.co.yu>\n"
@@ -28,27 +28,31 @@ msgstr ""
 "°ãâÞÜÐâáÚÐ ØÝáâÐÛÐæØjÐ ßÐÚÕâa...\n"
 "·ÐåâÕÒÐÛØ áâÕ ØÝáâÐÛÐæØjã ßÐÚÕâÐ $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "´Ð ÛØ øÕ ¾K ?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "¾K"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "¿ÞÝØèâØ"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "½ÝNn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "´ÔDdYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (´/Ý) "
 
@@ -56,16 +60,16 @@ msgstr " (´/Ý) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: ÚÞÜÐÝÔÐ ÝØjÕ ßàÞÝaòÕÝa\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf ÒÕà×ØjÐ %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
@@ -73,749 +77,909 @@ msgstr ""
 "¾ÒÞ øÕ ÑÕáßÛÐâÐÝ áÞäâÒÕà Ø ÜÞÖÕ ÑØâØ áÛÞÑÞÔÝÞ àÕÔØáâàØÑãØàÐÝ ßÞÔ ãáÛÞÒØÜÐ "
 "GNU Ø GPL."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "ãßÞâàÕÑa: urpmf [options] <ÔÐâÞâÕÚa>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - ÝÕ èâÐÜßÐ ØÜÐ âÐÓÐ(default ÞßæØøÐ ãÚÞÛØÚÞ ÝØøÕ ÔÐâ âÐÓ ã "
 "ÚÞÜÐÝÔØ"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    ÛØÝØøÐ, ÝÕÚÞÜßÐâØÑØÛÝÐ áÐ ØÝâÕàÐÚâØÒÝØÜ ÜÞÔÞÜ)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - èâÐÜßÐ ØÜÕ âÐÓÐ: rpm ØÜÕ ÔÐâÞâÕÚÕ (ßàÕâßÞáâÐÒùÕÝÞ "
 "ãÚÞÛØÚÞ ÝÕÜÐ âÐÓÐ"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    ÚÞÜÐÝÔÝÐ ÛØÝØøÐ ÐÛØ ÑÕ× ØÜÕÝÐ ßÐÚÕâÐ)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - èâÐÜßÐ âÐÓ ÓàãßÕ: ÓàãßÐ."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - èâÐÜßÐ âÐÓ ÒÕÛØçØÝÕ: ÒÕÛØçØÝÐ."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - èâÐÜßÐ áÕàØøáÚØ âÐÓ: áÕàØøáÚØ."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - èâÐÜßÐ âÐÓ áÐÖÕâÚÐ: áÐÖÕâÐÚ."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - èâÐÜßÐ âÐÓ ÞßØáÐ: ÞßØá."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr "  --provides      - èâÐÜßÐ âÐÓ ÞßæØøÐ: áÒÕ ÞßæØøÕ (ÜãÛâØ ÛØÝØøÕ)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr "  --requires      - èâÐÜßÐ âÐÓ ×ÐåâÕÒÐ: áÒÕ ßÞâàÕÑÕ (ÜãÛâØ ÛØÝØøÕ)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files         - èâÐÜßÐ âÐÓ ÔÐâÞâÕÚÐ: áÒÕ ÔÐâÞâÕÚÕ (ÜãÛâØ ÛØÝØøÕ)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr "  --conflicts     - èâÐÜßÐ âÐÓ ßàÞÑÛÕÜÐ: áÒØ ßàÞÑÛÕÜØ (ÜãÛâØ ÛØÝØøÕ)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "ßàÞÑÐøâÕ áÐ urpmf --help ×Ð ÒØèÕ ÞßæØøÐ"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "ÝÕ ÜÞÓã ÔÐ Ø×ÒàèØÜ ãßØá ã ÚÞÝäØÓãàÐæØÞÝã ÔÐâÞâÕÚã [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-#, fuzzy
-msgid "retrieving rpms files..."
-msgstr "ÒàÐüÐÜ [%s]"
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "ÝÕÜÞÓã ÔÐ ßàÞÝÐóÕÜ ÔÐâÞâÕÚã ÛØáâÕ ×Ð \"%s\", ÜÕÔØøãÜ øÕ ØÓÝÞàØáÐÝ"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "ÝÕÜÐ ÝØèâÐ ×Ð ãßØá ã ÔÐâÞâÕÚã ÛØáâÕ ×Ð \"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "ÝÕÜÞÓã ÔÐ ßàÞÝÐóÕÜ ÔÐâÞâÕÚã ÛØáâÕ ×Ð \"%s\", ÜÕÔØøãÜ øÕ ØÓÝÞàØáÐÝ"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ÝÕ ÜÞÓã ÔÐ ßÐàáØàÐÜ hdlist ÔÐâÞâÕÚã ×Ð \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ÝÕÜÐ èâÐ ÔÐ áÕ ãßØèÕ ã ÔÐâÞâÕÚã ÛØáâÕ ×Ð \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, fuzzy, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "ÒàÐüÐÜ [%s]"
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "ÝÕ ÜÞÓã ÔÐ ßàØáâãßØÜ ÔÐâÞâÕæØ ÛØáâÕ ×Ð \"%s\", mÕÔØø ØÓÝÞàØáÐÝ"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "ßÐÚÕâ %s ÝØøÕ ßàÞÝÐóÕÝ."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "ÔÕÜÞÝâØàÐÜ %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "ãÚÛÐúÐÜ %d obsolete håÕÔÕàÕ ã ÚÕè ÜÕÜÞàØøØ"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "ÝØøÕ ßàÞÝÐóÕÝÐ hdlist ÔÐâÞâÕÚÐ ×Ð ÜÕÔØø \"%s\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 "ÜÕÔØø \"%s\" ßÞÚãèÐÒÐ ÔÐ ÚÞàØáâØ hdlist ÚÞøØ áÕ ÒÕü ÚÞàØáâØ, ÜÕÔØø øÕ "
 "ØÓÝÞàØáÐÝ"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "çØâÐÜ hdlist ÔÐâÞâÕÚã [%s]"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "ÝÕ ÜÞÓã ÔÐ ÚÞàØáâØÜ \"%s\" ØÜÕ ×Ð ÑÕ×ØÜÕÝØ ÜÕÔØøãÜ ×ÐâÞ èâÞ áÕ ÒÕü ÚÞàØáâØ"
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "ÝÕ ÜÞÓã ÔÐ ãÚÛÞÝØÜ  ÜÕÔØj \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "çØâÐÜ hdlist ÔÐâÞâÕÚã [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "ÝÕ ÜÞÓã ÔÐ ã×ÜÕÜ ÜÕÔØø \"%s\" ã àÐçãÝØæã ßÞèâÞ ÝÕ ßÞáâÞøØ ÔÐâÞâÕÚÐ ÛØáâÕ [%"
 "s] "
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "áÐçãÒÐø áÐÜÞ ÔÐâÞâÕÚÕ Þ×ÝÐçÕÝÕ ÚÐÞ ÔÞáâãßÝÞ"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "ÝÕ ÜÞÓã ÔÐ ÚàÕØàÐÜ áØÝâÕ×Ýã ÔÐâÞâÕÚã ×Ð ÜÕÔØø \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "ßàÞÝÐóÕÝÞ %d åÕÔÕàÐ ã ÚÕè ÜÕÜÞàØøØ"
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "ßÞÚãçÐÒÐÜ ÔÐ áÕÛÕÚâãøÕÜ inexistant ÜÕÔØø \"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "Ø×ÑÕÓÐÒÐÜ áÕÛÕÚâÞÒÐúÕ %s ßÞèâÞ úÕÝ ÛÞÚÐÛÝØ øÕ×ØÚ ÝØøÕ Ø×ÐÑàÐÝ"
+msgid "unable to update medium \"%s\"\n"
+msgstr "ÝÕ ÜÞÓã ÔÐ aÖãàØàÐÜ ÜÕÔØj \"%s\"\n"
 
-#: po/placeholder.h:55
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"ãÚÛÐúÐÜ %s àÐÔØ ÐÖãàØàÐúÐ ...\n"
-" ÝÐ %s ßÞèâÞ ÔàãÓÐçØøÕ ÝÕ ÑØ ãáßÕÛÞ ÐÖãàØàÐúÕ"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+#, fuzzy
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "ÜÕÔØø \"%s\" ÒÕü ßÞáâÞøØ"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ÝÕ ÜÞÓã ÔÐ ãßØèÕÜ ÔÐâÞâÕÚã ÛØáâÕ ×Ð \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "ãßØáãøÕÜ ã ÚÞÝäØÓãàÐæØÞÝã ÔÐâÞâÕÚã [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "½ÕÜÐ ßÐÚÕâÐ áÐ ØÜÕÝÞÜ %s"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "¿àØáØÛÝÐ ØÝáâÐÛÐæØøÐ (--force)? (Ôa/½e) ?"
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ÝÕ ÜÞÓã ÔÐ ßàÞÝÐóÕÜ hdlist ÔÐâÞâÕÚã ×Ð \"%s\", ÜÕÔØøãÜ øÕ ØÓÝÞàØáÐÝ"
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "ÚàÕØàÐÜ hdlist áØÜâÕ×Ýã ÔÐâÞâÕÚã ×Ð ÜÕÔØø \"%s\""
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "ÝÕ ÜÞÓã ÔÐ ßàÞÝÐóÕÜ áÒÕ áØÝâÕ×ÝÕ ÔÐâÞâÕÚÕ, ÚÞàØáâØÜ parsehdlist áÕàÒÕà"
+msgid " (y/N) "
+msgstr " (´/Ý) "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ÝÕ ÜÞÓã ÔÐ ßàÞÝÐóÕÜ hdlist ÔÐâÞâÕÚã ×Ð \"%s\", ÜÕÔØøãÜ øÕ ØÓÝÞàØáÐÝ"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"ÝÕÚØ ßÐÚÕâØ ÜÞàÐjã ÑØâØ ãÚÛÞúÕÝØ ÔÐ ÑØ ÑØÛØ aÖãàØàÐÝØ, èâÞ jÞè ÝØjÕßÞÔàÖÐÝÞ\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "ÜÞÝâØàÐÜ %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"ÝÕ ÜÞÓã ÔÐ ÚÞàØáâØÜ ÜÕÔØø \"%s\" ßÞèâÞ áÕ ÔÐâÞâÕÚÐ ÛØáâÕ ÚÞâàØáâØ ÞÔ áâàÐÝÕ "
-"ÔàãÓÞÓ ÜÕÔØøÐ"
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "çØâÐÜ depslist ÔÐâÞâÕÚã [%s]"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+#, fuzzy
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --group         - èâÐÜßÐ âÐÓ ÓàãßÕ: ÓàãßÐ."
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ÝÕ ÜÞÓã ÔÐ ÚàÕØàÐÜ ÜÕÔØj \"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ÝÕÜÐ ÝØçÕÓÐ ×a ÑàØáaúe (ÚÞàØáâØ urpmi.addmedia ×Ð ÔÞÔÐÒaúÕ ÜÕÔØja)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "ßÞÓàÕèÐÝ ãÝÞá: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "ßÞáâÞøØ ÒØèÕ ßÐÚÕâÐ áÐ ØáâØÜ ØÜÕÝÞÜ rpm ÔÐâÞâÕÚÕ \"%s\""
+msgid "One of the following packages is needed to install %s:"
+msgstr "¨ÕÔÐÝ ÞÔ áÛÕÔÕûØå ßÐÚÕâÐ øÕ ßÞâàÕÑÐÝ ÔÐ ÑØ ØÝáâÐÛØàÐÛØ %s:"
 
-#: po/placeholder.h:74
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "¿àØâØáÝØâÕ enter ÚÐÔÐ ×ÐÒàèØâe..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 "ÜÕÔØø \"%s\" ßÞÚãèÐÒÐ ÔÐ ÚÞàØáâØ ÛØáâã ÚÞøÐ øÕ ã ãßÞâàÕÑØ, ÜÕÔØø øÕ ØÓÝÞàØáÐÝ"
 
-#: po/placeholder.h:76
+#: po/placeholder.h:74 po/placeholder.h:448
 #, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "ÒàÐüÐÜ [%s]"
+msgid "  -h             - print this help message.\n"
+msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ÝÕ ÜÞÓã ÔÐ ßàØáâãßØÜ hdlist ÔÐâÞâÕæØ ×Ð \"%s\", ÜÕÔØø øÕ ØÓÝÞàØáÐÝ"
+#: po/placeholder.h:75 po/placeholder.h:450
+#, fuzzy
+msgid "  -g             - print groups too with name.\n"
+msgstr "  --group         - èâÐÜßÐ âÐÓ ÓàãßÕ: ÓàãßÐ."
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "ÝÕ ÜÞÓã ÔÐ àÕÓØáâàãøÕÜ rpm ÔÐâÞâÕÚã"
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ÝÕ ÜÞÓã ÔÐ ØáâàÐÖØÜ ÔÐâÞâÕÚã ÛØáâÕ ×Ð \"%s\", ÜÕÔØø øÕ ØÓÝÞàØáÐÝ"
+#: po/placeholder.h:78 po/placeholder.h:407
+#, fuzzy
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  --group         - èâÐÜßÐ âÐÓ ÓàãßÕ: ÓàãßÐ."
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
+#: po/placeholder.h:79 po/placeholder.h:454
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr "                    ÚÞÜÐÝÔÝÐ ÛØÝØøÐ ÐÛØ ÑÕ× ØÜÕÝÐ ßÐÚÕâÐ)."
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "ÝÕÚÞåÕàÕÝâÝÐ ÔÐâÞâÕÚÐ ÛØáâÕ ×Ð \"%s\", ÜÕÔØø øÕ ØÓÝÞàØáÐÝ"
-
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "ÚÞßØàÐúÕ [%s] ÝÕãáßÕÛÞ"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "ÝÕ ÜÞÓã ÔÐ ØáßàÐÒÝÞ ßÐàáØàÐÜ [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ÝÕÜÐ ÝØçÕÓÐ ×a aÖãàØàaúe (ÚÞàØáâØ urpmi.addmedia ×Ð ÔÞÔÐÒaúÕ ÜÕÔØja)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "çØâÐÜ depslist ÔÐâÞâÕÚã [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "ÝÕ ÜÞÓã ÔÐ ßÐàáØàÐÜ hdlist ÔÐâÞâÕÚã ×Ð \"%s\""
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-#, fuzzy
-msgid "...copying done"
-msgstr "ÒàÐüÐÜ [%s]"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "ÝÕ ÜÞÓã ÔÐ ÚàÕØàÐÜ ÜÕÔØj \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "çØâÐÜ hdlist ÔÐâÞâÕÚã [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "áØÝâÐÚáÝÐ ÓàÕèÚÐ ã ÚÞÝäØÓãàÐæØÞÝÞø ÔÐâÞâÕæØ ã ÛØÝØøØ %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ÝÕßÞ×ÝÐâÐ ÞßæØjÐ \"-%s\", ßàÞÒÕàØâÕ ãßÞâàÕÑã áÐ --help\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "ãßÞâàÕÑa: urpmi.removemedia [-a] <ØÜe> ..."
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "ÚàÕØàÐÜ hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ÝÕ ÜÞÓã ÔÐ ßàÞçØâÐÜ rpm ÔÐâÞâÕÚã [%s] áÐ ÜÕÔØøÐ \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "ÓàÕèÚÐ ßàØ àÕÓØáâàÞÒÐúã ÛÞÚÐÛÝØå ßÐÚÕâÐ"
-
-#: po/placeholder.h:99
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ÝÕ ÜÞÓã ÔÐ ßàÞçØâÐÜ rpm ÔÐâÞâÕÚã [%s] áÐ ÜÕÔØøÐ \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "ÒàÐüÐÜ [%s]"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 "ÝÕÚÞåÕàÕÝâÐÝ ÜÕÔØø \"%s\" øÕ Þ×ÝÐçÕÝ ÚÐÞ ßàÕÝÞáÝØ ÐÛØ âÞ ÝØøÕ ã áâÒÐàÝÞáâØ"
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "ÝÕÜÐ èâÐ ÔÐ áÕ ãßØèÕ ã ÔÐâÞâÕÚã ÛØáâÕ ×Ð \"%s\""
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "ÝÕ ÜÞÓã ÔÐ ÚàÕØàÐÜ hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "ÜÕÔØø \"%s\" ÝØøÕ Ø×ÐÑàÐÝ"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ßÞÓàÕèÝÞ ØÜÕ rpm ÔÐâÞâÕÚÕ [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "ÝÕßÞ×ÝÐâØ ßÞÔÐæØ ÔÞÔÕùÕÝØ ×Ð %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "ßÞÚãèÐÒÐÜ ÔÐ ßàÕÜÞáâØÜ ßÞáâÞøÕüØ ÜÕÔØø \"%s\", Ø×ÑÕÓÐÒÐÜ"
+msgid "What is your choice? (1-%d) "
+msgstr "èâÐ øÕ ÒÐè Ø×ÑÞà ? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ÝÕ ÜÞÓã ÔÐ ßàØáâãßØÜ ÔÐâÞâÕæØ ÛØáâÕ ×Ð \"%s\", mÕÔØø ØÓÝÞàØáÐÝ"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "Ø×ÑÕÓÐÒÐÜ áÕÛÕÚâÞÒÐúÕ  %s ßÞèâÞ ÝÕüÕ ÑØâØ ÐÖãàØàÐÝÞ ÔÞÒÞùÝÞ ÔÐâÞâÕÚÐ"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ÝÕ ÜÞÓã ÔÐ ßàØáâãßØÜ rpm ÔÐâÞâÕæØ [%s]"
 
-#: po/placeholder.h:111
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"ãÚÛÐúÐÜ %s àÐÔØ ÐèãàØàÐúÐ ...\n"
-" ÝÐ %s ×ÑÞÓ âÞÓÐ èâÞ ÝÕ ÜÞÖÕ ÔØàÕÚâÝÞ Ø ØáßàÐÒÝÞ ÔÐ áÕ ÐÖãàØàÐ!"
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "ßàÕÜÕèâÕÝØ %s ãÝÞáØ ã depslist"
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "»Þè Ø×ÑÞà, ßàÞÑÐøâÕ ßÞÝÞÒÞ\n"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "ÝÕ ÜÞÓã ÔÐ ßàØáâãßØÜ ÜÕÔØjã \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr "ÝÕ ÜÞÓã ÔÐ ØáßàÐÒÝÞ ßÐàáØàÐÜ [%s] ÝÐ ÒàÕÔÝÞáâ \"%s\""
+msgid "relocated %s entries in depslist"
+msgstr "ßàÕÜÕèâÕÝØ %s ãÝÞáØ ã depslist"
 
-#: po/placeholder.h:118
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "ßÞÚãçÐÒÐÜ ÔÐ áÕÛÕÚâãøÕÜ inexistant ÜÕÔØø \"%s\""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "ÁÛÕÔÕûØ ßÐÚÕâØ áÐÔàÖÕ %s: %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "ÝÕ ÜÞÓã ÔÐ ØáßàÐÒÝÞ ßÐàáØàÐÜ [%s] ÝÐ ÒàÕÔÝÞáâ \"%s\""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "ÝÕÜÐ rpm ÔÐâÞâÕÚÐ ÝÐ [%s]"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "çØâÐÜ hdlist ÔÐâÞâÕÚã [%s]"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ÝÕ ÜÞÓã ÔÐ ÞÔàÕÔØÜ ÜÕÔØø ×Ð ÞÒã hdlist ÔÐâÞâÕÚã [%s]"
+
+#: po/placeholder.h:119 po/placeholder.h:328
 #, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "ßàÕÜÕèâÕÝØ %s ãÝÞáØ ã depslist"
+msgid "  --help         - print this help message.\n"
+msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "áÒÕ øÕ ÒÕû ØÝáâÐÛØàÐÝÞ"
 
-#: po/placeholder.h:123 urpm.pm:1897
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
 #, fuzzy
-msgid "...retrieving done"
+msgid "retrieving rpms files..."
 msgstr "ÒàÐüÐÜ [%s]"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "áÕÛÕÚâãøÕÜ %s ÚÞàØáâÕüØ obsoletes"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "¿ÞâàÕÑÝØ áã áÛÕÔÕûØ ßÐÚÕâ(Ø):"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ÝÕ ÜÞÓã ÔÐ ßàÞçØâÐÜ rpm ÔÐâÞâÕÚã \"%s\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "¸ÝáâÐÛÐæØÙÐ ÝÕãáßÕÛÐ"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr "ÝÕ ÜÞÓã ÔÐ ßàØáâãßØÜ ÔÐâÞâÕæØ ÛØáâÕ ×Ð \"%s\", mÕÔØø ØÓÝÞàØáÐÝ"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  --group         - èâÐÜßÐ âÐÓ ÓàãßÕ: ÓàãßÐ."
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "áÕÛÕÚâãøÕÜ %s áÕÛÕÚâÞÒÐúÕÜ ÔÐâÞâÕÚÐ"
+msgid "unmounting %s"
+msgstr "ÔÕÜÞÝâØàÐÜ %s"
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "ãÚÛÐúÐÜ %d obsolete håÕÔÕàÕ ã ÚÕè ÜÕÜÞàØøØ"
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ÝØøÕ ßàÞÝÐóÕÝÐ hdlist ÔÐâÞâÕÚÐ ×Ð ÜÕÔØø \"%s\""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "ÝÕÜÐ èâÐ ÔÐ áÕ ãßØèÕ ã ÔÐâÞâÕÚã ÛØáâÕ ×Ð \"%s\""
+msgid "removing medium \"%s\""
+msgstr "ÝÕ ÜÞÓã ÔÐ ãÚÛÞÝØÜ  ÜÕÔØj \"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "ÝÕ ÜÞÓã ÔÐ ÚàÕØàÐÜ áØÝâÕ×Ýã ÔÐâÞâÕÚã ×Ð ÜÕÔØø \"%s\""
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "ßÞÚãçÐÒÐÜ ÔÐ áÕÛÕÚâãøÕÜ inexistant ÜÕÔØø \"%s\""
+
+#: po/placeholder.h:144 po/placeholder.h:447
+#, fuzzy
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
+
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ÝÕ ÜÞÓã ÔÐ ÞÔàÕÔØÜ ÜÕÔØø ×Ð ÞÒã hdlist ÔÐâÞâÕÚã [%s]"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "Ø×ÑÕÓÐÒÐÜ áÕÛÕÚâÞÒÐúÕ %s ßÞèâÞ úÕÝ ÛÞÚÐÛÝØ øÕ×ØÚ ÝØøÕ Ø×ÐÑàÐÝ"
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "ãßØáãøÕÜ ã ÚÞÝäØÓãàÐæØÞÝã ÔÐâÞâÕÚã [%s]"
 
-#: po/placeholder.h:132
+#: po/placeholder.h:150 po/placeholder.h:249
 #, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "ÝÕ ÜÞÓã ÔÐ ßàÞÝÐóÕÜ áÒÕ áØÝâÕ×ÝÕ ÔÐâÞâÕÚÕ, ÚÞàØáâØÜ parsehdlist áÕàÒÕà"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "áÒÕ øÕ ÒÕû ØÝáâÐÛØàÐÝÞ"
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"ÝÕ ÜÞÓã ÔÐ ÚÞàØáâØÜ ÜÕÔØø \"%s\" ßÞèâÞ áÕ ÔÐâÞâÕÚÐ ÛØáâÕ ÚÞâàØáâØ ÞÔ áâàÐÝÕ "
+"ÔàãÓÞÓ ÜÕÔØøÐ"
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "çØâÐÜ depslist ÔÐâÞâÕÚã [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ÝÕ ÜÞÓã ÔÐ ÚàÕØàÐÜ ÜÕÔØj \"%s\"\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "ßÞáâÞøØ ÒØèÕ ßÐÚÕâÐ áÐ ØáâØÜ ØÜÕÝÞÜ rpm ÔÐâÞâÕÚÕ \"%s\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "ÀÐÔØ ×ÐÔÞÒÞùÕúÐ ×ÐÒØáÝÞáâØ, áÛÕÔÕûØ ßÐÚÕâØ ûÕ ÑØâØ ØÝáâÐÛØàÐÝØ (%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "ÒàÐüÐÜ [%s]"
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi: ÝÕßÞ×ÝÐâÐ ÞßæØjÐ \"-%s\", ßàÞÒÕàØâÕ ãßÞâàÕÑã áÐ --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ÝÕ ÜÞÓã ÔÐ ßàØáâãßØÜ hdlist ÔÐâÞâÕæØ ×Ð \"%s\", ÜÕÔØø øÕ ØÓÝÞàØáÐÝ"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "¿ÞâàÕÑÝØ áã áÛÕÔÕûØ ßÐÚÕâ(Ø):"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "ÝÕ ÜÞÓã ÔÐ àÕÓØáâàãøÕÜ rpm ÔÐâÞâÕÚã"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ÝÕ ÜÞÓã ÔÐ ØáâàÐÖØÜ ÔÐâÞâÕÚã ÛØáâÕ ×Ð \"%s\", ÜÕÔØø øÕ ØÓÝÞàØáÐÝ"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "ÝÕÚÞåÕàÕÝâÝÐ ÔÐâÞâÕÚÐ ÛØáâÕ ×Ð \"%s\", ÜÕÔØø øÕ ØÓÝÞàØáÐÝ"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "¸ÝáâÐÛÐæØÙÐ ÝÕãáßÕÛÐ"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "ÚÞßØàÐúÕ [%s] ÝÕãáßÕÛÞ"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+#, fuzzy
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "                    ÚÞÜÐÝÔÝÐ ÛØÝØøÐ ÐÛØ ÑÕ× ØÜÕÝÐ ßÐÚÕâÐ)."
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "ÝÕ ÜÞÓã ÔÐ ßÐàáØàÐÜ hdlist ÔÐâÞâÕÚã ×Ð \"%s\""
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+#, fuzzy
+msgid "...copying done"
+msgstr "ÒàÐüÐÜ [%s]"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "ÀÐÔØ ×ÐÔÞÒÞùÕúÐ ×ÐÒØáÝÞáâØ, áÛÕÔÕûØ ßÐÚÕâØ ûÕ ÑØâØ ØÝáâÐÛØàÐÝØ (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
+#: po/placeholder.h:180 po/placeholder.h:277
 #, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  --group         - èâÐÜßÐ âÐÓ ÓàãßÕ: ÓàãßÐ."
+msgid "copying hdlists file..."
+msgstr "çØâÐÜ hdlist ÔÐâÞâÕÚã [%s]"
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "áØÝâÐÚáÝÐ ÓàÕèÚÐ ã ÚÞÝäØÓãàÐæØÞÝÞø ÔÐâÞâÕæØ ã ÛØÝØøØ %s"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "¸ÝáâÐÛØÐæØøÐ ÑÕ× ßàÞÒÕàÕ ×ÐÒØáÝÞáâØ (Ôa/½e)? "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "ÓàÕèÚÐ ßàØ àÕÓØáâàÞÒÐúã ÛÞÚÐÛÝØå ßÐÚÕâÐ"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "ÝÕÜÐ èâÐ ÔÐ áÕ ãßØèÕ ã ÔÐâÞâÕÚã ÛØáâÕ ×Ð \"%s\""
+
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
+msgstr "ÝÕ ÜÞÓã ÔÐ ÚàÕØàÐÜ hdlist: %s"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "ÜÕÔØø \"%s\" ÝØøÕ Ø×ÐÑàÐÝ"
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "ßÞÚãèÐÒÐÜ ÔÐ ßàÕÜÞáâØÜ ßÞáâÞøÕüØ ÜÕÔØø \"%s\", Ø×ÑÕÓÐÒÐÜ"
 
-#: po/placeholder.h:159
+#: po/placeholder.h:191 po/placeholder.h:355
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "èâÐ øÕ ÒÐè Ø×ÑÞà ? (1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "¸ÝáâÐÛØàÐÜ %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "ÃÑÐæØâÕ ÜÕÔØj áÐ ØÜÕÝÞÜ %s ã ãàÕòÐø %s"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "ÁÛÕÔÕûØ ßÐÚÕâØ áÐÔàÖÕ %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
 #, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"¾ÒÞ øÕ ÑÕáßÛÐâÐÝ áÞäâÒÕà Ø ÜÞÖÕ ÑØâØ áÛÞÑÞÔÝÞ àÕÔØáâàØÑãØàÐÝ ßÞÔ ãáÛÞÒØÜÐ "
-"GNU Ø GPL."
+msgid "examining hdlist file [%s]"
+msgstr "çØâÐÜ hdlist ÔÐâÞâÕÚã [%s]"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "¿àØáØÛÝÐ ØÝáâÐÛÐæØøÐ (--force)? (Ôa/½e) ?"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "ßàÕÜÕèâÕÝØ %s ãÝÞáØ ã depslist"
 
-#: po/placeholder.h:171 po/placeholder.h:269
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "»Þè Ø×ÑÞà, ßàÞÑÐøâÕ ßÞÝÞÒÞ\n"
+#: po/placeholder.h:205 po/placeholder.h:445
+#, fuzzy
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  --group         - èâÐÜßÐ âÐÓ ÓàãßÕ: ÓàãßÐ."
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "Ø×ÒÞà ßÐÚÕâÐ ÝØjÕ ÔÞáâãßÐÝ,Ø×ÛÐ×ØÜ..."
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+#, fuzzy
+msgid "...retrieving done"
+msgstr "ÒàÐüÐÜ [%s]"
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "installing %s\n"
-msgstr "¸ÝáâÐÛØàÐÜ %s\n"
+msgid "selecting %s using obsoletes"
+msgstr "áÕÛÕÚâãøÕÜ %s ÚÞàØáâÕüØ obsoletes"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "ÃÑÐæØâÕ ÜÕÔØj áÐ ØÜÕÝÞÜ %s ã ãàÕòÐø %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "Ø×ÒÞà ßÐÚÕâÐ ÝØjÕ ÔÞáâãßÐÝ,Ø×ÛÐ×ØÜ..."
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "áÕÛÕÚâãøÕÜ %s áÕÛÕÚâÞÒÐúÕÜ ÔÐâÞâÕÚÐ"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "¿àØâØáÝØâÕ enter ÚÐÔÐ ×ÐÒàèØâe..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "ÝÕÜÐ èâÐ ÔÐ áÕ ãßØèÕ ã ÔÐâÞâÕÚã ÛØáâÕ ×Ð \"%s\""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "ÁÐÜÞ áãßÕàÚÞàØáÝØÚ ÜÞÖÕ ØÝáâÐÛØàÐâØ ÛÞÚÐÛÝÕ ßÐÚÕâe"
 
-#: po/placeholder.h:182 urpmi:216
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "¨ÕÔÐÝ ÞÔ áÛÕÔÕûØå ßÐÚÕâÐ øÕ ßÞâàÕÑÐÝ ÔÐ ÑØ ØÝáâÐÛØàÐÛØ %s:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"ãÚÛÐúÐÜ %s àÐÔØ ÐÖãàØàÐúÐ ...\n"
+" ÝÐ %s ßÞèâÞ ÔàãÓÐçØøÕ ÝÕ ÑØ ãáßÕÛÞ ÐÖãàØàÐúÕ"
+
+#: po/placeholder.h:296
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"ãÚÛÐúÐÜ %s àÐÔØ ÐèãàØàÐúÐ ...\n"
+" ÝÐ %s ×ÑÞÓ âÞÓÐ èâÞ ÝÕ ÜÞÖÕ ÔØàÕÚâÝÞ Ø ØáßàÐÒÝÞ ÔÐ áÕ ÐÖãàØàÐ!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"¾ÒÞ øÕ ÑÕáßÛÐâÐÝ áÞäâÒÕà Ø ÜÞÖÕ ÑØâØ áÛÞÑÞÔÝÞ àÕÔØáâàØÑãØàÐÝ ßÞÔ ãáÛÞÒØÜÐ "
+"GNU Ø GPL."
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -824,7 +988,7 @@ msgstr ""
 "%s\n"
 "ÝÕÔÞáâÐjÕ <àÕÛÐâØÒÝÐ ßãâaúÐ hdlist>\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -846,17 +1010,7 @@ msgstr ""
 "       http://<host>/<ßãâaúa> with <àÕÛÐâØÒÝÞ ØÜÕ ÔÐâÞâÕÚÕ áa hdlist>\n"
 "       removable_<ãàÕòÐø>://<ßãâaúa>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ÝÕ ÜÞÓã ÔÐ ÚàÕØàÐÜ ÜÕÔØj \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ÝÕ ÜÞÓã ÔÐ aÖãàØàÐÜ ÜÕÔØj \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -864,12 +1018,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -878,17 +1027,7 @@ msgstr ""
 "%s\n"
 "ÝÕÔÞáâÐjÕ <àÕÛÐâØÒÝÐ ßãâaúÐ hdlist>\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --group         - èâÐÜßÐ âÐÓ ÓàãßÕ: ÓàãßÐ."
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  --group         - èâÐÜßÐ âÐÓ ÓàãßÕ: ÓàãßÐ."
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -897,57 +1036,7 @@ msgstr ""
 "%s\n"
 "`with' ÝÕÔÞáâÐje ×Ð ftp ÜÕÔØj\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"ãßÞâàÕÑa: urpmi.removemedia [-a] <ØÜe> ...\n"
-"ÓÔÕ je <ØÜe> áàÕÔúÕ ØÜÕ ×Ð ãÚÛaúaúe.\n"
-"   -a    áÕÛÕÚâãjÕ áÒÕ ÜÕÔØje.\n"
-"\n"
-"ÝÕßÞ×ÝÐâÕ ÞßæØje '%s'\n"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"ÝÕÔÞáâÐjÕ ãÝÞá ×Ð aÖãàØàaúÕ\n"
-"(jÕÔÐÝ ÞÔ %s)\n"
-
-#: po/placeholder.h:234
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  --group         - èâÐÜßÐ âÐÓ ÓàãßÕ: ÓàãßÐ."
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ÝÕÜÐ ÝØçÕÓÐ ×a aÖãàØàaúe (ÚÞàØáâØ urpmi.addmedia ×Ð ÔÞÔÐÒaúÕ ÜÕÔØja)\n"
-
-#: po/placeholder.h:236
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ÝÕÜÐ ÝØçÕÓÐ ×a ÑàØáaúe (ÚÞàØáâØ urpmi.addmedia ×Ð ÔÞÔÐÒaúÕ ÜÕÔØja)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -956,12 +1045,7 @@ msgstr ""
 "ÝÕÔÞáâÐjÕ ãÝÞá ×Ð ÑàØáaúe\n"
 "(jÕÔÐÝ ÞÔ %s)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -973,35 +1057,28 @@ msgstr ""
 "\n"
 "ÝÕßÞ×ÝÐâÕ ÞßæØje '%s'\n"
 
-#: po/placeholder.h:252
-#, fuzzy
-msgid "  -h             - print this help message.\n"
-msgstr "  --all           - èâÐÜßÐ áÒÕ âÐÓÞÒÕ."
-
-#: po/placeholder.h:254
+#: po/placeholder.h:429
 #, fuzzy
-msgid "  -g             - print groups too with name.\n"
-msgstr "  --group         - èâÐÜßÐ âÐÓ ÓàãßÕ: ÓàãßÐ."
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ÝÕ ÜÞÓã ÔÐ ßàÞçØâÐÜ rpm ÔÐâÞâÕÚã \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"ãßÞâàÕÑa: urpmi.removemedia [-a] <ØÜe> ...\n"
+"ÓÔÕ je <ØÜe> áàÕÔúÕ ØÜÕ ×Ð ãÚÛaúaúe.\n"
+"   -a    áÕÛÕÚâãjÕ áÒÕ ÜÕÔØje.\n"
+"\n"
+"ÝÕßÞ×ÝÐâÕ ÞßæØje '%s'\n"
 
-#: po/placeholder.h:258
-#, fuzzy
-msgid "  -r             - print version and release too with name.\n"
-msgstr "                    ÚÞÜÐÝÔÝÐ ÛØÝØøÐ ÐÛØ ÑÕ× ØÜÕÝÐ ßÐÚÕâÐ)."
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"ÝÕÔÞáâÐjÕ ãÝÞá ×Ð aÖãàØàaúÕ\n"
+"(jÕÔÐÝ ÞÔ %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1013,44 +1090,12 @@ msgstr ""
 "¾ÒÞ øÕ ÑÕáßÛÐâÐÝ áÞäâÒÕà Ø ÜÞÖÕ ÑØâØ áÛÞÑÞÔÝÞ àÕÔØáâàØÑãØàÐÝ ßÞÔ ãáÛÞÒØÜÐ "
 "GNU Ø GPL."
 
-#: po/placeholder.h:266
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                    ÚÞÜÐÝÔÝÐ ÛØÝØøÐ ÐÛØ ÑÕ× ØÜÕÝÐ ßÐÚÕâÐ)."
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"ÝÕÚØ ßÐÚÕâØ ÜÞàÐjã ÑØâØ ãÚÛÞúÕÝØ ÔÐ ÑØ ÑØÛØ aÖãàØàÐÝØ, èâÞ jÞè ÝØjÕßÞÔàÖÐÝÞ\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ÝÕßÞ×ÝÐâÐ ÞßæØjÐ \"-%s\", ßàÞÒÕàØâÕ ãßÞâàÕÑã áÐ --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1094,18 +1139,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "ãßÞâàÕÑa: urpmi.update [-a] <ØÜe> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "ãßÞâàÕÑa: urpmi.removemedia [-a] <ØÜe> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "ãßÞâàÕÑa: urpmi.removemedia [-a] <ØÜe> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "ãßÞâàÕÑa: urpmi.update [-a] <ØÜe> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/sr.po b/po/sr.po
index 50dd14fe..48980ea2 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-09-19 07:53GMT+1\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: SERBIAN <office@mandrake.co.yu>\n"
@@ -28,27 +28,31 @@ msgstr ""
 "Automatska instalacija paketa...\n"
 "Zahtevali ste instalaciju paketa $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Da li je OK ?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "OK"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Poni¹ti"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "NnNn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "DdDdYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (D/n) "
 
@@ -56,16 +60,16 @@ msgstr " (D/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: komanda nije pronaðena\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf verzija %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
@@ -73,634 +77,724 @@ msgstr ""
 "Ovo je besplatan softver i mo¾e biti slobodno redistribuiran pod uslovima "
 "GNU i GPL."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "upotreba: urpmf [options] <datoteka>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - ne ¹tampa ima taga(default opcija ukoliko nije dat tag u "
 "komandi"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    linija, nekompatibilna sa interaktivnim modom)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - ¹tampa sve tagove."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - ¹tampa ime taga: rpm ime datoteke (pretpostavljeno "
 "ukoliko nema taga"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    komandna linija ali bez imena paketa)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - ¹tampa tag grupe: grupa."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - ¹tampa tag velièine: velièina."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - ¹tampa serijski tag: serijski."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - ¹tampa tag sa¾etka: sa¾etak."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - ¹tampa tag opisa: opis."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr "  --provides      - ¹tampa tag opcija: sve opcije (multi linije)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr "  --requires      - ¹tampa tag zahteva: sve potrebe (multi linije)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files         - ¹tampa tag datoteka: sve datoteke (multi linije)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr "  --conflicts     - ¹tampa tag problema: svi problemi (multi linije)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "probajte sa urpmf --help za vi¹e opcija"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "ne mogu da izvr¹im upis u konfiguracionu datoteku [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-#, fuzzy
-msgid "retrieving rpms files..."
-msgstr "vraKjam [%s]"
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  --all           - ¹tampa sve tagove."
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "nemogu da pronagjem datoteku liste za \"%s\", medijum je ignorisan"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "nema ni¹ta za upis u datoteku liste za \"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "nemogu da pronagjem datoteku liste za \"%s\", medijum je ignorisan"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ne mogu da parsiram hdlist datoteku za \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "nema ¹ta da se upi¹e u datoteku liste za \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, fuzzy, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "vraKjam [%s]"
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "ne mogu da pristupim datoteci liste za \"%s\", medij ignorisan"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "paket %s nije pronagjen."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "demontiram %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "uklanjam %d obsolete hhedere u ke¹ memoriji"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nije pronagjena hdlist datoteka za medij \"%s\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 "medij \"%s\" poku¹ava da koristi hdlist koji se veKj koristi, medij je "
 "ignorisan"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "èitam hdlist datoteku [%s]"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "ne mogu da koristim \"%s\" ime za bezimeni medijum zato ¹to se veKj koristi"
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "ne mogu da uklonim  medij \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "èitam hdlist datoteku [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "ne mogu da uzmem medij \"%s\" u raèunicu po¹to ne postoji datoteka liste [%"
 "s] "
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "saèuvaj samo datoteke oznaèene kao dostupno"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "ne mogu da kreiram sinteznu datoteku za medij \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "pronagjeno %d hedera u ke¹ memoriji"
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "pokuèavam da selektujem inexistant medij \"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "izbegavam selektovanje %s po¹to njen lokalni jezik nije izabran"
+msgid "unable to update medium \"%s\"\n"
+msgstr "ne mogu da a¾uriram medij \"%s\"\n"
 
-#: po/placeholder.h:55
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"uklanjam %s radi a¾uriranja ...\n"
-" na %s po¹to drugaèije ne bi uspelo a¾uriranje"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+#, fuzzy
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  --all           - ¹tampa sve tagove."
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medij \"%s\" veKj postoji"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ne mogu da upi¹em datoteku liste za \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "upisujem u konfiguracionu datoteku [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "Nema paketa sa imenom %s"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ne mogu da pronagjem hdlist datoteku za \"%s\", medijum je ignorisan"
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
 
-#: po/placeholder.h:64
-#, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
 msgstr ""
-"ne mogu da pronagjem sve sintezne datoteke, koristim parsehdlist server"
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ne mogu da pronagjem hdlist datoteku za \"%s\", medijum je ignorisan"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (D/n) "
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+"neki paketi moraju biti uklonjeni da bi bili a¾urirani, ¹to jo¹ "
+"nijepodr¾ano\n"
+
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "montiram %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, 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 datoteka liste kotristi od strane "
-"drugog medija"
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "èitam depslist datoteku [%s]"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+#, fuzzy
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --group         - ¹tampa tag grupe: grupa."
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne mogu da kreiram medij \"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+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"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "pogre¹an unos: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, 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 "One of the following packages is needed to install %s:"
+msgstr "Jedan od sledeæih paketa je potreban da bi instalirali %s:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Pritisnite enter kada zavr¹ite..."
 
-#: po/placeholder.h:74
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 "medij \"%s\" poku¹ava da koristi listu koja je u upotrebi, medij je ignorisan"
 
-#: po/placeholder.h:76
+#: po/placeholder.h:74 po/placeholder.h:448
 #, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "vraKjam [%s]"
+msgid "  -h             - print this help message.\n"
+msgstr "  --all           - ¹tampa sve tagove."
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ne mogu da pristupim hdlist datoteci za \"%s\", medij je ignorisan"
+#: po/placeholder.h:75 po/placeholder.h:450
+#, fuzzy
+msgid "  -g             - print groups too with name.\n"
+msgstr "  --group         - ¹tampa tag grupe: grupa."
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "ne mogu da registrujem rpm datoteku"
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  --all           - ¹tampa sve tagove."
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, 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"
+#: po/placeholder.h:78 po/placeholder.h:407
+#, fuzzy
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  --group         - ¹tampa tag grupe: grupa."
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
+#: po/placeholder.h:79 po/placeholder.h:454
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr "                    komandna linija ali bez imena paketa)."
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "nekoherentna datoteka liste za \"%s\", medij je ignorisan"
-
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "kopiranje [%s] neuspelo"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "ne mogu da ispravno parsiram [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+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"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "èitam depslist datoteku [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "ne mogu da parsiram hdlist datoteku za \"%s\""
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-#, fuzzy
-msgid "...copying done"
-msgstr "vraKjam [%s]"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "ne mogu da kreiram medij \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "èitam hdlist datoteku [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "sintaksna gre¹ka u konfiguracionoj datoteci u liniji %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "upotreba: urpmi.removemedia [-a] <ime> ..."
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "kreiram hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne mogu da proèitam rpm datoteku [%s] sa medija \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "gre¹ka pri registrovanju lokalnih paketa"
-
-#: po/placeholder.h:99
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne mogu da proèitam rpm datoteku [%s] sa medija \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "vraKjam [%s]"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, 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"
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "nema ¹ta da se upi¹e u datoteku liste za \"%s\""
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "ne mogu da kreiram hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medij \"%s\" nije izabran"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "pogre¹no ime rpm datoteke [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "nepoznati podaci dodeljeni za %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "poku¹avam da premostim postojeKji medij \"%s\", izbegavam"
+msgid "What is your choice? (1-%d) "
+msgstr "¹ta je va¹ izbor ? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ne mogu da pristupim datoteci liste za \"%s\", medij ignorisan"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 "izbegavam selektovanje  %s po¹to neKje biti a¾urirano dovoljno datoteka"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu da pristupim rpm datoteci [%s]"
 
-#: po/placeholder.h:111
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"uklanjam %s radi a¹uriranja ...\n"
-" na %s zbog toga ¹to ne mo¾e direktno i ispravno da se a¾urira!"
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "preme¹teni %s unosi u depslist"
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Lo¹ izbor, probajte ponovo\n"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "ne mogu da pristupim mediju \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr "ne mogu da ispravno parsiram [%s] na vrednost \"%s\""
+msgid "relocated %s entries in depslist"
+msgstr "preme¹teni %s unosi u depslist"
+
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "pokuèavam da selektujem inexistant medij \"%s\""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Sledeæi paketi sadr¾e %s: %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "ne mogu da ispravno parsiram [%s] na vrednost \"%s\""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "nema rpm datoteka na [%s]"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "èitam hdlist datoteku [%s]"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ne mogu da odredim medij za ovu hdlist datoteku [%s]"
 
-#: po/placeholder.h:122 urpm.pm:1191
+#: po/placeholder.h:119 po/placeholder.h:328
 #, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "preme¹teni %s unosi u depslist"
+msgid "  --help         - print this help message.\n"
+msgstr "  --all           - ¹tampa sve tagove."
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "sve je veæ instalirano"
 
-#: po/placeholder.h:123 urpm.pm:1897
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
 #, fuzzy
-msgid "...retrieving done"
+msgid "retrieving rpms files..."
 msgstr "vraKjam [%s]"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "selektujem %s koristeKji obsoletes"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Potrebni su sledeæi paket(i):"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu da proèitam rpm datoteku \"%s\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "InstalaciÙa neuspela"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr "ne mogu da pristupim datoteci liste za \"%s\", medij ignorisan"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  --group         - ¹tampa tag grupe: grupa."
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "selektujem %s selektovanjem datoteka"
+msgid "unmounting %s"
+msgstr "demontiram %s"
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "uklanjam %d obsolete hhedere u ke¹ memoriji"
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nije pronagjena hdlist datoteka za medij \"%s\""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "nema ¹ta da se upi¹e u datoteku liste za \"%s\""
+msgid "removing medium \"%s\""
+msgstr "ne mogu da uklonim  medij \"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "ne mogu da kreiram sinteznu datoteku za medij \"%s\""
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "pokuèavam da selektujem inexistant medij \"%s\""
+
+#: po/placeholder.h:144 po/placeholder.h:447
+#, fuzzy
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --all           - ¹tampa sve tagove."
+
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ne mogu da odredim medij za ovu hdlist datoteku [%s]"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "izbegavam selektovanje %s po¹to njen lokalni jezik nije izabran"
 
-#: po/placeholder.h:132
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "upisujem u konfiguracionu datoteku [%s]"
+
+#: po/placeholder.h:150 po/placeholder.h:249
 #, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr "  --all           - ¹tampa sve tagove."
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr ""
+"ne mogu da pronagjem sve sintezne datoteke, koristim parsehdlist server"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "sve je veæ instalirano"
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, 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 datoteka liste kotristi od strane "
+"drugog medija"
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "èitam depslist datoteku [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ne mogu da kreiram medij \"%s\"\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "postoji vi¹e paketa sa istim imenom rpm datoteke \"%s\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Radi zadovoljenja zavisnosti, sledeæi paketi æe biti instalirani (%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "vraKjam [%s]"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  --all           - ¹tampa sve tagove."
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ne mogu da pristupim hdlist datoteci za \"%s\", medij je ignorisan"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Potrebni su sledeæi paket(i):"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "ne mogu da registrujem rpm datoteku"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, 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"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "nekoherentna datoteka liste za \"%s\", medij je ignorisan"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "InstalaciÙa neuspela"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "kopiranje [%s] neuspelo"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+#, fuzzy
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "                    komandna linija ali bez imena paketa)."
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "ne mogu da parsiram hdlist datoteku za \"%s\""
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr "  --all           - ¹tampa sve tagove."
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+#, fuzzy
+msgid "...copying done"
+msgstr "vraKjam [%s]"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -708,117 +802,190 @@ msgid ""
 msgstr ""
 "Radi zadovoljenja zavisnosti, sledeæi paketi æe biti instalirani (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
+#: po/placeholder.h:180 po/placeholder.h:277
 #, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  --group         - ¹tampa tag grupe: grupa."
+msgid "copying hdlists file..."
+msgstr "èitam hdlist datoteku [%s]"
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "sintaksna gre¹ka u konfiguracionoj datoteci u liniji %s"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "gre¹ka pri registrovanju lokalnih paketa"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "nema ¹ta da se upi¹e u datoteku liste za \"%s\""
+
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
+msgstr "ne mogu da kreiram hdlist: %s"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "medij \"%s\" nije izabran"
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "poku¹avam da premostim postojeKji medij \"%s\", izbegavam"
 
-#: po/placeholder.h:159
+#: po/placeholder.h:191 po/placeholder.h:355
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "  --all           - ¹tampa sve tagove."
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "¹ta je va¹ izbor ? (1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "Instaliram %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ubacite medij sa imenom %s u ureðaj %s"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Sledeæi paketi sadr¾e %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
 #, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"Ovo je besplatan softver i mo¾e biti slobodno redistribuiran pod uslovima "
-"GNU i GPL."
+msgid "examining hdlist file [%s]"
+msgstr "èitam hdlist datoteku [%s]"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "preme¹teni %s unosi u depslist"
 
-#: po/placeholder.h:171 po/placeholder.h:269
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Lo¹ izbor, probajte ponovo\n"
+#: po/placeholder.h:205 po/placeholder.h:445
+#, fuzzy
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  --group         - ¹tampa tag grupe: grupa."
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "izvor paketa nije dostupan,izlazim..."
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+#, fuzzy
+msgid "...retrieving done"
+msgstr "vraKjam [%s]"
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "installing %s\n"
-msgstr "Instaliram %s\n"
+msgid "selecting %s using obsoletes"
+msgstr "selektujem %s koristeKji obsoletes"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ubacite medij sa imenom %s u ureðaj %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "izvor paketa nije dostupan,izlazim..."
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "selektujem %s selektovanjem datoteka"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Pritisnite enter kada zavr¹ite..."
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "nema ¹ta da se upi¹e u datoteku liste za \"%s\""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "Samo superkorisnik mo¾e instalirati lokalne pakete"
 
-#: po/placeholder.h:182 urpmi:216
-#, 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:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"uklanjam %s radi a¾uriranja ...\n"
+" na %s po¹to drugaèije ne bi uspelo a¾uriranje"
+
+#: po/placeholder.h:296
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"uklanjam %s radi a¹uriranja ...\n"
+" na %s zbog toga ¹to ne mo¾e direktno i ispravno da se a¾urira!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"Ovo je besplatan softver i mo¾e biti slobodno redistribuiran pod uslovima "
+"GNU i GPL."
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -827,7 +994,7 @@ msgstr ""
 "%s\n"
 "nedostaje <relativna putanja hdlist>\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -849,17 +1016,7 @@ msgstr ""
 "       http://<host>/<putanja> with <relativno ime datoteke sa hdlist>\n"
 "       removable_<ureðaj>://<putanja>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ne mogu da kreiram medij \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ne mogu da a¾uriram medij \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -867,12 +1024,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  --all           - ¹tampa sve tagove."
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -881,17 +1033,7 @@ msgstr ""
 "%s\n"
 "nedostaje <relativna putanja hdlist>\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --group         - ¹tampa tag grupe: grupa."
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  --group         - ¹tampa tag grupe: grupa."
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -900,58 +1042,7 @@ msgstr ""
 "%s\n"
 "`with' nedostaje za ftp medij\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"upotreba: urpmi.removemedia [-a] <ime> ...\n"
-"gde je <ime> srednje ime za uklanjanje.\n"
-"   -a    selektuje sve medije.\n"
-"\n"
-"nepoznate opcije '%s'\n"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, 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"
-
-#: po/placeholder.h:234
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  --group         - ¹tampa tag grupe: grupa."
-
-#: po/placeholder.h:235 urpmi.update:57
-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"
-
-#: po/placeholder.h:236
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --all           - ¹tampa sve tagove."
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-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"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -960,12 +1051,7 @@ msgstr ""
 "nedostaje unos za brisanje\n"
 "(jedan od %s)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  --all           - ¹tampa sve tagove."
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -977,35 +1063,28 @@ msgstr ""
 "\n"
 "nepoznate opcije '%s'\n"
 
-#: po/placeholder.h:252
-#, fuzzy
-msgid "  -h             - print this help message.\n"
-msgstr "  --all           - ¹tampa sve tagove."
-
-#: po/placeholder.h:254
+#: po/placeholder.h:429
 #, fuzzy
-msgid "  -g             - print groups too with name.\n"
-msgstr "  --group         - ¹tampa tag grupe: grupa."
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne mogu da proèitam rpm datoteku \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"upotreba: urpmi.removemedia [-a] <ime> ...\n"
+"gde je <ime> srednje ime za uklanjanje.\n"
+"   -a    selektuje sve medije.\n"
+"\n"
+"nepoznate opcije '%s'\n"
 
-#: po/placeholder.h:258
-#, fuzzy
-msgid "  -r             - print version and release too with name.\n"
-msgstr "                    komandna linija ali bez imena paketa)."
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, 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"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1017,45 +1096,12 @@ msgstr ""
 "Ovo je besplatan softver i mo¾e biti slobodno redistribuiran pod uslovima "
 "GNU i GPL."
 
-#: po/placeholder.h:266
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                    komandna linija ali bez imena paketa)."
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"neki paketi moraju biti uklonjeni da bi bili a¾urirani, ¹to jo¹ "
-"nijepodr¾ano\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1099,18 +1145,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "upotreba: urpmi.update [-a] <ime> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "upotreba: urpmi.removemedia [-a] <ime> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "upotreba: urpmi.removemedia [-a] <ime> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "upotreba: urpmi.update [-a] <ime> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/sv.po b/po/sv.po
index c7f09942..68f42f0d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.2\n"
-"POT-Creation-Date: 2002-01-31 20:51+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2002-02-01 17:23GMT\n"
 "Last-Translator: Mattias Newzella <newzella@linux.nu>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -31,27 +31,31 @@ msgstr ""
 "Automatisk installation av paket...\n"
 "Du begärde installation av paketet $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Är det ok?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ok"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "JjYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (J/n) "
 
@@ -59,643 +63,731 @@ msgstr " (J/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: kommandot kunde inte hittas\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf version %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 "Det här är fri programvara och får distribueras enligt villkoren i GNU GPL."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "användning: urpmf [flaggor] <fil>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - visa inte taggen \"name\" (antas om ingen tagg angivits "
 "på"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    kommandoraden, fungerar ej i interaktivt läge)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - visa alla taggar."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - visa taggen \"name\": rpm-filnamnet (antas om ingen tagg "
 "angivits på"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    kommandoraden, men utan paketnamn)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - visa taggen \"group\": grupp."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - visa taggen \"size\": storlek."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - visa taggen \"serial\": serienummer."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - visa taggen \"summary\": sammanfattning."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - visa taggen \"description\": beskrivning."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 "  --provides      - visa taggen \"provides\": allt som tillhandahålls (flera "
 "rader)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 "  --requires      - visa taggen \"requires\": allt som krävs (flera rader)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files         - visa taggen \"files\": alla filer (flera rader)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --conflicts     - visa taggen \"conflicts\": alla konflikter (flera rader)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - visa taggen \"obsoletes\": allt som ersätts (flera "
 "rader)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 "  --prereqs       - visa taggen \"prereqs\": alla förhandskrav (flera rader)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "prova urpmf --help för fler flaggor"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr "ingen fullständig medialista hittades"
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "kan inte skriva konfigurationsfil [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1891
-msgid "retrieving rpms files..."
-msgstr "hämtar rpm-filer..."
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr "undersöker hela urpmi-databasen"
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  -y             - kräv luddig sökning.\n"
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "använder annan flyttbar enhet [%s] för \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "kan inte hitta listfil för \"%s\", ignorerar media"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "inget att skriva i listfilen för \"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"kan inte komma åt första installationsmedia (ingen Mandrake/base/hdlists-fil "
-"hittades)"
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "kan inte hitta listfil för \"%s\", ignorerar media"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "kan inte bearbeta hdlist-filen för \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "inget skrivet till listfilen om \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      - ge alla källpaket före nedladdning (endast root).\n"
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+"  --auto-select  - välj automatiskt paket för att uppdatera systemet.\n"
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "hämtar beskrivningsfil för \"%s\"..."
 
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr "kan inte komma åt första installationsmedia"
-
-#: po/placeholder.h:40 urpm.pm:1769
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "paketet %s kan inte hittas."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "avmonterar %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "tar bort %d gamla huvuden från cachen"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "ingen hdlist-fil hittad för media \"%s\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 "media \"%s\" försöker använda en hdlist som redan används, ignorerar media"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr "<inga utskrivbara tecken>"
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr "problem vid läsning av hdlist-filen, försöker igen"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
+msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "kan inte använda namnet \"%s\" till media eftersom det redan används"
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "tar bort media \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr "problem vid läsning av hdlist-filen, försöker igen"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "kan inte behandla media \"%s\" eftersom det inte existerar någon listfil [%s]"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "behåller bara filer angivna i \"provides\""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "kan inte skapa synthesis-fil för media \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "hittade %d huvuden i cachen"
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "försöker välja flera media: %s"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "undvik att välja %s eftersom dess språk ännu inte är valt"
+msgid "unable to update medium \"%s\"\n"
+msgstr "kunde ej uppdatera media \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"tar bort %s för att uppdatera till %s...\n"
-"  eftersom den annars inte blir uppdaterad"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - rensa huvudcachekatalogen.\n"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "media \"%s\" existerar redan"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "kan inte skriva listfilen för \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "skriv konfigurationsfil [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+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"
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "inget paket med namnet %s"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "hdlist-synthesis-fil för media \"%s\" byggd"
-
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "kan inte skapa hdlist synthesis, använder metoden parsehdlist"
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Försöka ännu hårdare att installera (--force)? (j/N)"
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "kan inte hitta hdlist-filen för \"%s\", ignorerar media"
 
-#: po/placeholder.h:66
+#: po/placeholder.h:58 po/placeholder.h:248
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "hdlist-synthesis-fil för media \"%s\" byggd"
+
+#: po/placeholder.h:59 po/placeholder.h:251
 msgid "urpmi database locked"
 msgstr "urpmi-databas låst"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, c-format
-msgid "mounting %s"
-msgstr "monterar %s"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (J/n) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - välj alla träffar på kommandoraden.\n"
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
-"kan inte ta hand om media \"%s\" eftersom listfilen redan används av annan "
-"media"
+"vissa paket måste tas bort för att bli uppdaterade, den funktionen finns "
+"inte ännu.\n"
 
-#: po/placeholder.h:69
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "undersöker synthesis-fil [%s]"
+msgid "mounting %s"
+msgstr "monterar %s"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - tvinga generering av hdlist-filer.\n"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget misslyckades: avslutade med %d eller signal %d\n"
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kunde inte hämta sökvägsnamn för flyttbart media \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+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"
 
-#: po/placeholder.h:72 urpm.pm:1886
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "felaktig indata: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1722 urpm.pm:1748
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+"  -u             - ta bort paket om en nyare version redan är installerad.\n"
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "det finns flera paket med samma rpm-filnamn \"%s\""
+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:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Tryck \"Enter\" när du är klar..."
 
-#: po/placeholder.h:74
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr "...kopiering misslyckades"
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr "media \"%s\" försöker använda en redan använd lista, ignorerar media"
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr "hämtar hdlists-fil..."
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "kan inte läsa hdlist-filen för \"%s\", ignorerar media"
-
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "kan inte registrera rpm-fil"
-
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr "  -h             - visa det här hjälpmeddelandet.\n"
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "kan inte undersöka listfil för \"%s\", ignorerar media"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr "  -g             - visa grupper med namn.\n"
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "för många monteringspunkter för flyttbart media \"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - välj all media.\n"
 
-#: po/placeholder.h:82
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "ogiltig hdlist-beskrivning \"%s\" i hdlists-fil"
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "inkonsekvent listfil för \"%s\", ignorerar media"
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr ""
+"  -h             - försök att hitta och använda synthesis eller hdlist-fil.\n"
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "misslyckades med att kopiera [%s]"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
+msgstr "  -r             - visa version och utgåva med namn.\n"
+
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - visa version, utgåva och arkitektur med namn.\n"
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr "  --auto         - välj automatiskt ett bra paket från valen.\n"
+
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "kan inte bearbeta korrekt [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+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"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
 msgid "read synthesis file [%s]"
 msgstr "läs synthesis-fil [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "kan inte analysera synthesis-data för %s"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "ingen webbhämtare (för närvarande curl eller wget) hittades\n"
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "hämtar käll-hdlist (eller synthesis) för \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
+msgstr ""
+"  -c             - välj fullständig metod för krav av "
+"upplösningsavslutning.\n"
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr "...kopiering klar"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "kunde ej skapa media \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopierar käll-hdlist (eller synthesis) för \"%s\"..."
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
-msgstr "kopierar hdlists-fil..."
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "syntaxfel i konfigurationsfil på raden %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: flaggan \"-%s\" är okänd, använd --help för hjälp\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "användning: urpmi.removemedia [-a] <namn>..."
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "bygger hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1821
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "kan inte läsa rpm-filen [%s] från media \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr "  --media         - använd endast media listat med komma.\n"
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr "la till media %s"
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "kan inte läsa rpm-filen [%s] från media \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "hämtning av käll-hdlist (eller synthesis) misslyckades"
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "fel vid registrering av lokala paket"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tar flyttbar enhet som \"%s\""
-
-#: po/placeholder.h:100 urpm.pm:1898
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...hämtning misslyckades: %s"
 
-#: po/placeholder.h:101 urpm.pm:1837
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "inkonsekvent media \"%s\", felaktigt markerad som flyttbar"
 
-#: po/placeholder.h:102
-#, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopierar beskrivningsfil för \"%s\"..."
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "kan inte bygga hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1811 urpm.pm:1814 urpm.pm:1833
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "media \"%s\" är inte valt"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ogiltigt rpm-filnamn [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "okänd data associerad med %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "försöker undvika existerande media \"%s\""
+msgid "What is your choice? (1-%d) "
+msgstr "Vad är ditt val? ( 1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "kan inte läsa listfilen för \"%s\", ignorerar media"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - använd wget för att hämta fjärrfiler.\n"
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 "undvik att välja %s eftersom inte tillräckligt med filer blir uppdaterade"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kan inte läsa rpm-fil [%s]"
 
-#: po/placeholder.h:111
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Tyvärr, felaktigt val, försök igen\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"tar bort %s för att uppdatera till %s...\n"
-"  eftersom den inte vill uppdatera korrekt!"
+msgid "unable to access medium \"%s\""
+msgstr "kan inte läsa media \"%s\""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "återfann %s poster i depslist"
 
-#: po/placeholder.h:116 urpm.pm:1848
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - använd curl för att hämta fjärrfiler.\n"
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "kan inte läsa media \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "försöker välja icke-existerande media \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1757
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr "kunde inte bearbeta [%s] vid värde \"%s\""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "försöker välja icke-existerande media \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "inga rpm-filer hittade på [%s]"
+
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr "curl saknas\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Följande paket innehåller %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "kan inte avgöra media för denna hdlist-fil [%s]"
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - visar det här hjälpmeddelandet.\n"
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "allt är redan installerat"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr "hämtar rpm-filer..."
 
-#: po/placeholder.h:120
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "inga rpm-filer hittade på [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "använder annan flyttbar enhet [%s] för \"%s\""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Ett av följande paket är nödvändigt:"
 
-#: po/placeholder.h:121
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"kan inte komma åt första installationsmedia (ingen Mandrake/base/hdlists-fil "
+"hittades)"
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "undersöker hdlist-filen [%s]"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan inte läsa rpm-filen \"%s\"\n"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
-msgstr "inga poster återfanns i depslist"
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1896
-msgid "...retrieving done"
-msgstr "...hämtning klar"
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Installationen misslyckades"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr "kan inte komma åt första installationsmedia"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - sök inte i \"provides\" för att hitta paket.\n"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "väljer %s utifrån \"obsoletes\""
+msgid "unmounting %s"
+msgstr "avmonterar %s"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl misslyckades: avslutade med %d eller signal %d\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "tar bort %d gamla huvuden från cachen"
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "väljer %s utifrån valet av filer"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ingen hdlist-fil hittad för media \"%s\""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
-msgstr "curl saknas\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr "<inga utskrivbara tecken>"
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - utförligt läge.\n"
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "kopierar källista för \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "tar bort media \"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr "wget saknas\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "kan inte skapa synthesis-fil för media \"%s\""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:143 po/placeholder.h:238
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "kan inte avgöra media för denna hdlist-fil [%s]"
+msgid "trying to select multiple medium: %s"
+msgstr "försöker välja flera media: %s"
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - visar det här hjälpmeddelandet.\n"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - välj all icke-flyttbar media.\n"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "allt är redan installerat"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr "  namn eller rpm-filer som anges på kommandoraden installeras.\n"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: okänd flagga \"-%s\", använd --help för hjälp\n"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "undvik att välja %s eftersom dess språk ännu inte är valt"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  -y             - kräv luddig sökning.\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+"  --complete     - använd parsehdlist-server för att göra klart valet.\n"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Ett av följande paket är nödvändigt:"
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "skriv konfigurationsfil [%s]"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - använd endast uppdateringsmedia.\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "kan inte skapa hdlist synthesis, använder metoden parsehdlist"
 
-#: po/placeholder.h:138 urpmi:321
+#: po/placeholder.h:151 po/placeholder.h:413
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
-"Installationen misslyckades, vissa filer saknas.\n"
-"Du bör försöka uppdatera din urpmi-databas."
+"  --distrib      - skapa automatiskt all media från ett installationsmedia.\n"
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
-msgstr "  --auto         - välj automatiskt ett bra paket från valen.\n"
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"kan inte ta hand om media \"%s\" eftersom listfilen redan används av annan "
+"media"
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Installationen misslyckades"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
+msgstr "undersöker synthesis-fil [%s]"
 
-#: po/placeholder.h:145 po/placeholder.h:270
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "kunde inte hämta sökvägsnamn för flyttbart media \"%s\""
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "det finns flera paket med samma rpm-filnamn \"%s\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
 msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --auto-select  - välj automatiskt paket för att uppdatera systemet.\n"
+"För att tillfredsställa beroenden kommer följande paket att installeras (% d "
+"MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr "hämtar hdlists-fil..."
 
-#: po/placeholder.h:147
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: okänd flagga \"-%s\", använd --help för hjälp\n"
+
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "kan inte läsa hdlist-filen för \"%s\", ignorerar media"
+
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "kan inte registrera rpm-fil"
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "kan inte undersöka listfil för \"%s\", ignorerar media"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "för många monteringspunkter för flyttbart media \"%s\""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "inkonsekvent listfil för \"%s\", ignorerar media"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - använd endast uppdateringsmedia.\n"
+
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "misslyckades med att kopiera [%s]"
+
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
+"  -d             - utöka förfrågning till att omfatta paketberoenden.\n"
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "kan inte analysera synthesis-data för %s"
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "hämtar käll-hdlist (eller synthesis) för \"%s\"..."
+
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - använd X-gränssnitt.\n"
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr "...kopiering klar"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -704,120 +796,192 @@ msgstr ""
 "För att tillfredsställa beroenden kommer följande paket att installeras (% d "
 "MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - sök inte i \"provides\" för att hitta paket.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr "kopierar hdlists-fil..."
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "syntaxfel i konfigurationsfil på raden %s"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Prova att installera utan att kontrollera behov av andra filer? (j/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr "  --media         - använd endast media listat med komma.\n"
-
-#: po/placeholder.h:152
-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"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "fel vid registrering av lokala paket"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - utförligt läge.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "tar flyttbar enhet som \"%s\""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - tillåt sökning i \"provides\" för att hitta paket.\n"
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr "  namn eller rpm-filer som anges på kommandoraden installeras.\n"
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tyst läge.\n"
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr ""
-"  --complete     - använd parsehdlist-server för att göra klart valet.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "kopierar beskrivningsfil för \"%s\"..."
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Vad är ditt val? ( 1-%d) "
+msgid "unable to build hdlist: %s"
+msgstr "kan inte bygga hdlist: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - använd wget för att hämta fjärrfiler.\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "media \"%s\" är inte valt"
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 Mandrakesoft.\n"
-"Det här är fri programvara och får distribueras enligt villkoren i GNU GPL.\n"
-"användning:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "försöker undvika existerande media \"%s\""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Försöka ännu hårdare att installera (--force)? (j/N)"
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tyst läge.\n"
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - tvinga användning även om vissa paket inte finns.\n"
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Tyvärr, felaktigt val, försök igen\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - välj alla träffar på kommandoraden.\n"
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - använd curl för att hämta fjärrfiler.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "installerar %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Sätt in media med namnet \"%s\" i enhet [%s]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Följande paket innehåller %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr "undersöker hdlist-filen [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr "inga poster återfanns i depslist"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - skapa ett uppdateringsmedia.\n"
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+"  -d             - tvinga fullständig beräkning av filen depslist.ordered.\n"
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "kunde inte läsa källan, avbryter"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Tryck \"Enter\" när du är klar..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr "...hämtning klar"
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "väljer %s utifrån \"obsoletes\""
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl misslyckades: avslutade med %d eller signal %d\n"
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "väljer %s utifrån valet av filer"
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "kopierar källista för \"%s\"..."
+
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 msgid "Only superuser is allowed to install packages"
 msgstr "Endast systemadministratörer får installera paket"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr "wget saknas\n"
+
+#: po/placeholder.h:240
 #, 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 ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"tar bort %s för att uppdatera till %s...\n"
+"  eftersom den annars inte blir uppdaterad"
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"tar bort %s för att uppdatera till %s...\n"
+"  eftersom den inte vill uppdatera korrekt!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Installationen misslyckades, vissa filer saknas.\n"
+"Du bör försöka uppdatera din urpmi-databas."
+
+#: po/placeholder.h:348
+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"
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 Mandrakesoft.\n"
+"Det här är fri programvara och får distribueras enligt villkoren i GNU GPL.\n"
+"användning:\n"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
 "%s\n"
@@ -826,7 +990,7 @@ msgstr ""
 "%s\n"
 "behöver inte ange <relativ sökväg till hdlist> med --distrib"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -849,17 +1013,7 @@ msgstr ""
 "       removable://<sökväg>\n"
 "och [flaggor] är från\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "kunde ej skapa media \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "kunde ej uppdatera media \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -869,11 +1023,7 @@ msgstr ""
 "\n"
 "okända flaggor \"%s\"\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - rensa huvudcachekatalogen.\n"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -882,16 +1032,7 @@ msgstr ""
 "%s\n"
 "<relativ sökväg till hdlist> saknas\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - tvinga generering av hdlist-filer.\n"
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-"  -h             - försök att hitta och använda synthesis eller hdlist-fil.\n"
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -900,18 +1041,24 @@ msgstr ""
 "%s\n"
 "\"with\" saknas för ftp-media\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - skapa ett uppdateringsmedia.\n"
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, 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"
 
-#: po/placeholder.h:217
+#: po/placeholder.h:425
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --distrib      - skapa automatiskt all media från ett installationsmedia.\n"
+"användning: urpmi.removemedia [-a] <namn>...\n"
+"där <namn> är medianamnet som ska tas bort.\n"
 
-#: po/placeholder.h:218
+#: po/placeholder.h:429
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -919,7 +1066,7 @@ msgstr ""
 "användning: urpmi.update [flaggor] <namn>...\n"
 "där <namn> är medianamnet som ska uppdateras.\n"
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -928,71 +1075,7 @@ msgstr ""
 "objektet som ska uppdateras saknas\n"
 "(en av %s)\n"
 
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - tvinga fullständig beräkning av filen depslist.ordered.\n"
-
-#: po/placeholder.h:235 urpmi.update:57
-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"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - välj all icke-flyttbar media.\n"
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-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"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
-#, 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"
-
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - välj all media.\n"
-
-#: po/placeholder.h:248
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"användning: urpmi.removemedia [-a] <namn>...\n"
-"där <namn> är medianamnet som ska tas bort.\n"
-
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr "  -h             - visa det här hjälpmeddelandet.\n"
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr "  -g             - visa grupper med namn.\n"
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kan inte läsa rpm-filen \"%s\"\n"
-
-#: po/placeholder.h:256
-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"
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr "  -r             - visa version och utgåva med namn.\n"
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - visa version, utgåva och arkitektur med namn.\n"
-
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1006,37 +1089,7 @@ msgstr ""
 "Det här är fri programvara och får distribueras enligt villkoren i GNU GPL.\n"
 "användning:\n"
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-"  -d             - utöka förfrågning till att omfatta paketberoenden.\n"
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - ge alla källpaket före nedladdning (endast root).\n"
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-"  -c             - välj fullständig metod för krav av "
-"upplösningsavslutning.\n"
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"vissa paket måste tas bort för att bli uppdaterade, den funktionen finns "
-"inte ännu.\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: flaggan \"-%s\" är okänd, använd --help för hjälp\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
@@ -1044,12 +1097,6 @@ msgstr ""
 "  --headers      - packa upp huvuden för paket från urpmi-db till\n"
 "                   standard ut (endast root).\n"
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-"  -u             - ta bort paket om en nyare version redan är installerad.\n"
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1094,17 +1141,17 @@ msgstr ") . _("
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "användning: urpmi.update [flaggor] <namn>..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "användning: urpmi.removemedia [-a] <namn>..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "användning: urpmi.removemedia [-a] <namn>..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "användning: urpmi.update [flaggor] <namn>..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/tg.po b/po/tg.po
index e6fecbb9..7a7352a4 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-31 20:51+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2002-02-04 19:06\n"
 "Last-Translator: Roger Kovacs <rkovacs@khujandcomptech.dyn.tj>\n"
 "Language-Team: Tajik\n"
@@ -27,28 +27,32 @@ msgstr ""
 "Коргузориши автоматикии қуттиҳо...\n"
 "Шумо коргузориши куттии '$rpm'-ро талаб кардед\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 #, fuzzy
 msgid "Is it OK?"
 msgstr "Ин дуру�т а�т?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Ok"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Бекор кардан"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "�н"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "Ò²Ò³"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (Ҳ/н) "
 
@@ -56,16 +60,16 @@ msgstr " (Ҳ/н) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: фармон ёфта нашуд\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf ну�хаи %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Ҳуқуқи муаллифӣ (С) 1999,2000,2001 MandrakeSoft"
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
@@ -73,756 +77,916 @@ msgstr ""
 "Ин нармафзори озод а�т ва метавонад дар зери шартҳои GNU GPL паҳн карда "
 "шавад."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "и�тифода: urpmf [интихобҳо] <файл>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --хомӯш         - номи т�гро чоп накунед (пешфарз агар �гон т�г дар фармон "
 "набошад"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "\t\t\t    �атр, номувофиқ а�т бо у�ули интерактивӣ)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr " --ҳама      \t  - чопи ҳама т�гҳо."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --ном           - чопи номи т�г: номи файли rpm (қабул шуд агар т�г дода "
 "нашуда бошад"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    �атри фармон вале бе номи қутти)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr " --гурӯҳ          - чопи гурӯҳи т�г: гурӯҳ."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --ҳаҷм          - чопи ҳаҷми т�г: ҳаҷм."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --�ил�ила       - чопи �ил�илаи т�г: �ил�ила."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --ҷамъба�т      - чопи ҷамъба�ти т�г: ҷамъба�т."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --та�вирот      - чопи та�вироти т�г: та�вирот."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr "  --таъминот      - чопи таъминоти т�г: ҳама таъминот (�атрҳои зиёд)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr " --дархо�тҳо     - чопи дархо�тҳои т�г: ҳама дархо�тҳо (�атрҳои зиёд)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr " --файлҳо        - чопи файлҳои т�г: ҳама файлҳо (�атрҳои зиёд)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --зидди�тҳо     - чопи зидди�тҳои т�г: ҳама зидди�тҳо (�атрҳои зиёд)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --кӯҳнашудаҳо   - чопи кӯҳнашудаҳои т�г: ҳама кӯҳнашудаҳо (�атрҳои зиёд)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr " --заминаҳо      - чопи заминаҳои т�г: ҳама заминаҳо (�атрҳои зиёд)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "барои интихоби зиёдтар urpmf --help-ро интихоб кунед"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "навиштани файли танзимдарории [%s] номумкин"
 
-#: po/placeholder.h:30 urpm.pm:1891
-#, fuzzy
-msgid "retrieving rpms files..."
-msgstr "барқароркунии [%s]"
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:33
-#, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr "дар файли рӯйхат барои \"%s\" чизе ба навиштан не�т"
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "дарёфти файли рӯйхат барои \"%s\" номумкин, муҳит рад шуд"
 
-#: po/placeholder.h:36
+#: po/placeholder.h:33 po/placeholder.h:218
+#, c-format
+msgid "nothing to write in list file for \"%s\""
+msgstr "дар файли рӯйхат барои \"%s\" чизе ба навиштан не�т"
+
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "таҷзи�и файли hdlist - и \"%s\" номумкин"
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудаа�т"
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "дохилшавии файли рӯйхати \"%s\" номумкин, муҳит рад шуд"
-
-#: po/placeholder.h:40 urpm.pm:1769
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "қуттии %s ёфт нашуд."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "ҷудокунии %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "хориҷи �арлавҳаҳои кӯҳнашудаи %d дар к�ш"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, fuzzy, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 "муҳити \"%s\"кӯшиш мекунад, ки hdlist-и и�тифодашударо и�тифода барад,муҳит "
 "рад шуд"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "хондани файли hdlist-и [%s]"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "и�тифодаи номи \"%s\" барои муҳити беном номумкин, ин ном аллакай и�тифода "
 "шудаа�т"
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "кӯшиши хориҷи муҳити вуҷуд надоштаи \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "хондани файли hdlist-и [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "гирифтани муҳити \"%s\" ба ҳи�обот аз барои вуҷуд надоштани рӯйхати файли [%"
 "s] номумкин"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "нигоҳ доштани файлҳои ба таъминот таалуқдошта"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "�охтани файли �унъӣ барои муҳити \"%s\" номумкин"
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d �арлавҳаҳо дар к�ш ёфт шуданд"
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
-"аз интихоби %s худдорӣ кунед, ки забони маҳаллии он ҳоло интихоб нашудаа�т"
+msgid "unable to update medium \"%s\"\n"
+msgstr "нав кардани муҳити \"%s\" номумкин\n"
 
-#: po/placeholder.h:55
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
-"хориҷи %s барои афзоиш ...\n"
-"то %s чунки он дигар гуна нав намешавад"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "муҳити \"%s\" аллакай вуҷуд дорад"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "файли танзимдарории [%s] нави�ед"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "қуттии бо номи %s не�т"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Коргузориро боз у�тувортар (--force) кӯшиш кунем? (Ҳ/�)  "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ёфтани файли hdlist барои \"%s\" номумкин, муҳит рад шуд"
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "файли �унъии офаридаи hdlist барои муҳити \"%s\""
 
-#: po/placeholder.h:64
-#, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
 msgstr ""
-"ёфтани ҳамаи файлҳои �унъӣ номумкин, и�тифодаи хидматра�они parsehdlist "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ёфтани файли hdlist барои \"%s\" номумкин, муҳит рад шуд"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (Ҳ/н) "
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+#, fuzzy
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+"барои афзоиш баъзе қуттиҳо бо�д хориҷ шаванд, ин ҳоло да�тгирӣ нашудаа�т\n"
+
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "ва�лкунии %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
-"аз паи муҳити \"%s\" шудан номумкин чунки файли рӯйхат аллакай бо муҳити "
-"дигар и�тифода шудаа�т"
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "хондани файли hdlist-и [%s]"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "офаридани муҳити \"%s\" номумкин\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"ба хориҷкунӣ чизе не�т (барои иловаи муҳит urpmi.addmedia-ро и�тифода "
+"баред)\n"
 
-#: po/placeholder.h:72 urpm.pm:1886
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "даровардани бад: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1722 urpm.pm:1748
-#, fuzzy, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "қуттиҳои зиёде бо чунин номи файли rpm-и \"%s\" вуҷуд доранд"
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Яке аз қуттиҳои зерин барои коргузории %s даркор а�т:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+#, fuzzy
+msgid "Press Enter when it's done..."
+msgstr "Вақте, ки ин тайёр enter-ро пахш кунед..."
 
-#: po/placeholder.h:74
+#: po/placeholder.h:72 po/placeholder.h:259
 #, fuzzy
 msgid "...copying failed"
 msgstr "ну�хаи [%s] нагузашт"
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, fuzzy, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 "муҳити \"%s\" кӯшиш мекунад, ки рӯйхати и�тифодашударо и�тифода барад,муҳит "
 "рад шуд"
 
-#: po/placeholder.h:76
+#: po/placeholder.h:74 po/placeholder.h:448
 #, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "хондани файли hdlist-и [%s]"
+msgid "  -h             - print this help message.\n"
+msgstr " --ҳама      \t  - чопи ҳама т�гҳо."
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "дохилшавии файли hdlist-и \"%s\" номумкин, муҳит рад шуд"
+#: po/placeholder.h:75 po/placeholder.h:450
+#, fuzzy
+msgid "  -g             - print groups too with name.\n"
+msgstr " --гурӯҳ          - чопи гурӯҳи т�г: гурӯҳ."
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "ба қайд гирифтани файли rpm номумкин"
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr " --ҳама      \t  - чопи ҳама т�гҳо."
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
-"аз назар гузаронидани файли рӯйхат барои \"%s\" номумкин, муҳит рад шуд"
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
+#: po/placeholder.h:79 po/placeholder.h:454
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr "                    �атри фармон вале бе номи қутти)."
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "файли рӯйхати бемуно�ибат барои \"%s\", муҳит рад шуд"
-
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "ну�хаи [%s] нагузашт"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "таҷзи�и дуру�ти [%s] номумкин"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"ба навкунӣ чизе не�т (барои иловаи муҳит urpmi.addmedia-ро и�тифода баред)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "хондани файли depslist-и [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "таҷзи�и файли hdlist - и \"%s\" номумкин"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr ""
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "офаридани муҳити \"%s\" номумкин\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "хондани файли hdlist-и [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "хатогии таркибӣ дар �атри %s дар файли танзимдарор"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: хо�и�ти номаълум \"-%s\", тафтиши и�тифода бо --help\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "и�тифода: urpmi.removemedia [-a] <ном> ..."
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "офариниши hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1821
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "хондани файли rpm [%s] аз муҳити \"%s\" номумкин"
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "хондани файли rpm [%s] аз муҳити \"%s\" номумкин"
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "хатогии ба қайдгирии қуттиҳои маҳаллӣ"
-
-#: po/placeholder.h:99
-#, fuzzy, c-format
-msgid "taking removable device as \"%s\""
-msgstr "кӯшиши хориҷи муҳити вуҷуд надоштаи \"%s\""
-
-#: po/placeholder.h:100 urpm.pm:1898
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "барқароркунии [%s]"
 
-#: po/placeholder.h:101 urpm.pm:1837
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 "муҳити бемуно�ибати \"%s\" ҳамчун ивазшаванда ишора шудаа�т, локиннодуру�т"
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудаа�т"
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "офариниши hdlist номумкин: %s"
-
-#: po/placeholder.h:104 urpm.pm:1811 urpm.pm:1814 urpm.pm:1833
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "муҳити \"%s\" интихоб нашудаа�т"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "номи файли rpm-и нодуру�ти [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "маълумотҳои номалуми пайва�та бо %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "кӯшиши гузаштани муҳити вуҷуддоштаи \"%s\", кандашавӣ"
+msgid "What is your choice? (1-%d) "
+msgstr "Интихоби шумо чи�т? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "дохилшавии файли рӯйхати \"%s\" номумкин, муҳит рад шуд"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "аз интихоби %s худдорӣ кунед чунки файлҳои нокифо� нав хоҳанд шуд"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "дохилшавии файли rpm-и [%s] номумкин"
 
-#: po/placeholder.h:111
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"хориҷи %s барои афзоиш...\n"
-"то %s чунки он дуру�т афзоиш намеёбад!"
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "�лементҳои %s-и ҷойивазшуда дар depslist"
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Мебахшед, интихоби бад боз кӯшиш кунед\n"
 
-#: po/placeholder.h:116 urpm.pm:1848
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "дохилшавии муҳити \"%s\" номумкин"
 
-#: po/placeholder.h:117 urpm.pm:1757
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr "таҷзи�и дур�ти [%s] дар қиммати \"%s\" номумкин"
+msgid "relocated %s entries in depslist"
+msgstr "�лементҳои %s-и ҷойивазшуда дар depslist"
 
-#: po/placeholder.h:118
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Қуттиҳои зерин �оҳиби %s: %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "таҷзи�и дур�ти [%s] дар қиммати \"%s\" номумкин"
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "файлҳои rpm аз [%s] ёфт нашуданд"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "хондани файли hdlist-и [%s]"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "муай�н кардани муҳити ин файли hdlist-и [%s] номумкин"
+
+#: po/placeholder.h:119 po/placeholder.h:328
 #, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "�лементҳои %s-и ҷойивазшуда дар depslist"
+msgid "  --help         - print this help message.\n"
+msgstr " --ҳама      \t  - чопи ҳама т�гҳо."
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "ҳамааш аллакай кор гузошта шуд"
 
-#: po/placeholder.h:123 urpm.pm:1896
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
 #, fuzzy
-msgid "...retrieving done"
+msgid "retrieving rpms files..."
 msgstr "барқароркунии [%s]"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "интихоби %s бо и�тифодаи кӯҳнашудаҳо"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Яке аз қуттиҳои зерин даркор а�т:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "интихоби %s бо роҳи интихоб дар файлҳо"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: хондани файли rpm \"%s\" намешавад\n"
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Коргузорӣ нагузашт"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr "дохилшавии файли рӯйхати \"%s\" номумкин, муҳит рад шуд"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid "unmounting %s"
+msgstr "ҷудокунии %s"
+
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "хориҷи �арлавҳаҳои кӯҳнашудаи %d дар к�ш"
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:141 po/placeholder.h:233
+#, fuzzy, c-format
+msgid "removing medium \"%s\""
+msgstr "кӯшиши хориҷи муҳити вуҷуд надоштаи \"%s\""
+
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "муай�н кардани муҳити ин файли hdlist-и [%s] номумкин"
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "�охтани файли �унъӣ барои муҳити \"%s\" номумкин"
 
-#: po/placeholder.h:132
-#, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr " --ҳама      \t  - чопи ҳама т�гҳо."
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "ҳамааш аллакай кор гузошта шуд"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: хо�и�ти номаълум \"-%s\", тафтиши и�тифода бо --help\n"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
+"аз интихоби %s худдорӣ кунед, ки забони маҳаллии он ҳоло интихоб нашудаа�т"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Яке аз қуттиҳои зерин даркор а�т:"
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "файли танзимдарории [%s] нави�ед"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
+"ёфтани ҳамаи файлҳои �унъӣ номумкин, и�тифодаи хидматра�они parsehdlist "
 
-#: po/placeholder.h:138 urpmi:321
+#: po/placeholder.h:151 po/placeholder.h:413
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"аз паи муҳити \"%s\" шудан номумкин чунки файли рӯйхат аллакай бо муҳити "
+"дигар и�тифода шудаа�т"
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Коргузорӣ нагузашт"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "хондани файли hdlist-и [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "офаридани муҳити \"%s\" номумкин\n"
 
-#: po/placeholder.h:145 po/placeholder.h:270
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, fuzzy, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "қуттиҳои зиёде бо чунин номи файли rpm-и \"%s\" вуҷуд доранд"
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
 msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"Барои қаноатмандии тобеи�тҳо қуттиҳои зерин кор гузошта мешаванд (%d МБ)"
 
-#: po/placeholder.h:147
+#: po/placeholder.h:163 po/placeholder.h:261
 #, fuzzy
-msgid "  --X            - use X interface.\n"
-msgstr " --ҳама      \t  - чопи ҳама т�гҳо."
+msgid "retrieving hdlists file..."
+msgstr "хондани файли hdlist-и [%s]"
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr ""
-"Барои қаноатмандии тобеи�тҳо қуттиҳои зерин кор гузошта мешаванд (%d МБ)"
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: хо�и�ти номаълум \"-%s\", тафтиши и�тифода бо --help\n"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "дохилшавии файли hdlist-и \"%s\" номумкин, муҳит рад шуд"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Коргузориро бе тафтиши тобеи�тҳо кӯшиш кунем? (Ҳ/�) "
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "ба қайд гирифтани файли rpm номумкин"
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
+"аз назар гузаронидани файли рӯйхат барои \"%s\" номумкин, муҳит рад шуд"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
-msgid "  -p             - allow search in provides to find package.\n"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "файли рӯйхати бемуно�ибат барои \"%s\", муҳит рад шуд"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "ну�хаи [%s] нагузашт"
+
+#: po/placeholder.h:173 po/placeholder.h:462
+#, fuzzy
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "                    �атри фармон вале бе номи қутти)."
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "таҷзи�и файли hdlist - и \"%s\" номумкин"
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:177 po/placeholder.h:343
 #, fuzzy
-msgid "  -q             - quiet mode.\n"
+msgid "  --X            - use X interface.\n"
 msgstr " --ҳама      \t  - чопи ҳама т�гҳо."
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Интихоби шумо чи�т? (1-%d) "
-
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
+"Барои қаноатмандии тобеи�тҳо қуттиҳои зерин кор гузошта мешаванд (%d МБ)"
+
+#: po/placeholder.h:180 po/placeholder.h:277
+#, fuzzy
+msgid "copying hdlists file..."
+msgstr "хондани файли hdlist-и [%s]"
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "хатогии таркибӣ дар �атри %s дар файли танзимдарор"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Коргузориро бе тафтиши тобеи�тҳо кӯшиш кунем? (Ҳ/�) "
+
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "хатогии ба қайдгирии қуттиҳои маҳаллӣ"
 
-#: po/placeholder.h:163
+#: po/placeholder.h:184 po/placeholder.h:284
 #, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "taking removable device as \"%s\""
+msgstr "кӯшиши хориҷи муҳити вуҷуд надоштаи \"%s\""
+
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"Ин нармафзори озод а�т ва метавонад дар зери шартҳои GNU GPL паҳн карда "
-"шавад."
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Коргузориро боз у�тувортар (--force) кӯшиш кунем? (Ҳ/�)  "
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудаа�т"
 
-#: po/placeholder.h:171 po/placeholder.h:269
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
+msgstr "офариниши hdlist номумкин: %s"
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Мебахшед, интихоби бад боз кӯшиш кунед\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "муҳити \"%s\" интихоб нашудаа�т"
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "кӯшиши гузаштани муҳити вуҷуддоштаи \"%s\", кандашавӣ"
+
+#: po/placeholder.h:191 po/placeholder.h:355
+#, fuzzy
+msgid "  -q             - quiet mode.\n"
+msgstr " --ҳама      \t  - чопи ҳама т�гҳо."
+
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "коргузории %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Лутфан муҳити бо номи \"%s\" ба да�тгоҳи [%s] дароред"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Қуттиҳои зерин �оҳиби %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "хондани файли hdlist-и [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "�лементҳои %s-и ҷойивазшуда дар depslist"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "қуттиҳои �арчашмавӣ гирифтан номумкин, кандашавӣ"
 
-#: po/placeholder.h:180 urpmi:297
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
 #, fuzzy
-msgid "Press Enter when it's done..."
-msgstr "Вақте, ки ин тайёр enter-ро пахш кунед..."
+msgid "...retrieving done"
+msgstr "барқароркунии [%s]"
+
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "интихоби %s бо и�тифодаи кӯҳнашудаҳо"
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "интихоби %s бо роҳи интихоб дар файлҳо"
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr ""
+
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 "Танҳо ба фавқулкорванд кор гузоштани қуттиҳои маҳаллӣ рух�ат дода шудаа�т"
 
-#: po/placeholder.h:182 urpmi:216
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Яке аз қуттиҳои зерин барои коргузории %s даркор а�т:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"хориҷи %s барои афзоиш ...\n"
+"то %s чунки он дигар гуна нав намешавад"
+
+#: po/placeholder.h:296
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"хориҷи %s барои афзоиш...\n"
+"то %s чунки он дуру�т афзоиш намеёбад!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"Ин нармафзори озод а�т ва метавонад дар зери шартҳои GNU GPL паҳн карда "
+"шавад."
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -831,7 +995,7 @@ msgstr ""
 "%s\n"
 "<роҳи ни�бии hdlist> ҳозир не�т\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -853,17 +1017,7 @@ msgstr ""
 "       http://<�оҳиб>/<роҳ> бо <номи ни�бии файли hdlist>\n"
 "       ивазшаванда_<да�тгоҳ>://<роҳ>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "офаридани муҳити \"%s\" номумкин\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "нав кардани муҳити \"%s\" номумкин\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -871,11 +1025,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -884,15 +1034,7 @@ msgstr ""
 "%s\n"
 "<роҳи ни�бии hdlist> ҳозир не�т\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -901,58 +1043,7 @@ msgstr ""
 "%s\n"
 "`with' барои муҳити ftp ҳозир не�т\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-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"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"�лемент барои нав кардан ҳозир не�т\n"
-"(�ке аз %s)\n"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"ба навкунӣ чизе не�т (барои иловаи муҳит urpmi.addmedia-ро и�тифода баред)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"ба хориҷкунӣ чизе не�т (барои иловаи муҳит urpmi.addmedia-ро и�тифода "
-"баред)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -961,12 +1052,7 @@ msgstr ""
 "�лемент барои хориҷ кардан ҳозир не�т\n"
 "(�ке аз %s)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr " --ҳама      \t  - чопи ҳама т�гҳо."
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -978,35 +1064,28 @@ msgstr ""
 "\n"
 "хо�и�тҳои номаълуми '%s'\n"
 
-#: po/placeholder.h:252
+#: po/placeholder.h:429
 #, fuzzy
-msgid "  -h             - print this help message.\n"
-msgstr " --ҳама      \t  - чопи ҳама т�гҳо."
-
-#: po/placeholder.h:254
-#, fuzzy
-msgid "  -g             - print groups too with name.\n"
-msgstr " --гурӯҳ          - чопи гурӯҳи т�г: гурӯҳ."
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: хондани файли rpm \"%s\" намешавад\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\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"
 
-#: po/placeholder.h:258
-#, fuzzy
-msgid "  -r             - print version and release too with name.\n"
-msgstr "                    �атри фармон вале бе номи қутти)."
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"�лемент барои нав кардан ҳозир не�т\n"
+"(�ке аз %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1018,45 +1097,12 @@ msgstr ""
 "Ин нармафзори озод а�т ва метавонад дар зери шартҳои GNU GPL паҳн карда "
 "шавад."
 
-#: po/placeholder.h:266
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                    �атри фармон вале бе номи қутти)."
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-#, fuzzy
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"барои афзоиш баъзе қуттиҳо бо�д хориҷ шаванд, ин ҳоло да�тгирӣ нашудаа�т\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: хо�и�ти номаълум \"-%s\", тафтиши и�тифода бо --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1101,18 +1147,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "и�тифода: urpmi.update [-a] <ном> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "и�тифода: urpmi.removemedia [-a] <ном> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "и�тифода: urpmi.removemedia [-a] <ном> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "и�тифода: urpmi.update [-a] <ном> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/th.po b/po/th.po
index 6fbb6670..548d5c88 100644
--- a/po/th.po
+++ b/po/th.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-09-17 21:51GMT+7\n"
 "Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai <de@li.org>\n"
@@ -26,27 +26,31 @@ msgstr ""
 "¡ÒõԴµÑé§ Package ẺÍѵâ¹Áѵ...\n"
 "¤Ø³ä´éàÅ×Í¡·Õè¨ÐµÔ´µÑé§ Package $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "µ¡Å§äËÁ¤ÃѺ"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "µ¡Å§"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "¡àÅÔ¡"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "Yy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
@@ -54,750 +58,909 @@ msgstr " (Y/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: äÁ辺¤ÓÊÑ觹Õé\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf àÇÍÃìªÑè¹ %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr "â»Ãá¡ÃÁ¹Õé¿ÃÕ áÅÐÊÒÁÒöᨡ¨èÒÂä´éÀÒÂãµéà§×è͹㢠GNUGPL."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "¡ÒÃãªé§Ò¹:urpmf [options] <file>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr " --quiet        - äÁèµéͧ¾ÔÁ¾ìª×èÍ Tag (default ¶éÒ tag äÁèä´é¶Ù¡ÃкØã¹ command"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                  line,ãªéäÁèä´é¡ÑºâËÁ´ interactive). "
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr " --name         - ¾ÔÁ¾ìª×èÍ tag:  ª×èÍä¿Åì rpm (ÊÁÁصÇèÒ tag äÁèä´é¶Ù¡ÃкØã¹"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                  command line áµèäÁèÁÕª×èÍ package)"
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr " --group        - ¾ÔÁ¾ì tag group: group."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr " --size         - ¾ÔÁ¾ì¢¹Ò´ tag:¢¹Ò´"
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr " --serial       - ¾ÔÁ¾ì tag serial: serial"
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr " --summary      - ¾ÔÁ¾ì tag summary: summary"
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr " --description  - ¾ÔÁ¾ì tag ÃÒÂÅÐàÍÕ´  : ÃÒÂÅÐàÍÕ´"
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr " --provides     -¾ÔÁ¾ì  tag provides: all provides (ËÅÒºÃ÷Ѵ). "
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr " --requires     - ¾ÔÁ¾ì  tag ·Õèµéͧ¡ÒÃ:·Õèµéͧ¡Ò÷Ñé§ËÁ´(ËÅÒºÃ÷Ѵ)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr " --files        - ¾ÔÁ¾ì  tag files: file ·Ñé§ËÁ´ (ËÅÒºÃ÷Ѵ)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 #, fuzzy
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr " --conflicts    -¾ÔÁ¾ì tag ·Õèà¢éҡѹäÁèä´é:à¢éҡѹäÁèä´é·Ñé§ËÁ´(ËÅÒºÃ÷Ѵ)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr " --obsoletes    -¾ÔÁ¾ì tag äÁèãªéáÅéÇ:ãªéäÁèä´é·Ñé§ËÁ´(ËÅÒºÃ÷Ѵ)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 " --prereqa      - ¾ÔÁ¾ì tag ÊÔ觷Õè¨Óà»ç¹µéͧ·Ó¡è͹: ÊÔ觷Õè¨Óà»ç¹µéͧ·Ó¡è͹·Ñé§ËÁ´(ËÅÒºÃ÷Ѵ)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "try urpmf --help ÁÕ·Ò§ªèÇÂãËéàÅ×Í¡ÁÒ¡"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "äÁèÊÒÁÒöà¢Õ¹ config file [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-#, fuzzy
-msgid "retrieving rpms files..."
-msgstr "¡ÓÅѧÍèÒ¹¢éÍÁÙÅ[%s]"
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "äÁèÊÒÁÒöËÒ list file ÊÓËÃѺ\"%s\",medium ignored"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "äÁèÁÕ¡ÒÃà¢Õ¹ÃÒ¡Òà file ÊÓËÃѺ\"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "äÁèÊÒÁÒöËÒ list file ÊÓËÃѺ\"%s\",medium ignored"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "äÁèÊÒÁÒö parse hdlist file of \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "äÁèÁÕ¡ÒÃà¢Õ¹㹠list file ÊÓËÃѺ\"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, fuzzy, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "¡ÓÅѧÍèÒ¹¢éÍÁÙÅ[%s]"
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "äÁèÊÒÁÒöãªé§Ò¹ list file ¢Í§ \"%s\", medium ignored"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "ËÒ %s package äÁ辺"
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "¡ÓÅѧ¶Í´¶Í¹ %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "¡ÓÅѧź %d header·ÕèÅéÒÊÁÑÂã¹ cache"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "äÁ辺 hdlist file ÊÓËÃѺÍØ»¡Ã³ì\"%s\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr "ÍØ»¡Ã³ì\"%s\"¾ÂÒÁÂÒÁãªé hdlist·ÕèãªéÍÂÙèáÅéÇ ,medium ignore"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "¡ÓÅѧÍèÒ¹ hdlist file [%s]"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "äÁèÊÒÁÒöãªéª×èÍ \"%s\" ÊÓËÃѺÍØ»¡Ã³ì·ÕèäÁèÁÕª×èÍà¾ÃÒÐÇèÒÁѹä´é¶Ù¡ãªéáÅéÇ"
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "¡ÓÅѧ·Ó¡ÒÃÂéÒÂÍÍ¡ÊÓËÃѺÍØ»¡Ã³ì·ÕèäÁèÁÕ\"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "¡ÓÅѧÍèÒ¹ hdlist file [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "äÁèÊÒÁÒö¹ÓÍØ»¡Ã³ì \"%s\" ÁÒãªéà¾ÃÒÐÇèÒäÁèÁÕ list file[%s]"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "à¡çºà©¾ÒÐ files referenced ã¹ provides"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "äÁèÊÒÁÒöÊÃéÒ§ synthesis file ÊÓËÃѺÍØ»¡Ã³ì \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "¾º %d header ã¹ cache"
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "¾ÂÒÂÒÁ·Õè¨ÐàÅ×Í¡ãªéÍØ»¡Ã³ì·ÕèäÁèÁÕ\"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "ËÅÕ¡àÅÕ觡ÒÃàÅ×Í¡ %s à¾ÃÒÐÇèÒÀÒÉÒ·éͧ¶Ôè¹ÂѧäÁèä´é¶Ù¡àÅ×Í¡"
+msgid "unable to update medium \"%s\"\n"
+msgstr "äÁèÊÒÁÒöá¡éä¢ÍØ»¡Ã³ì\"%s\"\n"
 
-#: po/placeholder.h:55
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"¡ÓÅѧÂéÒÂ%s à¾×èÍ upgrade...\n"
-"á¡è %s à¾ÃÒÐÇèÒÁѹäÁèÊÒÁÒö¶Ù¡á¡é㢴éÇÂÇÔ¸ÕÍ×è¹"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+#, fuzzy
+msgid "  -c             - clean headers cache directory.\n"
+msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "ÍØ»¡Ã³ì\"%s\"ÁÕÍÂÙèáÅéÇ"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "äÁèÊÒÁÒöà¢Õ¹ list file ¢Í§\"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "à¢Õ¹ config file[%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "äÁèÁÕ package ·Õèª×èÍ %s"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "ÊÃéÒ§ hdlist synthesis file ÊÓËÃѺ ÍØ»¡Ã³ì \"%s\""
-
-#: po/placeholder.h:64
-#, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "äÁèÊÒÁÒöËÒ synthesis file,¡ÓÅѧãªé parsehdlist server"
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "µéͧ¡Ò÷´ÅͧºÑ§¤ÑºµÔ´µÑé§ (--force)? (y/N)"
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "äÁèÊÒÁÒöËÒ hdlist file ÊÓËÃѺ\"%s\",medium ignored"
 
-#: po/placeholder.h:66
+#: po/placeholder.h:58 po/placeholder.h:248
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "ÊÃéÒ§ hdlist synthesis file ÊÓËÃѺ ÍØ»¡Ã³ì \"%s\""
+
+#: po/placeholder.h:59 po/placeholder.h:251
 msgid "urpmi database locked"
 msgstr ""
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (Y/n) "
+
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr "ºÒ§ package ¨ÐµéͧÁÕ¡ÒÃź·Ôé§à¾×èÍ·Ó¡Òà upgrade ÊÔ觹ÕéÂѧäÁèÁÕ¡ÒÃʹѺʹع \n"
+
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "¡ÓÅѧµÔ´µÑé§ %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr "äÁèÊÒÁÒö´ÙáÅÍØ»¡Ã³ì\"%s\"à¾ÃÒÐÇèÒ list file ä´é¶Ù¡ãªéâ´ÂÍØ»¡Ã³ìÍ×è¹áÅéÇ"
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "ÍèÒ¹ depslist file [%s]"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+#, fuzzy
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr " --group        - ¾ÔÁ¾ì tag group: group."
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "äÁèÊÒÁÒöÊÃéÒ§ÍØ»¡Ã³ì \"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "äÁèÁÕÍÐä÷Õè¨ÐàÍÒÍÍ¡(ãªé urpmi.addmedia à¾×èÍà¾ÔèÁÍØ»¡Ã³ì)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr " inputäÁè¶Ù¡µéͧ :[%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "ÁÕËÅÒ package ·ÕèÁÕª×èÍä¿ÅìàËÁ×͹¡Ñº \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "˹Öè§ã¹ Packages µèÍ仹Õéµéͧä´éÃѺ¡ÒõԴµÑé§ "
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "¡Ãسҡ´ enter àÁ×èÍàÊÃç¨ÊÔé¹"
 
-#: po/placeholder.h:74
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr "ÍØ»¡Ã³ì\"%s\"¾ÂÒÂÒÁàÅ×Í¡ãªéÍØ»¡Ã³ì·ÕèãªéáÅéÇ, medium ignored"
 
-#: po/placeholder.h:76
+#: po/placeholder.h:74 po/placeholder.h:448
 #, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "¡ÓÅѧÍèÒ¹¢éÍÁÙÅ[%s]"
+msgid "  -h             - print this help message.\n"
+msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "äÁèÊÒÁÒöãªé§Ò¹ hdlist file \"%s\", medium ignored"
+#: po/placeholder.h:75 po/placeholder.h:450
+#, fuzzy
+msgid "  -g             - print groups too with name.\n"
+msgstr " --group        - ¾ÔÁ¾ì tag group: group."
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "äÁèÊÒÁÒöŧ·ÐàºÕ¹ rpm file"
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "äÁèÊÒÁÒöµÃǨÊͺ list file ÊÓËÃѺ \"%s\", medium ignored"
+#: po/placeholder.h:78 po/placeholder.h:407
+#, fuzzy
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr " --group        - ¾ÔÁ¾ì tag group: group."
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
+#: po/placeholder.h:79 po/placeholder.h:454
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr "                  command line áµèäÁèÁÕª×èÍ package)"
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "list file äÁè»ÐµÔ´»ÐµèÍ \"%s\", medium ignored"
-
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "¡Ò÷ÓÊÓà¹Ò [%s] äÁèÊÓàÃç¨"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "äÁèÊÒÁÒöãªéËÅÑ¡á¡éä¢ãËé¶Ù¡µéͧ [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "äÁèÁÕ¡ÒÃá¡éä¢(use urpmi.addmedia à¾×èÍà¾ÔèÁÍØ»¡Ã³ì)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "ÍèÒ¹ depslist file [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "äÁèÊÒÁÒö parse hdlist file of \"%s\""
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-#, fuzzy
-msgid "...copying done"
-msgstr "¡ÓÅѧÍèÒ¹¢éÍÁÙÅ[%s]"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "äÁèÊÒÁÒöÊÃéÒ§ÍØ»¡Ã³ì \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "¡ÓÅѧÍèÒ¹ hdlist file [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "ÁÕ¢éͼԴ¾ÅÒ´ã¹ config file ºÃ÷Ѵ·Õè %s"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: µÑÇàÅ×Í¡äÁèÃÙé¨Ñ¡ \"-%s\",µÃǨÊͺ¡ÒÃãªé¨Ò¡ --help\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "¡ÒÃãªé: urpmi.removemedia [-a] <=ª×èÍ>..."
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "ÊÃéÒ§ hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "äÁèÊÒÁÒöÍèÒ¹ rpm file [%s] ¨Ò¡ \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "ŧ·ÐàºÕ¹ local package ÁÕ¢éͼԴ¾ÅÒ´"
-
-#: po/placeholder.h:99
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "äÁèÊÒÁÒöÍèÒ¹ rpm file [%s] ¨Ò¡ \"%s\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "¡ÓÅѧÍèÒ¹¢éÍÁÙÅ[%s]"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "ÍØ»¡Ã³ì·ÕèäÁèàª×èÍÁ¡Ñ¹ \"%s\" ¶Ù¡ÃкØÇèҶʹà»ÅÕè¹ä´éáµèÁѹäÁèãªè"
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "äÁèÁÕ¡ÒÃà¢Õ¹㹠list file ÊÓËÃѺ\"%s\""
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "äÁèÊÒÁÒöÊÃéÒ§ hdlist:%s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "ÍØ»¡Ã³ì \"%s\" äÁèä´é¶Ù¡àÅ×Í¡"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ª×èÍ rpm fileäÁè¶Ù¡µéͧ [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "¢éÍÁÙÅ·ÕèäÁèÃÙé¨Ñ¡ä´éàª×èÍÁµÔ´¡Ñº %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "¡ÓÅѧàÅÕ觡Ò÷ӧҹ¢Í§ÍØ»¡Ã³ì \"%s\""
+msgid "What is your choice? (1-%d) "
+msgstr "µéͧ¡ÒÃàÅ×Í¡ÍÐääÃѺ  (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "äÁèÊÒÁÒöãªé§Ò¹ list file ¢Í§ \"%s\", medium ignored"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "ËÅÕ¡àÅÕ觡ÒÃàÅ×Í¡ %s files à¾ÃÒÐÇèÒäÁèÁÕ files ¾Í·Õè¨Ð updated"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "äÁèÊÒÁÒöãªé§Ò¹ rpm file [%s]"
 
-#: po/placeholder.h:111
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"¡ÓÅѧź %s à¾×èÍ upgrade..\n"
-"ÊÓËÃѺ %s à¾ÃÒÐÇèÒÁѹäÁèÍÒ¨ upgrade ä´é¶Ù¡µéͧ!"
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "ÂéÒÂ %s ã¹ depslist"
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "¡ÒÃàÅ×Í¡äÁè¶Ù¡µéͧ ÅͧãËÁè¤ÃѺ\n"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "äÁèÊÒÁÒöãªéÍØ»¡Ã³ì\"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr "äÁèÊÒÁÒö parse ä´é¶Ù¡µéͧ [%s] ÊÓËÃѺ¤èÒ \"%s\""
+msgid "relocated %s entries in depslist"
+msgstr "ÂéÒÂ %s ã¹ depslist"
+
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "¾ÂÒÂÒÁ·Õè¨ÐàÅ×Í¡ãªéÍØ»¡Ã³ì·ÕèäÁèÁÕ\"%s\""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "packages µèÍ仹ÕéÁÕ %s: %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "äÁèÊÒÁÒö parse ä´é¶Ù¡µéͧ [%s] ÊÓËÃѺ¤èÒ \"%s\""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "äÁ辺 rpm files ¨Ò¡ [%s]"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "¡ÓÅѧÍèÒ¹ hdlist file [%s]"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "äÁèÊÒÁÒö¡Ó˹´ÍØ»¡Ã³ì´éÇ hdlist file ¹Õé [%s]"
+
+#: po/placeholder.h:119 po/placeholder.h:328
 #, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "ÂéÒÂ %s ã¹ depslist"
+msgid "  --help         - print this help message.\n"
+msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "·Ø¡ÍÂèÒ§ä´é¶Ù¡µÔ´µÑé§àÃÕºÃéÍÂáÅéÇ"
 
-#: po/placeholder.h:123 urpm.pm:1897
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
 #, fuzzy
-msgid "...retrieving done"
+msgid "retrieving rpms files..."
 msgstr "¡ÓÅѧÍèÒ¹¢éÍÁÙÅ[%s]"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "¡ÓÅѧàÅ×Í¡ %sãªé¢éÍÁÙÅ·ÕèàÅÔ¡ãªéáÅéÇ"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "˹Öè§ã¹ Packages µèÍ仹Õéµéͧä´éÃѺ¡ÒõԴµÑé§ "
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq:äÁèÊÒÁÒöÍèÒ¹ rpm file \"%s\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "¡ÒõԴµÑé§äÁèÊÓàÃç¨"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr "äÁèÊÒÁÒöãªé§Ò¹ list file ¢Í§ \"%s\", medium ignored"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr " --group        - ¾ÔÁ¾ì tag group: group."
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "àÅ×Í¡%sâ´ÂãªéÊÔ觷ÕèàÅ×Í¡ã¹ä¿Åì"
+msgid "unmounting %s"
+msgstr "¡ÓÅѧ¶Í´¶Í¹ %s"
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "¡ÓÅѧź %d header·ÕèÅéÒÊÁÑÂã¹ cache"
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "äÁ辺 hdlist file ÊÓËÃѺÍØ»¡Ã³ì\"%s\""
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "äÁèÁÕ¡ÒÃà¢Õ¹㹠list file ÊÓËÃѺ\"%s\""
+msgid "removing medium \"%s\""
+msgstr "¡ÓÅѧ·Ó¡ÒÃÂéÒÂÍÍ¡ÊÓËÃѺÍØ»¡Ã³ì·ÕèäÁèÁÕ\"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "äÁèÊÒÁÒöÊÃéÒ§ synthesis file ÊÓËÃѺÍØ»¡Ã³ì \"%s\""
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "¾ÂÒÂÒÁ·Õè¨ÐàÅ×Í¡ãªéÍØ»¡Ã³ì·ÕèäÁèÁÕ\"%s\""
+
+#: po/placeholder.h:144 po/placeholder.h:447
+#, fuzzy
+msgid "  -a             - select all non-removable media.\n"
+msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
+
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "äÁèÊÒÁÒö¡Ó˹´ÍØ»¡Ã³ì´éÇ hdlist file ¹Õé [%s]"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "ËÅÕ¡àÅÕ觡ÒÃàÅ×Í¡ %s à¾ÃÒÐÇèÒÀÒÉÒ·éͧ¶Ôè¹ÂѧäÁèä´é¶Ù¡àÅ×Í¡"
 
-#: po/placeholder.h:132
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "à¢Õ¹ config file[%s]"
+
+#: po/placeholder.h:150 po/placeholder.h:249
 #, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "äÁèÊÒÁÒöËÒ synthesis file,¡ÓÅѧãªé parsehdlist server"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "·Ø¡ÍÂèÒ§ä´é¶Ù¡µÔ´µÑé§àÃÕºÃéÍÂáÅéÇ"
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr "äÁèÊÒÁÒö´ÙáÅÍØ»¡Ã³ì\"%s\"à¾ÃÒÐÇèÒ list file ä´é¶Ù¡ãªéâ´ÂÍØ»¡Ã³ìÍ×è¹áÅéÇ"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "ÍèÒ¹ depslist file [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "äÁèÊÒÁÒöÊÃéÒ§ÍØ»¡Ã³ì \"%s\"\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "ÁÕËÅÒ package ·ÕèÁÕª×èÍä¿ÅìàËÁ×͹¡Ñº \"%s\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "à¾×èÍ·Õè¨Ðá¡é㢻ѭËÒ¡ÒÃà¢éҡѹä´é packages µèÍ仹Õé¨Ð¶Ù¡µÔ´µÑé§ (%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "¡ÓÅѧÍèÒ¹¢éÍÁÙÅ[%s]"
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: µÑÇàÅ×Í¡äÁèÃÙé¨Ñ¡ \"-%s\",µÃǨÊͺ¡ÒÃãªé¨Ò¡ --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "äÁèÊÒÁÒöãªé§Ò¹ hdlist file \"%s\", medium ignored"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "˹Öè§ã¹ Packages µèÍ仹Õéµéͧä´éÃѺ¡ÒõԴµÑé§ "
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "äÁèÊÒÁÒöŧ·ÐàºÕ¹ rpm file"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "äÁèÊÒÁÒöµÃǨÊͺ list file ÊÓËÃѺ \"%s\", medium ignored"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "list file äÁè»ÐµÔ´»ÐµèÍ \"%s\", medium ignored"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "¡ÒõԴµÑé§äÁèÊÓàÃç¨"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "¡Ò÷ÓÊÓà¹Ò [%s] äÁèÊÓàÃç¨"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+#, fuzzy
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "                  command line áµèäÁèÁÕª×èÍ package)"
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "äÁèÊÒÁÒö parse hdlist file of \"%s\""
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+#, fuzzy
+msgid "...copying done"
+msgstr "¡ÓÅѧÍèÒ¹¢éÍÁÙÅ[%s]"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "à¾×èÍ·Õè¨Ðá¡é㢻ѭËÒ¡ÒÃà¢éҡѹä´é packages µèÍ仹Õé¨Ð¶Ù¡µÔ´µÑé§ (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
+#: po/placeholder.h:180 po/placeholder.h:277
 #, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr " --group        - ¾ÔÁ¾ì tag group: group."
+msgid "copying hdlists file..."
+msgstr "¡ÓÅѧÍèÒ¹ hdlist file [%s]"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "ÁÕ¢éͼԴ¾ÅÒ´ã¹ config file ºÃ÷Ѵ·Õè %s"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "µéͧ¡Ò÷´ÅͧµÔ´µÑé§â´Â·ÕèäÁèµéͧµÃͨÊͺ¤ÇÒÁà¢éҡѹä´é? (y/N)"
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "ŧ·ÐàºÕ¹ local package ÁÕ¢éͼԴ¾ÅÒ´"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "äÁèÁÕ¡ÒÃà¢Õ¹㹠list file ÊÓËÃѺ\"%s\""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
+msgstr "äÁèÊÒÁÒöÊÃéÒ§ hdlist:%s"
+
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "ÍØ»¡Ã³ì \"%s\" äÁèä´é¶Ù¡àÅ×Í¡"
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "¡ÓÅѧàÅÕ觡Ò÷ӧҹ¢Í§ÍØ»¡Ã³ì \"%s\""
+
+#: po/placeholder.h:191 po/placeholder.h:355
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "µéͧ¡ÒÃàÅ×Í¡ÍÐääÃѺ  (1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "¡ÓÅѧµÔ´µÑé§ %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "¡ÃسÒãÊèÍØ»¡Ã³ì·ÕèÁÕª×èÍ \"%s\" ã¹ [%s]"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "packages µèÍ仹ÕéÁÕ %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
 #, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr "â»Ãá¡ÃÁ¹Õé¿ÃÕ áÅÐÊÒÁÒöᨡ¨èÒÂä´éÀÒÂãµéà§×è͹㢠GNUGPL."
+msgid "examining hdlist file [%s]"
+msgstr "¡ÓÅѧÍèÒ¹ hdlist file [%s]"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "µéͧ¡Ò÷´ÅͧºÑ§¤ÑºµÔ´µÑé§ (--force)? (y/N)"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "ÂéÒÂ %s ã¹ depslist"
 
-#: po/placeholder.h:171 po/placeholder.h:269
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "¡ÒÃàÅ×Í¡äÁè¶Ù¡µéͧ ÅͧãËÁè¤ÃѺ\n"
+#: po/placeholder.h:205 po/placeholder.h:445
+#, fuzzy
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr " --group        - ¾ÔÁ¾ì tag group: group."
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "äÁèÊÒÁÒöàÃÕ¡ source package,¡ÓÅѧ¡àÅÔ¡"
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+#, fuzzy
+msgid "...retrieving done"
+msgstr "¡ÓÅѧÍèÒ¹¢éÍÁÙÅ[%s]"
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "installing %s\n"
-msgstr "¡ÓÅѧµÔ´µÑé§ %s\n"
+msgid "selecting %s using obsoletes"
+msgstr "¡ÓÅѧàÅ×Í¡ %sãªé¢éÍÁÙÅ·ÕèàÅÔ¡ãªéáÅéÇ"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "¡ÃسÒãÊèÍØ»¡Ã³ì·ÕèÁÕª×èÍ \"%s\" ã¹ [%s]"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "äÁèÊÒÁÒöàÃÕ¡ source package,¡ÓÅѧ¡àÅÔ¡"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "àÅ×Í¡%sâ´ÂãªéÊÔ觷ÕèàÅ×Í¡ã¹ä¿Åì"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "¡Ãسҡ´ enter àÁ×èÍàÊÃç¨ÊÔé¹"
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "äÁèÁÕ¡ÒÃà¢Õ¹㹠list file ÊÓËÃѺ\"%s\""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "superuser à·èÒ¹Ñé¹·ÕèÁÕÊÔ·¸ÔµÔ´µÑé§ packages"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
 #, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "˹Öè§ã¹ Packages µèÍ仹Õéµéͧä´éÃѺ¡ÒõԴµÑé§ "
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"¡ÓÅѧÂéÒÂ%s à¾×èÍ upgrade...\n"
+"á¡è %s à¾ÃÒÐÇèÒÁѹäÁèÊÒÁÒö¶Ù¡á¡é㢴éÇÂÇÔ¸ÕÍ×è¹"
+
+#: po/placeholder.h:296
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"¡ÓÅѧź %s à¾×èÍ upgrade..\n"
+"ÊÓËÃѺ %s à¾ÃÒÐÇèÒÁѹäÁèÍÒ¨ upgrade ä´é¶Ù¡µéͧ!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr "â»Ãá¡ÃÁ¹Õé¿ÃÕ áÅÐÊÒÁÒöᨡ¨èÒÂä´éÀÒÂãµéà§×è͹㢠GNUGPL."
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -806,7 +969,7 @@ msgstr ""
 "%s\n"
 "äÁ辺<ÅÙè·Ò§·Õèà¡ÕèÂÇ¢éͧ¢Í§hdlist>\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -828,17 +991,7 @@ msgstr ""
 "       http://<host>/<path> with <relative filename of hdlist>\n"
 "       removable_<device>://<path>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "äÁèÊÒÁÒöÊÃéÒ§ÍØ»¡Ã³ì \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "äÁèÊÒÁÒöá¡éä¢ÍØ»¡Ã³ì\"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -846,12 +999,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -860,17 +1008,7 @@ msgstr ""
 "%s\n"
 "äÁ辺<ÅÙè·Ò§·Õèà¡ÕèÂÇ¢éͧ¢Í§hdlist>\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr " --group        - ¾ÔÁ¾ì tag group: group."
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr " --group        - ¾ÔÁ¾ì tag group: group."
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -879,55 +1017,7 @@ msgstr ""
 "%s\n"
 " `with' äÁ辺ÊÓËÃѺÍØ»¡Ã³ì ftp\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-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"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr "¢Ò´¢éÍÁÙÅ·Õè¨Ð¹Óä» update(˹Öè§ã¹ %s)\n"
-
-#: po/placeholder.h:234
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr " --group        - ¾ÔÁ¾ì tag group: group."
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "äÁèÁÕ¡ÒÃá¡éä¢(use urpmi.addmedia à¾×èÍà¾ÔèÁÍØ»¡Ã³ì)\n"
-
-#: po/placeholder.h:236
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "äÁèÁÕÍÐä÷Õè¨ÐàÍÒÍÍ¡(ãªé urpmi.addmedia à¾×èÍà¾ÔèÁÍØ»¡Ã³ì)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -936,12 +1026,7 @@ msgstr ""
 "äÁèÁÕ¢éÍÁÙÅ·Õè¨Ð·Ó¡ÒÃàÍÒÍÍ¡\n"
 "(˹Öè§ã¹ %s)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -953,35 +1038,26 @@ msgstr ""
 "\n"
 "µÑÇàÅ×Í¡·ÕèäÁèÃÙé¨Ñ¡ '%s'\n"
 
-#: po/placeholder.h:252
-#, fuzzy
-msgid "  -h             - print this help message.\n"
-msgstr " --all          - ¾ÔÁ¾ì tag ·Ñé§ËÁ´"
-
-#: po/placeholder.h:254
+#: po/placeholder.h:429
 #, fuzzy
-msgid "  -g             - print groups too with name.\n"
-msgstr " --group        - ¾ÔÁ¾ì tag group: group."
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq:äÁèÊÒÁÒöÍèÒ¹ rpm file \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\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"
 
-#: po/placeholder.h:258
-#, fuzzy
-msgid "  -r             - print version and release too with name.\n"
-msgstr "                  command line áµèäÁèÁÕª×èÍ package)"
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr "¢Ò´¢éÍÁÙÅ·Õè¨Ð¹Óä» update(˹Öè§ã¹ %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -991,43 +1067,12 @@ msgid ""
 "usage:\n"
 msgstr "â»Ãá¡ÃÁ¹Õé¿ÃÕ áÅÐÊÒÁÒöᨡ¨èÒÂä´éÀÒÂãµéà§×è͹㢠GNUGPL."
 
-#: po/placeholder.h:266
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                  command line áµèäÁèÁÕª×èÍ package)"
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr "ºÒ§ package ¨ÐµéͧÁÕ¡ÒÃź·Ôé§à¾×èÍ·Ó¡Òà upgrade ÊÔ觹ÕéÂѧäÁèÁÕ¡ÒÃʹѺʹع \n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: µÑÇàÅ×Í¡äÁèÃÙé¨Ñ¡ \"-%s\",µÃǨÊͺ¡ÒÃãªé¨Ò¡ --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1071,18 +1116,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "¡ÒÃãªé: urpmi.update [-a] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "¡ÒÃãªé: urpmi.removemedia [-a] <=ª×èÍ>..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "¡ÒÃãªé: urpmi.removemedia [-a] <=ª×èÍ>..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "¡ÒÃãªé: urpmi.update [-a] <name> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/tr.po b/po/tr.po
index 0edff524..432c34bb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-12-09 21:39+0200\n"
 "Last-Translator: Ömer Fadýl USTA <omer_fad@hotmail.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -29,27 +29,31 @@ msgstr ""
 "Otomatik paket kurulumu...\n"
 "$rpm paketinin kurulmasýný istemiþtiniz.\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Tamam mý?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Tamam"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Ýptal"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "HhNn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "EeYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (E/h) "
 
@@ -57,646 +61,740 @@ msgstr " (E/h) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: komut bulunamadý\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf sürüm %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Telif Hakký (C) 1999,2000,2001 MandrakeSoft"
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 "Bu bir serbest yazýlýmdýr ve GNU GPL Lisansý altýnda tekrar daðýtýlabilir."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "Kullanýmý: urpmf [seçenekler] <dosya>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet          etiket isimlerini göstermez (etiket girilmediði sürece "
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    öntanýmlýdýr , etkileþimli kiple uyumsuzdur)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - tüm etiketler gösterilir."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - isim: rpm dosyaismi etiketi gösterilir (paket ismi "
 "olmaksýzýn"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    verilmezse etiket varsayýlýr)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - grup: grup etiketini gösterir."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - boyut: boyut etiketi gösterilir."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - seri no: seri no. etiketi gösterilir."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - özet: özet etiketi gösterilir."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  -description    - açýklama: açýklama etiketi gösterilir."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 #, fuzzy
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr "  --provides      - saðlar: saðlananlar etiketini gösterir."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr "  --requires      - gerekli: gerekenler etiketini gösterir."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files         - dosyalar: tüm dosyalar etiketlerini gösterir."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr "  --conflicts     - çeliþkiler: tüm çeliþenler etiketleri gösterilir."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr "  --obsoletes     - süprüntü: tüm eskiler etiketleri gösterilir."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 "  --prereqs       - öngerekli: tüm önceden gereklilikler etiketleri "
 "gösterilir."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "Ayrýntýlý bilgi için 'urpmf --help' yazýnýz"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "yapýlandýrma dosyasýna [%s] yazýlamýyor"
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr "rpm dosyalarý ele alýnýyor"
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  -v             - kalabalýk kipi.\n"
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Farklý %s çýkarýlabilir aygýtlarý %s için  kullanýlýyor"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "\"%s\" için liste dosyasý bulunamýyor, ortam yoksayýlýyor"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "\"%s\" için liste dosyasýna hiç bir þey yazýlmadý"
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "\"%s\" için liste dosyasý bulunamýyor, ortam yoksayýlýyor"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "\"%s\" sabit disk listesi dosyasý ayrýþtýrýlamýyor"
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "\"%s\" için liste dosyasýna hiçbir þey yazýlmamýþ"
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - Ýndirmeye baþlamadan önce tüm kaynak paketleri yolla.\n"
+"                   (Sadece root için geçerlidir).\n"
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+"  --auto-select  - Sistemi güncellemek için Otomatikmen paketler seç.\n"
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, fuzzy, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "Açýklama dosyasý ele alýnýyor..."
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "\"%s\" liste dosyasýna eriþilemiyor, ortam yoksayýldý"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "%s paketi bulunamadý."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "%s ayrýlýyor"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "arabellekteki %d eski baþlýk kaldýrýlýyor"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "\"%s\" için sabit disk listesi dosyasý bulunamadý"
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 "\"%s\" kullanýmda ki sabit disk listesini kullanmaya çalýþýyor, yoksayýldý"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "sabit disk listesi dosyasý [%s] okunuyor"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, 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"
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "olmayan \"%s\" kaldýrýlmaya çalýþýlýyor"
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "sabit disk listesi dosyasý [%s] okunuyor"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "\"%s\" liste dosyasý [%s] olmadýðýndan hesap içine alýnamýyor"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "sadece saðlananlarda ki dosyalar tutuluyor"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "\"%s\" için sentezleme dosyasý kurgulanamýyor"
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "arabellekte %d baþlýk bulundu"
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "olmayan \"%s\" seçilmeye çalýþýlýyor"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "yerel dil seçilmediðinden %s seçimi önleniyor"
+msgid "unable to update medium \"%s\"\n"
+msgstr "\"%s\" güncellenemiyor\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"%s %s güncellemesi için kaldýrýlýyor...\n"
-"  Aksi takdirde, güncelleme yapýlamayacak."
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - 'baþlýk cache'lerin bulunduðu dizini temizle.\n"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "\"%s\" zaten var"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "\"%s\" liste dosyasý yazýlamýyor"
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "yapýlandýrma dosyasý [%s] yazýlýyor"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
+"  komut satýrýndan isimleri veya rpm dosyalarý verilenler sorgulandý.\n"
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "%s adýnda bir paket yok"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Belki daha zorlayýcý bir seçenek gerekebilir (--force)? (e/H) "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, 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ý"
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "\"%s\" için sabit disk listesi sentezleme dosyasý kurgulanýyor"
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "tüm sentez dosyalarý bulunamadý, parsehdlist sunucusu kullanýlýyor"
+msgid " (y/N) "
+msgstr " (E/h) "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, 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ý"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - komut satýrýndakilere uyanlarýn tümünü seçer. \n"
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+#, fuzzy
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
+"bazý paketler güncellendiðinden kaldýrýlmýþ olabilir, henüz bu "
+"desteklenmiyor\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "%s baðlanýyor"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"liste dosyasý baþka ortam tarafýndan kullanýldýðýndan \"%s\" ile "
-"çalýþýlamýyor"
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "sentez dosyasý [%s] okunuyor"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f              - hdlist dosyalarýný oluþum için zorla.\n"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget'ta baþarýsýzlýk : %d ile veya %d sinyali ile çýkýldý.\n"
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "\"%s\" ayrýlabilir aygýtý için yolismi ele alýnamadý"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+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"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "bozuk girdi: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr "  -u             - daha iyi bir sürümü yüklü ise paketi kaldýr.\n"
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "ayný \"%s\" isminde çok sayýda rpm paketi var."
+msgid "One of the following packages is needed to install %s:"
+msgstr "%s kurulumu için aþaðýdaki paketlerin biri gerekli:"
 
-#: po/placeholder.h:74
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Bittiði zaman enter tuþuna basýn..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr "\"%s\" kullanýmda olan listeyi kullanmaya çalýþýyor, yoksayýldý."
 
-#: po/placeholder.h:76
-#, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "rpm dosyalarý ele alýnýyor"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr "  -h             - bu yardým mesajýný yazar.\n"
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "\"%s\" sabit disk listesi dosyasýna eriþilemiyor, ortam yoksayýldý"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr "  -g             - isminin yanýnda gruplarýda yazar.\n"
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "rpm dosyasý sicil kaydý yapýlamýyor"
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - tüm kaldýrýlamaz medyalarý seçer.\n"
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "\"%s\" için liste dosyasý denetlenemiyor, ortam yoksayýldý"
-
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "\"%s\" çýkarýlabilir medyasý için çok bazla baðlantý noktasý tanýmlý"
+#: po/placeholder.h:78 po/placeholder.h:407
+#, fuzzy
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  -f              - hdlist dosyalarýný oluþum için zorla.\n"
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr ""
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
+msgstr "  -r             - isminin yanýda sürüm numarasýnýda yazar.\n"
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "\"%s\" için liste dosyasý tutarsýz, ortam yoksayýldý"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - isminin yanýnda sürüm ve kurnazlýðýný yazar.\n"
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "[%s] kopyalamasý baþarýsýz"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
+"  --auto         - Otomatikmen seçenekler arasýndan güzel paketleri seç.\n"
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "[%s] doðru olarak ayrýþtýrýlamýyor"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+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"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
 msgid "read synthesis file [%s]"
 msgstr "sentez dosyasý [%s] okunuyor"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "\"%s\" sabit disk listesi dosyasý ayrýþtýrýlamýyor"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 #, fuzzy
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "webfetch (curl veya wget örneðin) bulunamadý\n"
 
-#: po/placeholder.h:89
-#, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "hdlistteki kaynak tekrar ele alýnýyor ..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
+msgstr ""
+"  -c             - istenilen kapanmayý çözmek için komple methodu seçin.\n"
 
-#: po/placeholder.h:90
-#, fuzzy
-msgid "...copying done"
-msgstr "...ele alma tamamlandý"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "\"%s\" oluþturulamýyor\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, fuzzy, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "hdlistteki kaynak tekrar ele alýnýyor ..."
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "sabit disk listesi dosyasý [%s] okunuyor"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, 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 "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: \"-%s\" anlaþýlamayan parametre, ayrýntýlý bilgi için --help\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "kullanýmý: urpmi.removemedia [-a] <isim> ..."
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "sabit disk listesi [%s] kurgulanýyor"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "rpm dosyasý [%s] \"%s\" ortamýndan okunamýyor"
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+#, fuzzy
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr "  --update       - sadecene güncellenecek medya'yý kullan.\n"
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "rpm dosyasý [%s] \"%s\" ortamýndan okunamýyor"
+
+#: po/placeholder.h:97 po/placeholder.h:282
 #, fuzzy
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "hdlistteki kaynak tekrar ele alýnýyor ..."
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "yerel paketlerin sicil kaydý yapýlýrken hata"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "\"%s\" çýkarýlabilir aygýt olarak alýndý."
-
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...ele alma baþarýsýz: [%s]"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, 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"
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "Açýklama dosyasý ele alýnýyor..."
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "sabit disk listesi kurgulanamýyor: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "\"%s\" seçilmedi"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "rpm dosya ismi [%s] geçersiz"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "%s ile iliþkili veri bilinmiyor"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "varolan \"%s\" ortamý atlanmaya çalýþýlýrken engelleniyor"
+msgid "What is your choice? (1-%d) "
+msgstr "Seçiminiz? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "\"%s\" liste dosyasýna eriþilemiyor, ortam yoksayýldý"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - uzaktaki dosyalarý ele almak için wget kullan.\n"
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "güncellenecek dosyalarýn yetersizliðinden %s seçimi engelleniyor"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm dosyasýna [%s] eriþilemiyor"
 
-#: po/placeholder.h:111
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Üzgünüm ,Hatalý seçim, tekrar deneyin\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"%s %s güncellemesi için kaldýrýlýyor...\n"
-"  Yoksa doðru olarak güncelleme yapýlamayacak."
+msgid "unable to access medium \"%s\""
+msgstr "\"%s\" ortamýna eriþilemiyor"
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "baðýmlýlýklar listesinde ki %s girdileri yeniden konumlanýyor"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - uzak dosyalarý denemek için curl kullan.\n"
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "\"%s\" ortamýna eriþilemiyor"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "olmayan \"%s\" seçilmeye çalýþýlýyor"
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr "[%s] (\"%s\" deðerinde ki) düzgün ayrýþtýrýlamýyor"
 
-#: po/placeholder.h:118
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "olmayan \"%s\" seçilmeye çalýþýlýyor"
+msgid "no rpm files found from [%s]"
+msgstr "[%s] de rpm dosyalarý yok"
+
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr "curl kayýp\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Bu paketler %s içeriyor: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "bu sabit disk listesi dosyasýnýn [%s] ortamý saptanamýyor"
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - bu mesajý görüntüler.\n"
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "herþey zaten kurulu"
 
-#: po/placeholder.h:120
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr "rpm dosyalarý ele alýnýyor"
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] de rpm dosyalarý yok"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "Farklý %s çýkarýlabilir aygýtlarý %s için  kullanýlýyor"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "sabit disk listesi dosyasý [%s] okunuyor"
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Aþaðýdaki paketlerden birine ihtiyaç var:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: \"%s\" isimli rpm dosyasý okunamýyor.\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Kurulum baþarýsýz oldu"
 
-#: po/placeholder.h:122 urpm.pm:1191
+#: po/placeholder.h:132 po/placeholder.h:224
 #, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "baðýmlýlýklar listesinde ki %s girdileri yeniden konumlanýyor"
+msgid "unable to access first installation medium"
+msgstr "\"%s\" liste dosyasýna eriþilemiyor, ortam yoksayýldý"
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
-msgstr "...ele alma tamamlandý"
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -p             - paketi bulmak için aramaya izin ver.\n"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "modasý geçenleri kullanan %s seçiliyor"
+msgid "unmounting %s"
+msgstr "%s ayrýlýyor"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl baþarýsýz: %d ile veya %d sinyali ile çýkýldý\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "arabellekteki %d eski baþlýk kaldýrýlýyor"
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "dosyalarda ki seçimlere göre %s seçiliyor"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "\"%s\" için sabit disk listesi dosyasý bulunamadý"
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
-msgstr "curl kayýp\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
 
-#: po/placeholder.h:128
-#, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "hdlistteki kaynak tekrar ele alýnýyor ..."
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - kalabalýk kipi.\n"
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr "wget kayýp\n"
+#: po/placeholder.h:141 po/placeholder.h:233
+#, fuzzy, c-format
+msgid "removing medium \"%s\""
+msgstr "olmayan \"%s\" kaldýrýlmaya çalýþýlýyor"
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "bu sabit disk listesi dosyasýnýn [%s] ortamý saptanamýyor"
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "\"%s\" için sentezleme dosyasý kurgulanamýyor"
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - bu mesajý görüntüler.\n"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "olmayan \"%s\" seçilmeye çalýþýlýyor"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "herþey zaten kurulu"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - tüm kaldýrýlamaz medyalarý seçer.\n"
+
+#: po/placeholder.h:145 po/placeholder.h:354
+#, fuzzy
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr ""
+"  komut satýrýndan isimleri veya rpm dosyalarý verilenler sorgulandý.\n"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: \"-%s\" seçeneði bilinmiyor, ayrýntýlý bilgi için --help\n"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "yerel dil seçilmediðinden %s seçimi önleniyor"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  -v             - kalabalýk kipi.\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Aþaðýdaki paketlerden birine ihtiyaç var:"
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "yapýlandýrma dosyasý [%s] yazýlýyor"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - sadecene güncellenecek medya'yý kullan.\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "tüm sentez dosyalarý bulunamadý, parsehdlist sunucusu kullanýlýyor"
 
-#: po/placeholder.h:138 urpmi:321
+#: po/placeholder.h:151 po/placeholder.h:413
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
-"Kurulum baþarýsýzlýkla sonuçlandý. Bazý dosyalar kayýp.\n"
-"Urpmi veritabanýnýzý güncellemek isteyebilirsiniz"
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --auto         - Otomatikmen seçenekler arasýndan güzel paketleri seç.\n"
+"liste dosyasý baþka ortam tarafýndan kullanýldýðýndan \"%s\" ile "
+"çalýþýlamýyor"
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Kurulum baþarýsýz oldu"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "sentez dosyasý [%s] okunuyor"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "\"%s\" ayrýlabilir aygýtý için yolismi ele alýnamadý"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "ayný \"%s\" isminde çok sayýda rpm paketi var."
 
-#: po/placeholder.h:145 po/placeholder.h:270
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
 msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --auto-select  - Sistemi güncellemek için Otomatikmen paketler seç.\n"
+"Baðýmlýlýk sorununu aþabilmek için, aþaðýdaki paketlerin de kurulmasý "
+"gerekiyor (%d Mb)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "rpm dosyalarý ele alýnýyor"
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: \"-%s\" seçeneði bilinmiyor, ayrýntýlý bilgi için --help\n"
+
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "\"%s\" sabit disk listesi dosyasýna eriþilemiyor, ortam yoksayýldý"
+
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "rpm dosyasý sicil kaydý yapýlamýyor"
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "\"%s\" için liste dosyasý denetlenemiyor, ortam yoksayýldý"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "\"%s\" çýkarýlabilir medyasý için çok bazla baðlantý noktasý tanýmlý"
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "\"%s\" için liste dosyasý tutarsýz, ortam yoksayýldý"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - sadecene güncellenecek medya'yý kullan.\n"
+
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "[%s] kopyalamasý baþarýsýz"
 
-#: po/placeholder.h:147
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - paket baðýmlýlýklarý için sorguyu geniþlet.\n"
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "\"%s\" sabit disk listesi dosyasý ayrýþtýrýlamýyor"
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, fuzzy, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "hdlistteki kaynak tekrar ele alýnýyor ..."
+
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - X arayüzünü kullan.\n"
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+#, fuzzy
+msgid "...copying done"
+msgstr "...ele alma tamamlandý"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -705,124 +803,196 @@ msgstr ""
 "Baðýmlýlýk sorununu aþabilmek için, aþaðýdaki paketlerin de kurulmasý "
 "gerekiyor (%d Mb)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
+#: po/placeholder.h:180 po/placeholder.h:277
 #, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -p             - paketi bulmak için aramaya izin ver.\n"
+msgid "copying hdlists file..."
+msgstr "sabit disk listesi dosyasý [%s] okunuyor"
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, 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ý"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Paket baðýmlýlýklarýný denetlemeksizin kurulum denensin mi (e/H) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-#, fuzzy
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr "  --update       - sadecene güncellenecek medya'yý kullan.\n"
-
-#: po/placeholder.h:152
-msgid ""
-"  --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"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "yerel paketlerin sicil kaydý yapýlýrken hata"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - kalabalýk kipi.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "\"%s\" çýkarýlabilir aygýt olarak alýndý."
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - paketi bulmak için aramaya izin ver.\n"
 
-#: po/placeholder.h:158
-#, fuzzy
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-"  komut satýrýndan isimleri veya rpm dosyalarý verilenler sorgulandý.\n"
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - Sessiz kipi.\n"
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "Açýklama dosyasý ele alýnýyor..."
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Seçiminiz? (1-%d) "
+msgid "unable to build hdlist: %s"
+msgstr "sabit disk listesi kurgulanamýyor: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - uzaktaki dosyalarý ele almak için wget kullan.\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "\"%s\" seçilmedi"
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"urpmi sürüm %s\n"
-"TelifHakký (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Bu bir serbest yazýlýmdýr ve GNU GPL Lisansý altýnda tekrar daðýtýlabilir."
-"kullanýmý :\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "varolan \"%s\" ortamý atlanmaya çalýþýlýrken engelleniyor"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Belki daha zorlayýcý bir seçenek gerekebilir (--force)? (e/H) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - Sessiz kipi.\n"
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - bazý paketlerin bulunamama durumda bile iþlemin\n"
 "                   devamýna zorla.\n"
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Üzgünüm ,Hatalý seçim, tekrar deneyin\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - komut satýrýndakilere uyanlarýn tümünü seçer. \n"
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - uzak dosyalarý denemek için curl kullan.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "%s kuruluyor\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lütfen \"%s\" isimli ortamý [%s] aygýtýna yerleþtirin"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Bu paketler %s içeriyor: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "sabit disk listesi dosyasý [%s] okunuyor"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "baðýmlýlýklar listesinde ki %s girdileri yeniden konumlanýyor"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+#, fuzzy
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - sadecene güncellenecek medya'yý kullan.\n"
+
+#: po/placeholder.h:205 po/placeholder.h:445
+#, fuzzy
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  -f              - hdlist dosyalarýný oluþum için zorla.\n"
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "Kaynak paketleri alýnamadý, çýkýlýyor"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Bittiði zaman enter tuþuna basýn..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr "...ele alma tamamlandý"
+
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "modasý geçenleri kullanan %s seçiliyor"
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl baþarýsýz: %d ile veya %d sinyali ile çýkýldý\n"
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "dosyalarda ki seçimlere göre %s seçiliyor"
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "hdlistteki kaynak tekrar ele alýnýyor ..."
+
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 msgid "Only superuser is allowed to install packages"
 msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr "wget kayýp\n"
+
+#: po/placeholder.h:240
 #, 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 ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"%s %s güncellemesi için kaldýrýlýyor...\n"
+"  Aksi takdirde, güncelleme yapýlamayacak."
+
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"%s %s güncellemesi için kaldýrýlýyor...\n"
+"  Yoksa doðru olarak güncelleme yapýlamayacak."
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Kurulum baþarýsýzlýkla sonuçlandý. Bazý dosyalar kayýp.\n"
+"Urpmi veritabanýnýzý güncellemek isteyebilirsiniz"
+
+#: po/placeholder.h:348
+msgid ""
+"  --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"
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"urpmi sürüm %s\n"
+"TelifHakký (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"Bu bir serbest yazýlýmdýr ve GNU GPL Lisansý altýnda tekrar daðýtýlabilir."
+"kullanýmý :\n"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -831,7 +1001,7 @@ msgstr ""
 "%s\n"
 "<hdlist'in göreli dosyaismi> eksik\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -852,17 +1022,7 @@ msgstr ""
 "       http://<sunucu>/<dosyaYolu> with <hdlist'in göreli dosyaismi>\n"
 "       kaldýrýlabilir_<aygýt>://<dosyaYolu>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "\"%s\" oluþturulamýyor\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "\"%s\" güncellenemiyor\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -872,11 +1032,7 @@ msgstr ""
 "\n"
 "bilinmeyen seçenek '%s'\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - 'baþlýk cache'lerin bulunduðu dizini temizle.\n"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -885,16 +1041,7 @@ msgstr ""
 "%s\n"
 "<hdlist'in göreli dosyaismi> eksik\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f              - hdlist dosyalarýný oluþum için zorla.\n"
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  -f              - hdlist dosyalarýný oluþum için zorla.\n"
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -903,57 +1050,7 @@ msgstr ""
 "%s\n"
 "ftp için `with' kelimesini de kullanýn\n"
 
-#: po/placeholder.h:216
-#, fuzzy
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - sadecene güncellenecek medya'yý kullan.\n"
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-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"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, 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"
-
-#: po/placeholder.h:234
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  -f              - hdlist dosyalarýný oluþum için zorla.\n"
-
-#: po/placeholder.h:235 urpmi.update:57
-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"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - tüm kaldýrýlamaz medyalarý seçer.\n"
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-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"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -962,12 +1059,7 @@ msgstr ""
 "Silme için girdi eksik\n"
 "(bunlardan biri %s)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - tüm kaldýrýlamaz medyalarý seçer.\n"
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -976,33 +1068,24 @@ msgstr ""
 "kullanýmý: urpmi.update [seçenekler] <isim> ...\n"
 "  <isim>      güncellenecek medyanýn ismidir.\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr "  -h             - bu yardým mesajýný yazar.\n"
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr "  -g             - isminin yanýnda gruplarýda yazar.\n"
+#: po/placeholder.h:429
+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"
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: \"%s\" isimli rpm dosyasý okunamýyor.\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  komut satýrýndan isimleri veya rpm dosyalarý verilenler sorgulandý.\n"
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr "  -r             - isminin yanýda sürüm numarasýnýda yazar.\n"
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - isminin yanýnda sürüm ve kurnazlýðýný yazar.\n"
+"Güncelleme için girdi eksik\n"
+"(bunlardan biri %s)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1016,38 +1099,7 @@ msgstr ""
 "Bu bir serbest yazýlýmdýr ve GNU GPL Lisansý altýnda tekrar daðýtýlabilir.\n"
 "Kullanýmý:\n"
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - paket baðýmlýlýklarý için sorguyu geniþlet.\n"
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - Ýndirmeye baþlamadan önce tüm kaynak paketleri yolla.\n"
-"                   (Sadece root için geçerlidir).\n"
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-"  -c             - istenilen kapanmayý çözmek için komple methodu seçin.\n"
-
-#: po/placeholder.h:271 urpmq:137
-#, fuzzy
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"bazý paketler güncellendiðinden kaldýrýlmýþ olabilir, henüz bu "
-"desteklenmiyor\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: \"-%s\" anlaþýlamayan parametre, ayrýntýlý bilgi için --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
@@ -1056,11 +1108,6 @@ msgstr ""
 "                   standart çýktýya(monitör) aç(yönlendir)(sadece root "
 "için)\n"
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr "  -u             - daha iyi bir sürümü yüklü ise paketi kaldýr.\n"
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1103,17 +1150,17 @@ msgstr ") . _("
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "kullanýmý: urpmi.update [seçenekler] <isim> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "kullanýmý: urpmi.removemedia [-a] <isim> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "kullanýmý: urpmi.removemedia [-a] <isim> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "kullanýmý: urpmi.update [seçenekler] <isim> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/uk.po b/po/uk.po
index 95a6c6bd..e912df55 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2000-06-16 08:10+09:00\n"
 "Last-Translator: Dmytro Koval'ov <kov@tokyo.email.ne.jp>\n"
 "Language-Team: Ukrainian\n"
@@ -24,27 +24,31 @@ msgid ""
 "You requested installation of package $rpm\n"
 msgstr ""
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "÷¦ÒÎÏ?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "ôÁË"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "÷¦ÄͦÎÉÔÉ"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "îÎNn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "ôÔYy"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (ô/Î) "
 
@@ -52,618 +56,705 @@ msgstr " (ô/Î) "
 msgid "$rpm: command not found\n"
 msgstr ""
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr ""
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr ""
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr ""
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "ÎÅÍÁ¤ ÐÁËÅÔÕ Ú ÎÁÚ×ÏÀ %s\n"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "óÐÒÏÂÕ×ÁÔÉ ÐÒÉÍÕÓÏ×Õ ÕÓÔÁÎÏ×ËÕ (--force)? (Ô/î) "
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "×ÉÂÏÒËÁ ÄÁÎÉÈ Ú ÂÁÚÉ ÄÁÎÉÈ rpm ÎÅÕÓЦÛÎÁ\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "×ÓÔÁÎÏ×ÌÀÀ %s\n"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (ô/Î) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, c-format
-msgid "examining synthesis file [%s]"
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "×ÓÔÁÎÏ×ÌÀÀ %s\n"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "ðÏÔÒ¦ÂÅÎ ÏÄÉÎ ¦Ú ÎÁÓÔÕÐÎÉÈ ÐÁËÅÔ¦×:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "îÁÔÉÓΦÔØ Enter ЦÓÌÑ ÚÁ˦ÎÞÅÎÎÑ..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr ""
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:1421
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
-msgid "unable to analyse synthesis data of %s"
+msgid "read synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"×ÉËÏÒÉÓÔÁÎÎÑ: urpmi [-h] [--auto] [--force] [-a] ÎÁÚ×Á_ÐÁËÅÔÕ "
+"[ÎÁÚ×É_ÐÁËÅÔ¦×...]\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "÷ÁÛ ×ɦÒ? (1-%d) "
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "unable to build hdlist: %s"
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "îÅצÒÎÉÊ ×ɦÒ, ÓÐÒÏÂÕÊÔÅ ÝÅ ÒÁÚ\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unknown data associated with %s"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "×ÓÅ ×ÖÅ ×ÓÔÁÎÏ×ÌÅÎÏ"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "ðÏÔÒ¦ÂÅÎ ÏÄÉÎ ¦Ú ÎÁÓÔÕÐÎÉÈ ÐÁËÅÔ¦×:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "õÓÔÁÎÏ×ËÁ ÎÅÕÓЦÛÎÁ"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr ""
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr " 㦠ÐÁËÅÔÉ Í¦ÓÔÑÔØ × ÓϦ %s: %s\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:121
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
-#, c-format
-msgid "selecting %s using obsoletes"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "×ÓÅ ×ÖÅ ×ÓÔÁÎÏ×ÌÅÎÏ"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"îÁÓÔÕÐΦ ÐÁËÅÔÉ ÂÕÄÕÔØ ×ÓÔÁÎÏ×ÌÅΦ ÄÌÑ ÔÏÇÏ, ÝÏ ÚÁÄÏ×ÏÌØÎÉÔÉ ÚÁÌÅÖÎÏÓÔ¦  (%"
+"d íâ)"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "ðÏÔÒ¦ÂÅÎ ÏÄÉÎ ¦Ú ÎÁÓÔÕÐÎÉÈ ÐÁËÅÔ¦×:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "õÓÔÁÎÏ×ËÁ ÎÅÕÓЦÛÎÁ"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -672,260 +763,248 @@ msgstr ""
 "îÁÓÔÕÐΦ ÐÁËÅÔÉ ÂÕÄÕÔØ ×ÓÔÁÎÏ×ÌÅΦ ÄÌÑ ÔÏÇÏ, ÝÏ ÚÁÄÏ×ÏÌØÎÉÔÉ ÚÁÌÅÖÎÏÓÔ¦  (%"
 "d íâ)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr ""
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "óÐÒÏÂÕ×ÁÔÉ ÕÓÔÁÎÏ×ËÕ ÂÅÚ ÐÅÒÅצÒËÉ ÚÁÌÅÖÎÏÓÔÅÊ? (Ô/î) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "÷ÁÛ ×ɦÒ? (1-%d) "
-
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "óÐÒÏÂÕ×ÁÔÉ ÐÒÉÍÕÓÏ×Õ ÕÓÔÁÎÏ×ËÕ (--force)? (Ô/î) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "îÅצÒÎÉÊ ×ɦÒ, ÓÐÒÏÂÕÊÔÅ ÝÅ ÒÁÚ\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "×ÓÔÁÎÏ×ÌÀÀ %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "÷ÓÔÁ×ÔÅ ÂÕÄØ-ÌÁÓËÁ %s Ð¦Ä ÎÁÚ×ÏÀ %s"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr ""
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr " 㦠ÐÁËÅÔÉ Í¦ÓÔÑÔØ × ÓϦ %s: %s\n"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "îÁÔÉÓΦÔØ Enter ЦÓÌÑ ÚÁ˦ÎÞÅÎÎÑ..."
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
 msgstr ""
-"÷ÓÔÁÎÏ×ÌÀ×ÁÔÉ ÌÏËÁÌØΦ ÐÁËÅÔÉ ÄÏÚ×ÏÌÅÎÏ Ô¦ÌØËÉ ÓÉÓÔÅÍÎÏÍÕ ÁÄͦΦÓÔÒÁÔÏÒÕ"
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "ðÏÔÒ¦ÂÅÎ ÏÄÉÎ ¦Ú ÎÁÓÔÕÐÎÉÈ ÐÁËÅÔ¦×:"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
-#, c-format
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:187
-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"
-"and [options] are from\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
-#: urpmi.addmedia:57
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:211 po/placeholder.h:313
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
 msgstr ""
+"÷ÓÔÁÎÏ×ÌÀ×ÁÔÉ ÌÏËÁÌØΦ ÐÁËÅÔÉ ÄÏÚ×ÏÌÅÎÏ Ô¦ÌØËÉ ÓÉÓÔÅÍÎÏÍÕ ÁÄͦΦÓÔÒÁÔÏÒÕ"
 
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:240
 #, c-format
 msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:217
+#: po/placeholder.h:334 urpmi:321
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:218
+#: po/placeholder.h:348
 msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:359
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
 msgstr ""
 
-#: po/placeholder.h:234
+#: po/placeholder.h:379 urpmi.addmedia:70
+#, c-format
 msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:383
+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"
+"and [options] are from\n"
 msgstr ""
 
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
+#: urpmi.addmedia:57
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:401 urpmi.addmedia:82
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -935,42 +1014,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1013,16 +1062,16 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr ""
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
 msgstr ""
 
 #: urpmq:34
@@ -1037,13 +1086,6 @@ msgstr ""
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "×ÉËÏÒÉÓÔÁÎÎÑ: urpmi [-h] [--auto] [--force] [-a] ÎÁÚ×Á_ÐÁËÅÔÕ "
-#~ "[ÎÁÚ×É_ÐÁËÅÔ¦×...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ ÆÁÊÌ %s, ÚÁ˦ÎÞÕÀ ÒÏÂÏÔÕ"
 
diff --git a/po/urpmi.pot b/po/urpmi.pot
index 0311d205..35b53a97 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-01-31 20:51+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,27 +24,31 @@ msgid ""
 "You requested installation of package $rpm\n"
 msgstr ""
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr ""
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr ""
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr ""
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr ""
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr ""
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr ""
 
@@ -52,920 +56,959 @@ msgstr ""
 msgid "$rpm: command not found\n"
 msgstr ""
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr ""
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr ""
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1891
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:40 urpm.pm:1769
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr ""
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
-#, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr ""
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 msgid "urpmi database locked"
 msgstr ""
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, c-format
-msgid "mounting %s"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+msgid " (y/N) "
 msgstr ""
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
 
-#: po/placeholder.h:69
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
-msgid "examining synthesis file [%s]"
+msgid "mounting %s"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr ""
+
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:1886
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1722 urpm.pm:1748
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+msgid "One of the following packages is needed to install %s:"
+msgstr ""
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr ""
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:1421
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
-msgid "unable to analyse synthesis data of %s"
+msgid "read synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1821
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1898
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1837
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:102
-#, c-format
-msgid "copying description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr ""
-
-#: po/placeholder.h:104 urpm.pm:1811 urpm.pm:1814 urpm.pm:1833
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr ""
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr ""
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1848
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1757
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "The following packages contain %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr ""
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr ""
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:121
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1896
-msgid "...retrieving done"
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr ""
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:143 po/placeholder.h:238
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
+#: po/placeholder.h:151 po/placeholder.h:413
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:147
-msgid "  --X            - use X interface.\n"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
-msgid "Try installation without checking dependencies? (y/N) "
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
-msgid "  -p             - allow search in provides to find package.\n"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:172 po/placeholder.h:269
 #, c-format
-msgid "What is your choice? (1-%d) "
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "unable to analyse synthesis data of %s"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: po/placeholder.h:177 po/placeholder.h:343
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
 msgstr ""
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
 #, c-format
-msgid "installing %s\n"
+msgid "syntax error in config file at line %s"
+msgstr ""
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr ""
+
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:184 po/placeholder.h:284
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
-msgid "Only superuser is allowed to install packages"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
 #, c-format
-msgid "One of the following packages is needed to install %s:"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr ""
+
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: po/placeholder.h:187
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 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"
-"and [options] are from\n"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:197 urpmi.addmedia:92
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "installing %s\n"
 msgstr ""
 
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
-#: urpmi.addmedia:57
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:201 po/placeholder.h:306
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:212 urpmi.addmedia:84
-#, c-format
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:218
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
+msgid "Only superuser is allowed to install packages"
 msgstr ""
 
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:240
 #, c-format
 msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:248
+#: po/placeholder.h:334 urpmi:321
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
 msgstr ""
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
+#: po/placeholder.h:383
+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"
+"and [options] are from\n"
 msgstr ""
 
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
+#: urpmi.addmedia:57
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:401 urpmi.addmedia:82
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: po/placeholder.h:260
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:267
+#: po/placeholder.h:425
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:268
+#: po/placeholder.h:429
 msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: po/placeholder.h:271 urpmq:137
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
 msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:272 urpmq:87
+#: po/placeholder.h:456
 #, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
 msgstr ""
 
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1008,16 +1051,16 @@ msgstr ""
 msgid ");"
 msgstr ""
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr ""
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ""
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
 msgstr ""
 
 #: urpmq:34
diff --git a/po/uz.po b/po/uz.po
index 2c152674..1d2c2d3d 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-02-28 11:10-5\n"
 "Last-Translator: Sherzod Mamatkulov <mamatkulov@yahoo.com>\n"
 "Language-Team: Uzbek <bobir_is@yahoo.com>\n"
@@ -23,27 +23,31 @@ msgid ""
 "You requested installation of package $rpm\n"
 msgstr ""
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Bo'ladimi?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "Bo'pti"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Bekor qilish"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "JjNnYy"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "Hh"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (H/y) "
 
@@ -51,618 +55,703 @@ msgstr " (H/y) "
 msgid "$rpm: command not found\n"
 msgstr ""
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr ""
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr ""
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr ""
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr ""
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr ""
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr ""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "%s nomli paket mavjud emas\n"
 
-#: po/placeholder.h:63
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Kuchliroq o'rnatishga harakat qilaymi (--majburlab)? (h/Y) "
 
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:59 po/placeholder.h:251
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "rpm database so'rog'i o'xshamadi\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "%s o'rnatilmoqda\n"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (H/y) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, c-format
-msgid "examining synthesis file [%s]"
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "%s o'rnatilmoqda\n"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Quyidagi paketlardan biri kerak:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Tugagandan so'ng enterni bosing..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr ""
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:1421
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
-msgid "unable to analyse synthesis data of %s"
+msgid "read synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
-#, c-format
-msgid "syntax error in config file at line %s"
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr ""
+"ishlatish: urpmi [-h] [--auto] [--force] [-a] paket_nomi [paket_nomlari...]\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
+#, c-format
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Nimani tanlaysiz? (1-%d) "
+
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:103
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
-msgid "unable to build hdlist: %s"
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Uzr o'xshamadi, boshqasini tanlang\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unknown data associated with %s"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr ""
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "hammasi allaqachon o'rnatilgan"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "Quyidagi paketlardan biri kerak:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
 msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "O'rnatish o'xshamadi"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1305
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Quyidagi paketlarda %s bor: %s\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:121
+#: po/placeholder.h:142 po/placeholder.h:236
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:143 po/placeholder.h:238
+#, c-format
+msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
-#, c-format
-msgid "selecting %s using obsoletes"
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:149 po/placeholder.h:246
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr ""
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:158 po/placeholder.h:256
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "hammasi allaqachon o'rnatilgan"
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi (%d MB)"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr ""
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "Quyidagi paketlardan biri kerak:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "O'rnatish o'xshamadi"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -670,259 +759,247 @@ msgid ""
 msgstr ""
 "Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr ""
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Nimani tanlaysiz? (1-%d) "
-
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Kuchliroq o'rnatishga harakat qilaymi (--majburlab)? (h/Y) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Uzr o'xshamadi, boshqasini tanlang\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "%s o'rnatilmoqda\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Iltimos %2$s nomli %1$s ni kiriting"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr ""
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Quyidagi paketlarda %s bor: %s\n"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Tugagandan so'ng enterni bosing..."
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Faqat administrator mahalliy paketlarni o'rnatishi mumkin"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr ""
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Quyidagi paketlardan biri kerak:"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
-#, c-format
+#: po/placeholder.h:205 po/placeholder.h:445
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:187
-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"
-"and [options] are from\n"
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
-#: urpmi.addmedia:57
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:211 po/placeholder.h:313
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Faqat administrator mahalliy paketlarni o'rnatishi mumkin"
+
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:296
 #, c-format
 msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:217
+#: po/placeholder.h:348
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:218
+#: po/placeholder.h:359
+#, c-format
 msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
 msgstr ""
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: po/placeholder.h:234
+#: po/placeholder.h:383
 msgid ""
-"  -d             - force complete computation of depslist.ordered file.\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"
+"and [options] are from\n"
 msgstr ""
 
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
+#: urpmi.addmedia:57
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
+#: po/placeholder.h:401 urpmi.addmedia:82
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:408 urpmi.addmedia:84
+#, c-format
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -932,42 +1009,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1010,16 +1057,16 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr ""
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
 msgstr ""
 
 #: urpmq:34
@@ -1033,13 +1080,6 @@ msgstr ""
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr ""
-#~ "ishlatish: urpmi [-h] [--auto] [--force] [-a] paket_nomi "
-#~ "[paket_nomlari...]\n"
-
 #~ msgid "Sorry can't find file %s, exiting"
 #~ msgstr "Uzr %s topolmadim, dasturni tugataman"
 
diff --git a/po/vi.po b/po/vi.po
index d3b07225..168e8ffe 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-03-21 15:04+0100\n"
 "Last-Translator: TRINH MINH THANH <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese Team\n"
@@ -25,27 +25,31 @@ msgstr ""
 "Tù ®éng cµi ®Æt c¸c gãi...\n"
 "B¹n yªu cÇu cµi ®Æt gãi $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "§­îc ch­a?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "OK"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Bá qua"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Kh«ng"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "Cã"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr "Cã/Kh«ng"
 
@@ -53,16 +57,16 @@ msgstr "Cã/Kh«ng"
 msgid "$rpm: command not found\n"
 msgstr "$rpm: kh«ng thÊy lÖnh\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "phiªn b¶n urpmf %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "B¶n quyÒn (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
@@ -70,748 +74,906 @@ msgstr ""
 "§©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."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "c¸ch dïng: urpmf [tïy chän] <tÖp tin>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet         - kh«ng in tªn tag (mÆc ®Þnh nÕu kh«ng ®­a tag vµo lÖnh"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    lÖnh, kh«ng thÝch hîp víi chÕ ®é t­¬ng t¸c)."
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all           - in toµn bé tag."
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name          - in tªn tag: tªn tËp tin rpm (gi¶ sö kh«ng ®­a tag vµo"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                    dßng lÖnh nh­ng kh«ng cã tªn gãi tin)."
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group         - in nhãm tag: nhãm."
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - in kÝch th­íc tag: kÝch th­íc."
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - in tag serial: serial."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - in tãm t¾t tag: tãm t¾t."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - in m« t¶ tag: m« t¶."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr "  --provides      - in c¸c cung cÊp tag: toµn bé cung cÊp (®a dßng)."
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr "  --requires      - in yªu cÇu tag: toµn bé yªu cÇu (®a dßng)."
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files         - in tËp tin tag: toµn bé c¸c tËp tin (®a dßng)."
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 "  --conflicts     - in c¸c xung ®ét tag: toµn bé c¸c xung ®ét (®a dßng)."
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr "  --obsoletes     - in tag hÕt h¹n: toµn bé obsolete (®a dßng)."
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr "  --prereqs       - in tag prereqs: toµn bé prereqs (®a dßng)."
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "try urpmf --help ®Ó cã thªm tïy chän"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr "Kh«ng t×m thÊy danh s¸ch ph­¬ng tiÖn ®Çy ®ñ"
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "Kh«ng thÓ ghi tËp tin cÊu h×nh [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr "®ang truy l¹i c¸c tËp tin rpms..."
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr "®ang kiÓm tra toµn bé c¬ së d÷ liÖu urpmi"
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  -v             - chÕ ®é ®a ng«n.\n"
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "sö dông thiÕt bÞ [%s] th¸o l¾p kh¸c cho \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "kh«ng thÓ t×m thÊy tËp danh s¸ch cho \"%s\", ph­¬ng tiÖn bÞ bá qua"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "kh«ng cã g× ®Ó ghi vµo tËp tin danh s¸ch cho \"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-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)"
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "kh«ng thÓ t×m thÊy tËp danh s¸ch cho \"%s\", ph­¬ng tiÖn bÞ bá qua"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, 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\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "kh«ng cã g× ®­îc ghi trong tËp danh s¸ch cho \"%s\""
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+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"
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr "  --auto-select  - tù ®éng chän c¸c gãi tin ®Ó n©ng cÊp hÖ thèng.\n"
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "®ang lÊy l¹i tËp tin m« t¶ cña \"%s\"..."
 
-#: po/placeholder.h:39
-msgid "unable to access first installation medium"
-msgstr "kh«ng thÓ truy cËp ph­¬ng tiÖn cµi ®Æt ®Çu tiªn"
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "Kh«ng t×m thÊy gãi tin %s."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "®ang bá g¾n kÕt %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "®ang gì bá c¸c header cò %d trong cache"
-
-#: po/placeholder.h:43
-#, 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\""
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 "ph­¬ng tiÖn \"%s\" cè sö dông hdlist ®ang ®­îc dïng, ph­¬ng tiÖn bÞ bá qua"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
-msgstr "<c¸c ký tù kh«ng in ®­îc>"
-
-#: po/placeholder.h:46
-msgid "problem reading hdlist file, trying again"
-msgstr "lçi khi ®äc tËp tin hdlist, ®ang thö l¹i"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
+msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, 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 kh«ng tªn v× nã ®· ®­îc dïng råi"
 
-#: po/placeholder.h:48
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "gì bá ph­¬ng tiÖn \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr "lçi khi ®äc tËp tin hdlist, ®ang thö l¹i"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, 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 kho¶n môc do kh«ng tån t¹i tËp danh "
 "s¸ch [%s]"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "chØ gi÷ c¸c tËp tin ®­îc tham chiÕu trong c¸c cung cÊp"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "kh«ng thÓ t¹o tËp tin tæng hîp cho ph­¬ng tiÖn \"%s\""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "t×m thÊy c¸c header %d trong cache"
 
-#: po/placeholder.h:53
-#, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "cè g¾ng chän ®a ph­¬ng tiÖn: %s"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "tr¸nh chän %s v× locales language cña nã ch­a ®­îc chän lùa"
+msgid "unable to update medium \"%s\"\n"
+msgstr "kh«ng thÓ cËp nhËt ph­¬ng tiÖn \"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"®ang gì bá %s ®Ó n©ng cÊp lªn %s...\n"
-"  v× nã sÏ kh«ng ®­îc cËp nhËt kiÓu kh¸c"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - xo¸ th­ môc cache headers.\n"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "ph­¬ng tiÖn \"%s\" ®· tån t¹i råi"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "kh«ng thÓ ghi tËp danh s¸ch cña \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "ghi tËp cÊu h×nh [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+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"
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "kh«ng cã gãi tin mang danh %s"
 
-#: po/placeholder.h:63
-#, 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\""
-
-#: po/placeholder.h:64
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "kh«ng thÓ x©y dùng hdlist  tæng hîp, dïng ph­¬ng ph¸p parsehdlist"
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Thö cè g¾ng cµi ®Æt (--Ðp buéc)? (Cã/Kh«ng)"
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "kh«ng thÓ t×m ®­îc tËp tin hdlist cho \"%s\", ph­¬ng tiÖn bÞ bá qua"
 
-#: po/placeholder.h:66
+#: po/placeholder.h:58 po/placeholder.h:248
+#, 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\""
+
+#: po/placeholder.h:59 po/placeholder.h:251
 msgid "urpmi database locked"
 msgstr "c¬ së d÷ liÖu urpmi bÞ khãa"
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, c-format
-msgid "mounting %s"
-msgstr "®ang g¾n kÕt %s"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr "Cã/Kh«ng"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+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"
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
-"kh«ng thÓ qu¶n lý ph­¬ng tiÖn \"%s\" v× tËp danh s¸ch ®· ®­îc c¸i kh¸c dïng "
-"råi"
+"gãi nµo ®ã ph¶i d­îc gì bá ®Ó tiÕn hµnh n©ng cÊp, nã vÉn ch­a ®­îc hç trî\n"
 
-#: po/placeholder.h:69
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "®ang kiÓm tra tËp tin tæng hîp [%s]"
+msgid "mounting %s"
+msgstr "®ang g¾n kÕt %s"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - cè t¹o c¸c file hdlist.\n"
+
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget háng: ®i ra víi %d hoÆc tÝn hiÖu %d\n"
 
-#: po/placeholder.h:71
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kh«ng thÓ lÊy l¹i tªn ®­êng dÉn cho ph­¬ng tiÖn th¸o l¾p \"%s\""
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+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"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "®Çu vµo bÊt th­êng: [%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+"  -u             - bá gãi tin nÕu cã phiªn b¶n tèt h¬n ®· ®­îc cµi ®Æt.\n"
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, 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 "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:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "NhÊn phÝm Enter khi hoµn thµnh..."
 
-#: po/placeholder.h:74
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr "...sao chÐp háng"
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 "ph­¬ng tiÖn \"%s\" cè sö dông mét danh s¸ch ®ang ®­îc dïng, ph­¬ng tiÖn bÞ "
 "bá qua"
 
-#: po/placeholder.h:76
-msgid "retrieving hdlists file..."
-msgstr "®ang truy l¹i tËp tin hdlists..."
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "kh«ng thÓ truy cËp tËp hdlist cña \"%s\", ph­¬ng tiÖn bÞ bá qua"
-
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "kh«ng thÓ ®¨ng ký tËp tin rpm"
-
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr "  -h             - in th«ng ®iÖp trî gióp nµy.\n"
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "kh«ng thÓ xem xÐt tËp danh s¸ch cho \"%s\", ph­¬ng tiÖn bÞ bá qua"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr "  -g             - còng in c¸c nhãm víi tªn.\n"
 
-#: po/placeholder.h:81
-#, 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\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - chän toµn bé c¸c ph­¬ng tiÖn.\n"
 
-#: po/placeholder.h:82
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "m« t¶ hdlist kh«ng hîp lÖ \"%s\" trong hdlists file"
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "tËp danh s¸ch kh«ng râ rµng cho \"%s\", ph­¬ng tiÖn bÞ bá qua"
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  -h             - cè t×m vµ dïng file hdlist hoÆc synthesis.\n"
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "b¶n sao cña [%s] háng"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
+msgstr "  -r             - còng in phiªn b¶n vµ ph¸t hµnh víi tªn.\n"
+
+#: po/placeholder.h:80 po/placeholder.h:455
+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"
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr "  --auto         - tù ®éng chän mét gãi tin tèt trong c¸c gãi.\n"
+
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "kh«ng thÓ ph©n t¸ch chÝnh x¸c [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+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"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, c-format
 msgid "read synthesis file [%s]"
 msgstr "®äc tËp tin tæng hîp [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "kh«ng thÓ ph©n tÝch tËp tin tæng hîp cña \"%s\""
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "kh«ng t×m thÊy webfetch (hiÖn lµ curl hay wget)\n"
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "truy l¹i hdlist nguån (hoÆc tæng hîp) cña \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
+msgstr ""
+"  -c             - chän ph­¬ng ph¸p ®Çy ®ñ ®Ó quyÕt ®Þnh kÕt thóc c¸c yªu "
+"cÇu.\n"
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr "...sao chÐp hoµn thµnh"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "kh«ng thÓ t¹o ph­¬ng tiÖn \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "sao chÐp hdlist nguån (hoÆc tæng hîp) cña \"%s\"..."
 
-#: po/placeholder.h:92
-msgid "copying hdlists file..."
-msgstr "®ang sao chÐp tËp tin hdlist..."
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, 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 "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: tïy chän kh«ng x¸c ®Þnh \"-%s\", xem c¸ch dïng b»ng --help\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "c¸ch dïng: urpmi.removemedia [-a] <tªn> ..."
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "®ang t¹o hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, 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\""
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
+"  --media         - chØ dïng c¸c ph­¬ng tiÖn cã trong danh s¸ch b»ng dÊu "
+"phÈy.\n"
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr "®· bæ xung ph­¬ng tiÖn %s"
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, 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\""
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "kh«ng truy l¹i ®­îc hdlist nguån (hoÆc tæng hîp)"
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "lçi ®¨ng ký c¸c gãi tin côc bé"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "coi ph­¬ng tiÖn th¸o l¾p nh­ lµ \"%s\""
-
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...kh«ng lÊy l¹i ®­îc: %s"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, 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"
 
-#: po/placeholder.h:102
-#, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "®ang sao chÐp tËp tin m« t¶ cña \"%s\"..."
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "kh«ng thÓ t¹o hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "ph­¬ng tiÖn \"%s\" kh«ng ®­îc chän"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "tªn tËp tin rpm [%s] kh«ng hîp lÖ"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "d÷ liÖu kh«ng x¸c ®Þnh liªn quan víi %s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, 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 "What is your choice? (1-%d) "
+msgstr "B¹n lùa chän g×? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "kh«ng thÓ truy cËp tËp danh s¸ch cña \"%s\", ph­¬ng tiÖn bÞ bá qua"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - dïng wget ®Ó lÊy l¹i files ë xa.\n"
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "tr¸nh chän %s v× sÏ kh«ng ®ñ c¸c tËp tin ®­îc cËp nhËt"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kh«ng thÓ truy cËp tËp tin rpm [%s]"
 
-#: po/placeholder.h:111
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Xin lçi, lùa chän tåi, h·y thö l¹i\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"®ang gì bá %s ®Ó n©ng cÊp lªn %s ...\n"
-"  v× nã sÏ kh«ng ®­îc n©ng cÊp chÝnh x¸c!"
+msgid "unable to access medium \"%s\""
+msgstr "kh«ng thÓ truy cËp ph­¬ng tiÖn \"%s\""
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, 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"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - dïng curl ®Ó lÊy l¹i c¸c file ë xa.\n"
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "kh«ng thÓ truy cËp ph­¬ng tiÖn \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "cè g¾ng chän ph­¬ng tiÖn kh«ng tån t¹i \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr "kh«ng thÓ ph©n t¸ch ®óng [%s] trªn gi¸ trÞ \"%s\""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "cè g¾ng chän ph­¬ng tiÖn kh«ng tån t¹i \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "kh«ng t×m thÊy c¸c tËp tin rpm tõ [%s]"
+
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr "mÊt curl\n"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "C¸c gãi tin sau ®©y chøa %s: %s"
+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 hdlist [%s]"
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - in th«ng tin trî gióp nµy.\n"
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "Mäi thø ®· ®­îc cµi ®Æt"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr "®ang truy l¹i c¸c tËp tin rpms..."
 
-#: po/placeholder.h:120
+#: po/placeholder.h:123 po/placeholder.h:217
 #, 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 "using different removable device [%s] for \"%s\""
+msgstr "sö dông thiÕt bÞ [%s] th¸o l¾p kh¸c cho \"%s\""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "CÇn mét gãi trong c¸c gãi tin sau ®©y:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+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)"
 
-#: po/placeholder.h:121
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "®ang kiÓm tra tËp tin hdlist [%s]"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kh«ng thÓ ®äc tÖp rpm \"%s\"\n"
 
-#: po/placeholder.h:122 urpm.pm:1191
-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"
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
-msgstr "...viÖc lÊy l¹i hoµn thµnh"
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "Cµi ®Æt kh«ng ®­îc"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+msgid "unable to access first installation medium"
+msgstr "kh«ng thÓ truy cËp ph­¬ng tiÖn cµi ®Æt ®Çu tiªn"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not 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"
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "chän %s sö dông c¸c c¸i ®· lçi thêi"
+msgid "unmounting %s"
+msgstr "®ang bá g¾n kÕt %s"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl háng: ®i ra víi %d hay tÝn hiÖu %d\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "®ang gì bá c¸c header cò %d trong cache"
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "chän %s b»ng viÖc lùa chän trªn c¸c tËp tin"
+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\""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
-msgstr "mÊt curl\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr "<c¸c ký tù kh«ng in ®­îc>"
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - chÕ ®é ®a ng«n.\n"
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "sao chÐp danh s¸ch nguån cña \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "gì bá ph­¬ng tiÖn \"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr "mÊt wget\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "kh«ng thÓ t¹o tËp tin tæng hîp cho ph­¬ng tiÖn \"%s\""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:143 po/placeholder.h:238
 #, 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 hdlist [%s]"
+msgid "trying to select multiple medium: %s"
+msgstr "cè g¾ng chän ®a ph­¬ng tiÖn: %s"
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - in th«ng tin trî gióp nµy.\n"
+#: po/placeholder.h:144 po/placeholder.h:447
+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"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "Mäi thø ®· ®­îc cµi ®Æt"
+#: po/placeholder.h:145 po/placeholder.h:354
+#, fuzzy
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr "  tªn hay tËp tin rpm cã trong dßng lÖnh ®­îc yªu cÇu.\n"
+
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
+#, c-format
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "tr¸nh chän %s v× locales language cña nã ch­a ®­îc chän lùa"
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr "  --complete     - dïng parsehdlist server ®Ó hoµn thµnh lùa chän.\n"
+
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "ghi tËp cÊu h×nh [%s]"
+
+#: po/placeholder.h:150 po/placeholder.h:249
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "kh«ng thÓ x©y dùng hdlist  tæng hîp, dïng ph­¬ng ph¸p parsehdlist"
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
+"  --distrib      - tù ®éng t¹o toµn bé ph­¬ng tiÖn tõ mét cµi ®Æt ph­¬ng "
+"tiÖn.\n"
+
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, 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 danh s¸ch ®· ®­îc c¸i kh¸c dïng "
+"råi"
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
+msgstr "®ang kiÓm tra tËp tin tæng hîp [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "kh«ng thÓ lÊy l¹i tªn ®­êng dÉn cho ph­¬ng tiÖn th¸o l¾p \"%s\""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, 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\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "§Ó tho¶ m·n c¸c phô thuéc, c¸c gãi sau ®©y sÏ ®­îc cµi ®Æt (%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr "®ang truy l¹i tËp tin hdlists..."
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi: tïy chän kh«ng x¸c ®Þnh \"-%s\", xem c¸ch dïng b»ng --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  -v             - chÕ ®é ®a ng«n.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "kh«ng thÓ truy cËp tËp hdlist cña \"%s\", ph­¬ng tiÖn bÞ bá qua"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "CÇn mét gãi trong c¸c gãi tin sau ®©y:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "kh«ng thÓ ®¨ng ký tËp tin rpm"
+
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "kh«ng thÓ xem xÐt tËp danh s¸ch cho \"%s\", ph­¬ng tiÖn bÞ bá qua"
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:169 po/placeholder.h:266
+#, 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\""
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "tËp danh s¸ch kh«ng râ rµng cho \"%s\", ph­¬ng tiÖn bÞ bá qua"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - chØ dïng ph­¬ng tiÖn cËp nhËt.\n"
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Cµi ®Æt lçi, thiÕu mét sè tËp tin.\n"
-"B¹n nªn cËp nhËt urpmi database."
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "b¶n sao cña [%s] háng"
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
-msgstr "  --auto         - tù ®éng chän mét gãi tin tèt trong c¸c gãi.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - vÊn tin më réng c¸c phô thuéc gãi tin.\n"
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "Cµi ®Æt kh«ng ®­îc"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "kh«ng thÓ ph©n tÝch tËp tin tæng hîp cña \"%s\""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
-msgstr "  --auto-select  - tù ®éng chän c¸c gãi tin ®Ó n©ng cÊp hÖ thèng.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "truy l¹i hdlist nguån (hoÆc tæng hîp) cña \"%s\"..."
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - dïng giao diÖn X.\n"
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr "...sao chÐp hoµn thµnh"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "§Ó tho¶ m·n c¸c phô thuéc, c¸c gãi sau ®©y sÏ ®­îc cµi ®Æt (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-#, fuzzy
-msgid "  -P             - do not 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"
+#: po/placeholder.h:180 po/placeholder.h:277
+msgid "copying hdlists file..."
+msgstr "®ang sao chÐp tËp tin hdlist..."
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, 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"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 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)"
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-"  --media         - chØ dïng c¸c ph­¬ng tiÖn cã trong danh s¸ch b»ng dÊu "
-"phÈy.\n"
-
-#: po/placeholder.h:152
-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"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "lçi ®¨ng ký c¸c gãi tin côc bé"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - chÕ ®é ®a ng«n.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "coi ph­¬ng tiÖn th¸o l¾p nh­ lµ \"%s\""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 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"
 
-#: po/placeholder.h:158
-#, fuzzy
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr "  tªn hay tËp tin rpm cã trong dßng lÖnh ®­îc yªu cÇu.\n"
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - chÕ ®é yªn lÆng.\n"
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr "  --complete     - dïng parsehdlist server ®Ó hoµn thµnh lùa chän.\n"
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "®ang sao chÐp tËp tin m« t¶ cña \"%s\"..."
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "B¹n lùa chän g×? (1-%d) "
+msgid "unable to build hdlist: %s"
+msgstr "kh«ng thÓ t¹o hdlist: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - dïng wget ®Ó lÊy l¹i files ë xa.\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "ph­¬ng tiÖn \"%s\" kh«ng ®­îc chän"
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"Phiªn b¶n urpmi %s\n"
-"B¶n quyÒn (C) 1999, 2000, 2001 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"
-"sö dông:\n"
+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"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Thö cè g¾ng cµi ®Æt (--Ðp buéc)? (Cã/Kh«ng)"
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - chÕ ®é yªn lÆng.\n"
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - Ðp cÇu viÖn ngay c¶ khi mét sè gãi tin kh«ng tån t¹i.\n"
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Xin lçi, lùa chän tåi, h·y thö l¹i\n"
-
-#: po/placeholder.h:174
-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"
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - dïng curl ®Ó lÊy l¹i c¸c file ë xa.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "®ang cµi ®Æt %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, 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]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "C¸c gãi tin sau ®©y chøa %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr "®ang kiÓm tra tËp tin hdlist [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+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"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - t¹o ph­¬ng tiÖn cËp nhËt.\n"
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+"  -d             - cè hoµn thµnh tÝnh to¸n cña tËp tin depslist.ordered.\n"
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "kh«ng thÓ lÊy c¸c gãi nguån, hñy bá"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "NhÊn phÝm Enter khi hoµn thµnh..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr "...viÖc lÊy l¹i hoµn thµnh"
+
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "chän %s sö dông c¸c c¸i ®· lçi thêi"
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl háng: ®i ra víi %d hay tÝn hiÖu %d\n"
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "chän %s b»ng viÖc lùa chän trªn c¸c tËp tin"
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "sao chÐp danh s¸ch nguån cña \"%s\"..."
+
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 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"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr "mÊt wget\n"
+
+#: po/placeholder.h:240
 #, 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 ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"®ang gì bá %s ®Ó n©ng cÊp lªn %s...\n"
+"  v× nã sÏ kh«ng ®­îc cËp nhËt kiÓu kh¸c"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"®ang gì bá %s ®Ó n©ng cÊp lªn %s ...\n"
+"  v× nã sÏ kh«ng ®­îc n©ng cÊp chÝnh x¸c!"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Cµi ®Æt lçi, thiÕu mét sè tËp tin.\n"
+"B¹n nªn cËp nhËt urpmi database."
+
+#: po/placeholder.h:348
+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"
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"Phiªn b¶n urpmi %s\n"
+"B¶n quyÒn (C) 1999, 2000, 2001 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"
+"sö dông:\n"
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
 "%s\n"
@@ -820,7 +982,7 @@ msgstr ""
 "%s\n"
 "kh«ng cÇn cã --distrib trong <®­êng dÉn liªn quan cña hdlist>"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -843,17 +1005,7 @@ msgstr ""
 "       th¸o l¾p://<®­êng dÉn>\n"
 "vµ [tïy chän] lµ tõ\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "kh«ng thÓ t¹o ph­¬ng tiÖn \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "kh«ng thÓ cËp nhËt ph­¬ng tiÖn \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -863,11 +1015,7 @@ msgstr ""
 "\n"
 "tïy chän kh«ng x¸c ®Þnh '%s'\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - xo¸ th­ môc cache headers.\n"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -876,15 +1024,7 @@ msgstr ""
 "%s\n"
 "thiÕu <®­êng dÉn liªn quan cña hdlist> \n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - cè t¹o c¸c file hdlist.\n"
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  -h             - cè t×m vµ dïng file hdlist hoÆc synthesis.\n"
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -893,19 +1033,24 @@ msgstr ""
 "%s\n"
 "`with' thiÕu cho ph­¬ng tiÖn ftp\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - t¹o ph­¬ng tiÖn cËp nhËt.\n"
+#: po/placeholder.h:419 urpmi.removemedia:49
+#, 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"
 
-#: po/placeholder.h:217
+#: po/placeholder.h:425
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --distrib      - tù ®éng t¹o toµn bé ph­¬ng tiÖn tõ mét cµi ®Æt ph­¬ng "
-"tiÖn.\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"
 
-#: po/placeholder.h:218
+#: po/placeholder.h:429
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -913,7 +1058,7 @@ 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"
 
-#: po/placeholder.h:227 urpmi.update:59
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -922,71 +1067,7 @@ msgstr ""
 "môc nhËp ®Ó cËp nhËt ®ang thiÕu\n"
 "(mét môc cña %s)\n"
 
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - cè hoµn thµnh tÝnh to¸n cña tËp tin depslist.ordered.\n"
-
-#: po/placeholder.h:235 urpmi.update:57
-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"
-
-#: po/placeholder.h:236
-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"
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-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"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
-#, 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"
-
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - chän toµn bé c¸c ph­¬ng tiÖn.\n"
-
-#: po/placeholder.h:248
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-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"
-
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr "  -h             - in th«ng ®iÖp trî gióp nµy.\n"
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
-msgstr "  -g             - còng in c¸c nhãm víi tªn.\n"
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kh«ng thÓ ®äc tÖp rpm \"%s\"\n"
-
-#: po/placeholder.h:256
-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"
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr "  -r             - còng in phiªn b¶n vµ ph¸t hµnh víi tªn.\n"
-
-#: po/placeholder.h:259
-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"
-
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1001,37 +1082,7 @@ msgstr ""
 "GPL.\n"
 "sö dông:\n"
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - vÊn tin më réng c¸c phô thuéc gãi tin.\n"
-
-#: po/placeholder.h:267
-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"
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-"  -c             - chän ph­¬ng ph¸p ®Çy ®ñ ®Ó quyÕt ®Þnh kÕt thóc c¸c yªu "
-"cÇu.\n"
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"gãi nµo ®ã ph¶i d­îc gì bá ®Ó tiÕn hµnh n©ng cÊp, nã vÉn ch­a ®­îc hç trî\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: tïy chän kh«ng x¸c ®Þnh \"-%s\", xem c¸ch dïng b»ng --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
@@ -1039,12 +1090,6 @@ msgstr ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-"  -u             - bá gãi tin nÕu cã phiªn b¶n tèt h¬n ®· ®­îc cµi ®Æt.\n"
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1088,17 +1133,17 @@ msgstr ") . _("
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "c¸ch dïng: urpmi.update [tïy chän] <tªn> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "c¸ch dïng: urpmi.removemedia [-a] <tªn> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "c¸ch dïng: urpmi.removemedia [-a] <tªn> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "c¸ch dïng: urpmi.update [tïy chän] <tªn> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/wa.po b/po/wa.po
index a5f3c9c1..34fbd128 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Lorint Hendschel <LorintHendschel@skynet.be>\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -26,27 +26,31 @@ msgstr ""
 "Astalaedje otomatike des pacaedjes...\n"
 "Vos avoz dmandé l' astalaedje do pacaedje $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "Totafwait est-i comufåt?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "I va"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "Rinoncî"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "OoAaYyWw"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (O/n) "
 
@@ -54,16 +58,16 @@ msgstr " (O/n) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: comande nén trovêye\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf modêye %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright © 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
@@ -71,630 +75,715 @@ msgstr ""
 "Çouci est on libe programe èt pout esse cossemé so les termes del licince "
 "GPL."
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "po s' è siervî: urpmf [tchûzes] <fitchî>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - håyner l' etikete di séreye: serial."
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - håyner l' etikete di rascourti: summary."
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - håyner l' etikete di discrijhaedje: description."
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "sayîz urpmf --help po vey les ôtès tchûzes"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "dji n' sai scrire li fitchî d' apontiaedje [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
-msgstr "aberwetaedje des fitchîs rpms..."
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  -y             - foirci des cweriaedjes rishonnants.\n"
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
+"dji n' sai trover li fitchî di djîvêye di «%s», dji passe hute do sopoirt"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "rén po scrire el fitchî djîvêye di «%s»"
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
-"dji n' sai trover li fitchî di djîvêye di «%s», dji passe hute do sopoirt"
-
-#: po/placeholder.h:36
-#, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
-msgstr "dji n' sai scrire li fitchî djîvêye di «%s»"
+msgstr "dji n' sai analizer li fitchî hdlist di «%s»"
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "rén n' a stî scrit el fitchî djîvêye po «%s»"
 
-#: po/placeholder.h:38
-#, fuzzy, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "aberwetaedje do fitchî di descrijhaedjes..."
-
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"dji n' sai aveur li fitchî di djîvêye di «%s», dji passe hute do sopoirt"
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
-msgstr "li pacaedje %s n' a nén stî trové."
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "dismontant %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+"  --auto-select  - tchoezi otomaticmint les pacaedjes pol metaedje a djoû do "
+"sistinme.\n"
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "djî bodje %d vîyès tiestires del muchete"
+msgid "retrieving description file of \"%s\"..."
+msgstr "aberwetaedje do fitchî di discrijhaedjes di «%s»..."
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
+msgid "package %s is not found."
+msgstr "li pacaedje %s n' a nén stî trové."
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 "li sopoirt «%s» saye d' eployî on fitchî hdlist ddja eployî, dji passe hute "
 "do sopoirt"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "dji lé l' fitchî hdlist [%s]"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "dji n' pout eployî l' no «%s» pol sopoirt sin no, ca ci no la est ddja eployî"
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "dji saye di bodjî l' sopoirt «%s» ki n' egzisteye nén"
+#: po/placeholder.h:45 po/placeholder.h:231
+msgid "problem reading hdlist file, trying again"
+msgstr "åk n' a nén stî tot lejhant l' fitchî hdlist, dji saye co ene feye"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
-#, fuzzy
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
-msgstr "dji wåde ki les fitchîs provides"
+msgstr "dji wåde ki les fitchîs dnés dins les provides"
 
-#: po/placeholder.h:51
-#, fuzzy, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "dji n' sai lere li fitchî rpm [%s] foû do sopoirt «%s»"
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d tiestires trovêyes el muchete"
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "dji saye di tchoezi l' sopoirt «%s» ki n' egzisteye nén"
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
-"dj' evite di tchoezi %s ca si pacaedje di locåle/lingaedje n' a nén co stî "
-"tchoezi"
+msgid "unable to update medium \"%s\"\n"
+msgstr "dji n' pout mete a djoû l' sopoirt «%s»\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"dji bodje %s pol metaedje a djoû viè %s ...\n"
-"  ca ôtrumint i n' pout nén esse metou a djoû"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - netyî l' ridant muchete des tiestires.\n"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "li sopoirt «%s» egzisteye ddja"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "dji n' sai scrire li fitchî djîvêye di «%s»"
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "dji scri l' fitchî d' apontiaedje [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "nou pacaedje lomé %s"
 
-#: po/placeholder.h:63
-#, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
-
-#: po/placeholder.h:64
-#, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "dji n' sai lere li fitchî rpm [%s] foû do sopoirt «%s»"
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Sayî d' astaler co pus foirt (--force)? (o/N) "
 
-#: po/placeholder.h:65 urpm.pm:275
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "dji n' sai trover li fitchî hdlist di «%s», dji passe hute do sopoirt"
 
-#: po/placeholder.h:66
+#: po/placeholder.h:58 po/placeholder.h:248
+#, fuzzy, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
+
+#: po/placeholder.h:59 po/placeholder.h:251
 msgid "urpmi database locked"
 msgstr ""
 
-#: po/placeholder.h:67 urpm.pm:1118
-#, c-format
-msgid "mounting %s"
-msgstr "montant %s"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+msgid " (y/N) "
+msgstr " (o/N) "
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - eployî --all-matches pol roye di comande.\n"
+
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
-"dji n' sai m' ocuper do sopoirt «%s» ca l' fitchî djîvêye est ddja eployî pa-"
-"z on ôte sopoirt"
+"des pacaedjes k' i gn a ont mezåjhe d' esse bodjî foû po poleur esse metous "
+"a djoû, çoula n' est nén co sopoirté\n"
 
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "dji lé l' fitchî di sinteze [%s]"
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
+#, c-format
+msgid "mounting %s"
+msgstr "montant %s"
+
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - foirci l' askepiaedje des fitchîs «hdlist».\n"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget a fwait berwete: côde di rexhowe %d ou signå %d\n"
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "dji n' pout radjouter l' sopoirt «%s»\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+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"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, 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 "One of the following packages is needed to install %s:"
+msgstr "I gn a mezåjhe d' onk des pacaedjes ki shûvèt po-z astaler %s:"
 
-#: po/placeholder.h:74
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "Tapez so «enter» cwand c' est fwait..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr "...li copiaedje a fwait berwete"
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 "li sopoirt «%s» saye d' eployî ene djîvêye ddja eployeye, dji passe hute do "
 "sopoirt"
 
-#: po/placeholder.h:76
-#, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "aberwetaedje des fitchîs rpms..."
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
+msgstr "  -h             - mostere ci messaedje d' aidance chal.\n"
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "dji n' sai aveur li fitchî hdlist di «%s», dji passe hute do sopoirt"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "dji n' sai lere li fitchî depslist [%s]"
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - tchoezi tos les sopoirts.\n"
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
-msgstr "«%s»"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, fuzzy, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
-"dji n' sai aveur li fitchî di djîvêye di «%s», dji passe hute do sopoirt"
+"  -h             - sayî di trover ey eployî les fitchîs di sinteze ou "
+"«hdlist».\n"
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "trop di ponts di montaedje pol sopoirt bodjåve «%s»"
+#: po/placeholder.h:79 po/placeholder.h:454
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr "  -h             - mostere ci messaedje d' aidance chal.\n"
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "crombe djîvêye di fitchîs po «%s», dji passe hute do sopoirt"
-
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "li copeye di [%s] a fwait berwete"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
+"  --auto         - tchoezi otomaticmint li bon pacaedje dvins les tchûzes.\n"
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, fuzzy, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "dji n' sai scrire li fitchî compss [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+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"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "dji lé l' fitchî depslist [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "dji n' sai scrire li fitchî djîvêye di «%s»"
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "nou programe po-z aberweter (curl ou wget) di trové\n"
 
-#: po/placeholder.h:89
-#, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "aberwetaedje do sourdant «hdlist» (ou del sinteze)..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
+msgstr ""
+"  -c              - tchoezi li metode complete pol risolvaedje do rseraedje "
+"des aloyances.\n"
 
-#: po/placeholder.h:90
-#, fuzzy
-msgid "...copying done"
-msgstr "...l' aberwetaedje a stî comufåt"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "dji n' pout radjouter l' sopoirt «%s»\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, fuzzy, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "aberwetaedje do sourdant «hdlist» (ou del sinteze)..."
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "dji lé l' fitchî hdlist [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr ""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: tchûze «-%s» nén cnoxhowe, loukîz cmint l' eployî avou --help\n"
+
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "Po s' è siervî: urpme [-a] [--auto] <pacaedjes...>\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "dji fwai l' fitchî hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, 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»"
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
+"  --media        - eployî rén k' les sopoirts dinés, separés pa des comas.\n"
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
-msgstr ""
+msgstr "sopoirt %s radjouté"
 
-#: po/placeholder.h:97
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
+#, 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»"
+
+#: po/placeholder.h:97 po/placeholder.h:282
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "l' aberwetaedje do sourdant «hdlist» (ou del sinteze) a fwait berwete"
 
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr ""
-
-#: po/placeholder.h:99
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr ""
-
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...l' aberwetaedje a fwait berwete: %s"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "aberwetaedje do fitchî di descrijhaedjes..."
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "dji n' sai fé on fitchî hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "li sopoirt «%s» n' a nén stî tchûzi"
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "no d' fitchî rpm nén valåbe [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "dji saye di passer hute do sopoirt «%s»"
+msgid "What is your choice? (1-%d) "
+msgstr "Ké tchoezixhoz vs? (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 "dji n' sai aveur li fitchî di djîvêye di «%s», dji passe hute do sopoirt"
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - eployî wget po-z aberweter les fitchî då lon.\n"
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, fuzzy, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "dji n' sai lere li fitchî depslist [%s]"
 
-#: po/placeholder.h:111
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "Måva tchûze, sayîz co ene feye\n"
+
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"dji bodje %s pol metaedje a djoû...\n"
-" viè %s ca i n' pout esse metou a djoû comufåt!"
+msgid "unable to access medium \"%s\""
+msgstr "dji n' pout mete a djoû l' sopoirt «%s»\n"
 
-#: po/placeholder.h:115 urpm.pm:1190
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:1849
-#, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "dji n' pout mete a djoû l' sopoirt «%s»\n"
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
+#, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "dji saye di tchoezi l' sopoirt «%s» ki n' egzisteye nén"
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, fuzzy, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr "dji n' sai lere li fitchî rpm [%s] foû do sopoirt «%s»"
 
-#: po/placeholder.h:118
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "dji saye di tchoezi l' sopoirt «%s» ki n' egzisteye nén"
+msgid "no rpm files found from [%s]"
+msgstr "nou fitchî rpm di trové foû di [%s]"
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr "curl n' est nén la\n"
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Les pacaedjes ki shûvèt ont å dvins %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "dji n' sai dire li sopoirt di ci fitchî hdlist chal [%s]"
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - mostere ci messaedje d' aidance chal.\n"
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "tot a ddja stî astalé"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr "aberwetaedje des fitchîs rpms..."
 
-#: po/placeholder.h:120
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nou fitchî rpm di trové foû di [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "dji lé l' fitchî hdlist [%s]"
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "I gn a mezåjhe d' onk des pacaedjes ki shûvèt:"
 
-#: po/placeholder.h:122 urpm.pm:1191
-msgid "no entries relocated in depslist"
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
-msgstr "...l' aberwetaedje a stî comufåt"
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: dji n' sai lere li fitchî rpm «%s»\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "L' astalåcion a fwait berwete"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr ""
+"dji n' sai aveur li fitchî di djîvêye di «%s», dji passe hute do sopoirt"
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -P             - èn nén fé des rcweraedjes ezès aloyances po trover on "
+"pacaedje.\n"
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "unmounting %s"
+msgstr "dismontant %s"
+
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "djî bodje %d vîyès tiestires del muchete"
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
 msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - môde badjawe.\n"
+
+#: po/placeholder.h:141 po/placeholder.h:233
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "removing medium \"%s\""
+msgstr "dji bodje li sopoirt «%s»"
+
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "dji n' sai fé l' fitchî di sinteze pol sopoirt «%s»"
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "dji saye di tchoezi l' sopoirt «%s» ki n' egzisteye nén"
+
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - tchoezi tos les sopoirts nén bodjåves.\n"
+
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
+"dj' evite di tchoezi %s ca si pacaedje di locåle/lingaedje n' a nén co stî "
+"tchoezi"
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
-msgstr "curl n' est nén la\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
 
-#: po/placeholder.h:128
-#, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "aberwetaedje do sourdant «hdlist» (ou del sinteze)..."
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "dji scri l' fitchî d' apontiaedje [%s]"
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
-msgstr "wget n' est nén la\n"
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "dji n' sai lere li fitchî rpm [%s] foû do sopoirt «%s»"
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
 #, 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 ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"dji n' sai m' ocuper do sopoirt «%s» ca l' fitchî djîvêye est ddja eployî pa-"
+"z on ôte sopoirt"
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - mostere ci messaedje d' aidance chal.\n"
+#: po/placeholder.h:156 po/placeholder.h:254
+#, c-format
+msgid "examining synthesis file [%s]"
+msgstr "corwaitaedje do fitchî d' sinteze [%s]"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "tot a ddja stî astalé"
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "dji n' pout radjouter l' sopoirt «%s»\n"
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, 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»"
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Po satisfyî les aloyaedjes, les pacaedjes ki shûvèt vont esse disastalés (%d "
+"Mo)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+msgid "retrieving hdlists file..."
+msgstr "aberwetaedje do fitchî hdlist..."
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi: tchûze «-%s» nén cnoxhowe, loukîz cmint l' eployî avou --help\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  -y             - foirci des cweriaedjes rishonnants.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "dji n' sai aveur li fitchî hdlist di «%s», dji passe hute do sopoirt"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "I gn a mezåjhe d' onk des pacaedjes ki shûvèt:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+#, fuzzy
+msgid "unable to register rpm file"
+msgstr "dji n' sai lere li fitchî depslist [%s]"
 
-#: po/placeholder.h:137 po/placeholder.h:257
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
+msgstr "«%s»"
+
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, fuzzy, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"dji n' sai aveur li fitchî di djîvêye di «%s», dji passe hute do sopoirt"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "trop di ponts di montaedje pol sopoirt bodjåve «%s»"
+
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "crombe djîvêye di fitchîs po «%s», dji passe hute do sopoirt"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - eployî kel sopoirt di metaedje a djoû.\n"
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "li copeye di [%s] a fwait berwete"
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
-"  --auto         - tchoezi otomaticmint li bon pacaedje dvins les tchûzes.\n"
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "L' astalåcion a fwait berwete"
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "dji n' sai scrire li fitchî djîvêye di «%s»"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
-msgstr ""
-"  --auto-select  - tchoezi otomaticmint les pacaedjes pol metaedje a djoû do "
-"sistinme.\n"
+#: po/placeholder.h:175 po/placeholder.h:274
+#, fuzzy, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "aberwetaedje do sourdant «hdlist» (ou del sinteze)..."
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - eployî l' eterface X11.\n"
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+#, fuzzy
+msgid "...copying done"
+msgstr "...l' aberwetaedje a stî comufåt"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -703,124 +792,195 @@ msgstr ""
 "Po satisfyî les aloyaedjes, les pacaedjes aloyîs ki shûvèt vont esse astalés "
 "(%d Mo)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+#, fuzzy
+msgid "copying hdlists file..."
+msgstr "dji lé l' fitchî hdlist [%s]"
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
 msgstr ""
-"  -P             - èn nén fé des rcweraedjes ezès aloyances po trover on "
-"pacaedje.\n"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Sayî d' astaler sin verifyî les aloyaedjes? (o/N) "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
-"  --media        - eployî rén k' les sopoirts dinés, separés pa des comas.\n"
 
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
-"  --best-output  - tchoezi li meyeuse eterface sorlon l' evironmint: X ou "
-"môde tecse.\n"
-
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - môde badjawe.\n"
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - fé des rcweraedjes ezès aloyances po trover on pacaedje.\n"
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - môde taijheu.\n"
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "copiaedje do fitchî di discrijhaedjes di «%s»..."
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ké tchoezixhoz vs? (1-%d) "
+msgid "unable to build hdlist: %s"
+msgstr "dji n' sai fé on fitchî hdlist: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - eployî wget po-z aberweter les fitchî då lon.\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "li sopoirt «%s» n' a nén stî tchûzi"
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr ""
-"urpmi modêye %s\n"
-"Copyright © 1999, 2000, 2001 MandrakeSoft.\n"
-"Çouci est on libe programe et pout esse cossemé so les termes del licince "
-"GPL.po s' è siervî:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "dji saye di passer hute do sopoirt «%s»"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Sayî d' astaler co pus foirt (--force)? (o/N) "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - môde taijheu.\n"
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 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"
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "Måva tchûze, sayîz co ene feye\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - eployî --all-matches pol roye di comande.\n"
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "dj' astale %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, 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]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Les pacaedjes ki shûvèt ont å dvins %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "dji lé l' fitchî hdlist [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+msgid "no entries relocated in depslist"
+msgstr ""
+
+#: po/placeholder.h:203 po/placeholder.h:412
+#, fuzzy
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - eployî kel sopoirt di metaedje a djoû.\n"
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+"  -d             - foirci li carculaedje d' on novea fitchî «depslist."
+"ordered».\n"
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "dji n' a savou prinde les pacaedjes soûrdants, dji lai toumer"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "Tapez so «enter» cwand c' est fwait..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr "...l' aberwetaedje a stî comufåt"
+
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr ""
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr ""
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "aberwetaedje do sourdant «hdlist» (ou del sinteze)..."
+
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 msgid "Only superuser is allowed to install packages"
 msgstr "Seulmint li super-ûzeu a l' droet d' astaler des pacaedjes"
 
-#: po/placeholder.h:182 urpmi:216
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr "wget n' est nén la\n"
+
+#: po/placeholder.h:240
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "I gn a mezåjhe d' onk des pacaedjes ki shûvèt po-z astaler %s:"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"dji bodje %s pol metaedje a djoû viè %s ...\n"
+"  ca ôtrumint i n' pout nén esse metou a djoû"
+
+#: po/placeholder.h:296
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"dji bodje %s pol metaedje a djoû...\n"
+" viè %s ca i n' pout esse metou a djoû comufåt!"
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+"  --best-output  - tchoezi li meyeuse eterface sorlon l' evironmint: X ou "
+"môde tecse.\n"
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+"urpmi modêye %s\n"
+"Copyright © 1999, 2000, 2001 MandrakeSoft.\n"
+"Çouci est on libe programe et pout esse cossemé so les termes del licince "
+"GPL.po s' è siervî:\n"
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, c-format
 msgid ""
 "%s\n"
@@ -829,7 +989,7 @@ msgstr ""
 "%s\n"
 "nén mezåjhe di dner li <tchmin relatif pol fitchî hdlist> avou --distrib"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -851,17 +1011,7 @@ msgstr ""
 "       http://<lodjoe>/<tchimin> with <tchimin relatif pol fitchî hdlist>\n"
 "       removable://<tchimin>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "dji n' pout radjouter l' sopoirt «%s»\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "dji n' pout mete a djoû l' sopoirt «%s»\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -871,11 +1021,7 @@ msgstr ""
 "\n"
 "tchûzes nén cnoxhowes «%s»\n"
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - netyî l' ridant muchete des tiestires.\n"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -884,16 +1030,7 @@ msgstr ""
 "%s\n"
 "i manke li tchmin relatif pol fitchî hdlist\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - foirci l' askepiaedje des fitchîs «hdlist».\n"
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  -f             - foirci l' askepiaedje des fitchîs «hdlist».\n"
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -902,54 +1039,7 @@ msgstr ""
 "%s\n"
 "«with» manke pol sopoirt ftp\n"
 
-#: po/placeholder.h:216
-#, fuzzy
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - eployî kel sopoirt di metaedje a djoû.\n"
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"Po s' è siervî: urpmi.update [tchûzes] <etikete> ...\n"
-"avou <etikete> li no do sopoirt a mete a djoû.\n"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, 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"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - foirci li carculaedje d' on novea fitchî «depslist."
-"ordered».\n"
-
-#: po/placeholder.h:235 urpmi.update:57
-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"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - tchoezi tos les sopoirts nén bodjåves.\n"
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-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"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -958,11 +1048,7 @@ msgstr ""
 "i gn a pont d' intrêye a bodjî\n"
 "(ene di %s)\n"
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - tchoezi tos les sopoirts.\n"
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
@@ -970,32 +1056,24 @@ msgstr ""
 "Po s' è siervî: urpmi.removemedia [-a] <etikete> ...\n"
 "avou <etikete> li no do sopoirt a bodjî.\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr "  -h             - mostere ci messaedje d' aidance chal.\n"
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"Po s' è siervî: urpmi.update [tchûzes] <etikete> ...\n"
+"avou <etikete> li no do sopoirt a mete a djoû.\n"
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: dji n' sai lere li fitchî rpm «%s»\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+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"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1010,46 +1088,12 @@ msgstr ""
 "GPL.\n"
 "Po s' è siervi:\n"
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-"  -c              - tchoezi li metode complete pol risolvaedje do rseraedje "
-"des aloyances.\n"
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
-"des pacaedjes k' i gn a ont mezåjhe d' esse bodjî foû po poleur esse metous "
-"a djoû, çoula n' est nén co sopoirté\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: tchûze «-%s» nén cnoxhowe, loukîz cmint l' eployî avou --help\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1094,17 +1138,17 @@ msgstr ") . _("
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "Po s' è siervî: urpmi.update [tchûzes] <etikete> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "Po s' è siervî: urpmi.removemedia [-a] <etikete> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "Po s' è siervî: urpmi.removemedia [-a] <etikete> ..."
+#: urpmi.update:41
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "Po s' è siervî: urpmi.update [tchûzes] <etikete> ..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3a378c62..d6c558fd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-08-22 18:07+0800\n"
 "Last-Translator: Jesse Kuang <kjx@mandrakesoft.com>\n"
 "Language-Team: Chinese (GB) <future-cjk@mandrakesoft.com>\n"
@@ -29,27 +29,31 @@ msgstr ""
 "×Ô¶¯°²×°Èí¼þ°ü...\n"
 "ÄãÒªÇó°²×°Èí¼þ°ü $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "ÕâÑùºÃÁËÂð?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "È·ÈÏ"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "È¡Ïû"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "nN²»·ñ"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "yYÊÇ"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (ÊÇ(Y)/²»(n)) [ÊÇ] "
 
@@ -57,736 +61,885 @@ msgstr " (ÊÇ(Y)/²»(n)) [ÊÇ] "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: ÃüÁîûÕÒµ½\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf °æ±¾ %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "Ó÷¨: rpmf [Ñ¡Ïî] <Îļþ>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
+#: po/placeholder.h:30 po/placeholder.h:216
+msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:31
-msgid "examining whole urpmi database"
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, fuzzy, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "ÎÞ·¨Ð´Èë ÁбíÎļþ\"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ÎÞ·¨·ÖÎöhdlistÎļþ \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, fuzzy, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ÎÞ·¨Ð´Èë ÁбíÎļþ\"%s\""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "ÎÞ·¨·ÃÎʽéÖÊ\"%s\""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "дÈë depslist Îļþ [%s]"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "ÎÞ·¨É¾³ý²»´æÔڵĽéÖÊ\"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "дÈë depslist Îļþ [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "ÎÞ·¨Îª½éÖÊ\"%s\"´´½¨ synthesisÎļþ"
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "ÊÔͼѡÔñ²»´æÔڵĽéÖÊ\"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "ÎÞ·¨Éý¼¶½éÖÊ\"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ÎÞ·¨Ð´Èë ÁбíÎļþ\"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "ûÓÐÃûΪ %s µÄÈí¼þ°ü"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "³¢ÊÔ¸ü¼¤Áҵݲװ·½Ê½Âð? (ʹÓà --force) (ÊÇ(y)/²»(N)) [²»] "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "ÎÞ·¨Îª½éÖÊ\"%s\"´´½¨ synthesisÎļþ"
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "ÎÞ·¨Îª½éÖÊ\"%s\"´´½¨ synthesisÎļþ"
+msgid " (y/N) "
+msgstr " (ÊÇ(Y)/²»(n)) [ÊÇ] "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
-msgstr ""
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr "ÓÐЩÈí¼þ°üÒªÇóÏÈɾ³ýÔÙÉý¼¶, Ôݲ»Ö§³Ö\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "ÕýÔÚ°²×° %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "¶ÁÈ¡ compss Îļþ [%s]"
-
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ÎÞ·¨´´½¨½éÖÊ\"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ûÓж«Î÷ɾ³ý(ÓÃurpmi.addmediaÔö¼Ó½éÖÊ)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "ÐèÒªÏÂÁÐÈí¼þ°üÖ®Ò»:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "×¼±¸ºÃºó°´ Enter ¼ü..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-#, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "дÈë depslist Îļþ [%s]"
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "ÎÞ·¨µÇ¼Ç rpm Îļþ"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "¿½±´ [%s] ʧ°Ü"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "ÎÞ·¨·ÖÎö [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ûÓж«Î÷Éý¼¶(ÓÃurpmi.addmediaÔö¼Ó½éÖÊ)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "¶ÁÈ¡ compss Îļþ [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "ÎÞ·¨·ÖÎöhdlistÎļþ \"%s\""
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr ""
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "ÎÞ·¨´´½¨½éÖÊ\"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "дÈë depslist Îļþ [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr ""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: δ֪ѡÏî \"-%s\", ÓÃ--help ¼ì²éÓ÷¨\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "Ó÷¨: urpmi.removemedia [-a] <Ãû³Æ> ..."
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "´´½¨hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ÎÞ·¨´Ó½éÖÊ\"%2$s\" ¶ÁÈ¡rpmÎļþ[%1$s]"
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr ""
-
-#: po/placeholder.h:99
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ÎÞ·¨´Ó½éÖÊ\"%2$s\" ¶ÁÈ¡rpmÎļþ[%1$s]"
+
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "ÎÞ·¨Ð´Èë ÁбíÎļþ\"%s\""
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "ÎÞ·¨´´½¨ hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr ""
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "·Ç·¨rpmÎļþ [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "ÇëÊäÈëÄúµÄÑ¡Ôñ:  (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ÎÞ·¨·ÃÎÊrpm Îļþ[%s]"
 
-#: po/placeholder.h:111
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "ÔÚdepslistÖÐÖØж¨Î» %s"
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "¶Ô²»Æð, Ñ¡ÔñÎÞЧ, ÇëÔÙÊÔÒ»´Î\n"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "ÎÞ·¨·ÃÎʽéÖÊ\"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "relocated %s entries in depslist"
+msgstr "ÔÚdepslistÖÐÖØж¨Î» %s"
+
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "ÊÔͼѡÔñ²»´æÔڵĽéÖÊ\"%s\""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "ÏÂÁÐÈí¼þ°üÀïÓÐ %s: %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] ûÓз¢ÏÖrpm Îļþ"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "дÈë depslist Îļþ [%s]"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ÎÞ·¨ÅÐ¶Ï hdlistÎļþµÄ½éÖÊ [%s]"
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "È«²¿°²×°Íê³É"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:123 po/placeholder.h:217
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "ÐèÒªÏÂÁÐÈí¼þ°üÖ®Ò»:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ÎÞ·¨¶ÁÈ¡rpmÎļþ \"%s\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "°²×°Ê§°Ü"
+
+#: po/placeholder.h:132 po/placeholder.h:224
 #, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "ÔÚdepslistÖÐÖØж¨Î» %s"
+msgid "unable to access first installation medium"
+msgstr "ÎÞ·¨·ÃÎʽéÖÊ\"%s\""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "ʹÓùýÆÚÑ¡Ôñ %s"
+msgid "unmounting %s"
+msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "ÕýÔÚÎļþÉÏÑ¡Ôñ %s"
+msgid "no hdlist file found for medium \"%s\""
+msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "ÎÞ·¨Ð´Èë ÁбíÎļþ\"%s\""
+msgid "removing medium \"%s\""
+msgstr "ÎÞ·¨É¾³ý²»´æÔڵĽéÖÊ\"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "ÎÞ·¨Îª½éÖÊ\"%s\"´´½¨ synthesisÎļþ"
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "ÊÔͼѡÔñ²»´æÔڵĽéÖÊ\"%s\""
+
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
+msgstr ""
+
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ÎÞ·¨ÅÐ¶Ï hdlistÎļþµÄ½éÖÊ [%s]"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "È«²¿°²×°Íê³É"
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr ""
+
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "ÎÞ·¨Îª½éÖÊ\"%s\"´´½¨ synthesisÎļþ"
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "¶ÁÈ¡ compss Îļþ [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ÎÞ·¨´´½¨½éÖÊ\"%s\"\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr ""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "ÎÒ½«ÁíÍâ°²×°ÏÂÁÐÈí¼þ°ü (%d MB), ÒÔÂú×ãÏà¹ØÐÔÒªÇó"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "дÈë depslist Îļþ [%s]"
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: δ֪ѡÏî \"-%s\", ÓÃ--help ¼ì²éÓ÷¨\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "ÐèÒªÏÂÁÐÈí¼þ°üÖ®Ò»:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "ÎÞ·¨µÇ¼Ç rpm Îļþ"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "°²×°Ê§°Ü"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "¿½±´ [%s] ʧ°Ü"
+
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "ÎÞ·¨·ÖÎöhdlistÎļþ \"%s\""
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "ÎÒ½«ÁíÍâ°²×°ÏÂÁÐÈí¼þ°ü (%d MB), ÒÔÂú×ãÏà¹ØÐÔÒªÇó"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: po/placeholder.h:180 po/placeholder.h:277
+#, fuzzy
+msgid "copying hdlists file..."
+msgstr "дÈë depslist Îļþ [%s]"
+
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "³¢ÊÔºöÂÔÏà¹ØÐÔ¼ì²é¶ø°²×°Âð? (ÊÇ(y)/²»(N)) [²»] "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr ""
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "ÎÞ·¨Ð´Èë ÁбíÎļþ\"%s\""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "ÇëÊäÈëÄúµÄÑ¡Ôñ:  (1-%d) "
+msgid "unable to build hdlist: %s"
+msgstr "ÎÞ·¨´´½¨ hdlist: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "³¢ÊÔ¸ü¼¤Áҵݲװ·½Ê½Âð? (ʹÓà --force) (ÊÇ(y)/²»(N)) [²»] "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "¶Ô²»Æð, Ñ¡ÔñÎÞЧ, ÇëÔÙÊÔÒ»´Î\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "ÕýÔÚ°²×° %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Çë²åÈë±êÇ© \"%s\" µÄ½éÖʵ½É豸 [%s]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "ÏÂÁÐÈí¼þ°üÀïÓÐ %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "дÈë depslist Îļþ [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "ÔÚdepslistÖÐÖØж¨Î» %s"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "ÎÞ·¨¶ÁÈ¡Ô´Èí¼þ°ü£¬ ÖÐÖ¹"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "×¼±¸ºÃºó°´ Enter ¼ü..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr ""
+
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "ʹÓùýÆÚÑ¡Ôñ %s"
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "ÕýÔÚÎļþÉÏÑ¡Ôñ %s"
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "ÎÞ·¨Ð´Èë ÁбíÎļþ\"%s\""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "Ö»Óг¬¼¶Óû§¿ÉÒÔ°²×°±¾»úÈí¼þ°ü"
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "ÐèÒªÏÂÁÐÈí¼þ°üÖ®Ò»:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -795,7 +948,7 @@ msgstr ""
 "%s\n"
 "<hdlistÏà¶Ô·¾¶>ÕÒ²»µ½\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -815,17 +968,7 @@ msgstr ""
 "       http://<Ö÷»ú>/<·¾¶> with <hdlistÏà¶Ô·¾¶>\n"
 "       removable_<É豸>://<·¾¶>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ÎÞ·¨´´½¨½éÖÊ\"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ÎÞ·¨Éý¼¶½éÖÊ\"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -833,11 +976,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -846,15 +985,7 @@ msgstr ""
 "%s\n"
 "<hdlistÏà¶Ô·¾¶>ÕÒ²»µ½\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -863,55 +994,7 @@ msgstr ""
 "%s\n"
 "`with'ÕÒ²»µ½ftp½éÖÊ\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-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"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"ÕÒ²»µ½ÒªÉý¼¶µÄÏî\n"
-"(%sÖÐÖ®Ò»)\n"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ûÓж«Î÷Éý¼¶(ÓÃurpmi.addmediaÔö¼Ó½éÖÊ)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ûÓж«Î÷ɾ³ý(ÓÃurpmi.addmediaÔö¼Ó½éÖÊ)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -920,11 +1003,7 @@ msgstr ""
 "ÕÒ²»µ½ÒªÉ¾³ýµÄÏî\n"
 "(%sÖеÄÒ»¸ö)\n"
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -936,32 +1015,28 @@ msgstr ""
 "\n"
 "δ֪ѡÏî '%s'\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+#, fuzzy
+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"
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ÎÞ·¨¶ÁÈ¡rpmÎļþ \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"ÕÒ²»µ½ÒªÉý¼¶µÄÏî\n"
+"(%sÖÐÖ®Ò»)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -971,42 +1046,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr "ÓÐЩÈí¼þ°üÒªÇóÏÈɾ³ýÔÙÉý¼¶, Ôݲ»Ö§³Ö\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: δ֪ѡÏî \"-%s\", ÓÃ--help ¼ì²éÓ÷¨\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1050,18 +1095,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "Ó÷¨: urpmi.update [-a] <Ãû³Æ>..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "Ó÷¨: urpmi.removemedia [-a] <Ãû³Æ> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "Ó÷¨: urpmi.removemedia [-a] <Ãû³Æ> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "Ó÷¨: urpmi.update [-a] <Ãû³Æ>..."
 
 #: urpmq:34
 #, c-format
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8bc9ee49..a2114da4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+0100\n"
 "PO-Revision-Date: 2001-09-18 10:33--800\n"
 "Last-Translator: Joe Man <trmetal@yahoo.com.hk>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -29,27 +29,31 @@ msgstr ""
 "¦Û°Ê¦w¸Ë®M¥ó...\n"
 "±z­n¨D¦w¸Ëªº®M¥ó $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "¥¿½T¶Ü¡S"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "½T©w"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "¨ú®ø"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "Nn(§_)"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "Yy(¬O)"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (Y/n) (¬O/§_) "
 
@@ -57,752 +61,911 @@ msgstr " (Y/n) (¬O/§_) "
 msgid "$rpm: command not found\n"
 msgstr "$rpm¡G§ä¤£¨ì«ü¥O\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf ª©¥» %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "ª©Åv©Ò¦³ (C) 1999,2000,2001 MandrakeSoft¡C"
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr "³o¬O¤@­Ó¦Û¥Ñµ{¦¡¨Ã¿í·Ó GNU GPL ªº±ø´Úµo§G¡C"
 
-#: po/placeholder.h:9 po/placeholder.h:26
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "¥Îªk¡Grpmf [¿ï¶µ] <ÀɮצWºÙ>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 "  --quiet        - ¤£Åã¥Ü¦b«ü¥O¦æ©Ò¿é¤Jªº¿ï¶µ¦WºÙ (­Y«ü¥O¦æ¤º¨S¦³¥ô¦ó¿ï¶µ®É"
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr "                    ³o­Ó·|¬O¹w³]¿ï¶µ¡A»P¤¬°Ê¼Ò¦¡¤£¬Û®e)¡C"
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 "  --name         - Åã¥Ü®M¥ó¥þ¦W¡Grpm ¦WºÙ (­Y«ü¥O¦æ¤º¨S¦³«ü©w¥ô¦ó¿ï¶µ¡A"
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr "                   ¹w³]·|Åã¥Ü®M¥ó¥þ¦W¡A¦ý¤£·|Åã¥Ü®M¥ó²ºÙ)¡C"
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr "  --group        - Åã¥Ü®M¥ó©ÒÄݸs²Õ¡C"
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr "  --size          - Åã¥Ü®M¥ó¤j¤p¡C"
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr "  --serial        - Åã¥Ü®M¥ó§Ç¸¹¡C"
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr "  --summary       - Åã¥Ü®M¥óºK­n¡C"
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr "  --description   - Åã¥Ü®M¥ó¸Ô¸Ñ¸ê®Æ¡C"
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 " --provides      - Åã¥Ü¥þ³¡¬ÛÃöªº®M¥ó¤Î®M¥ó©Ò´£¨Ñªº¨ç¦¡®w¡G(¦h¦æÅã¥Ü)¡C"
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr "  --requires      - Åã¥Ü¥þ³¡¬ÛÃöªº®M¥ó¤ÎÀÉ®× (¦h¦æÅã¥Ü)¡C"
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr "  --files        - Åã¥Ü¥þ³¡¬ÛÃöÀÉ®× (¦h¦æÅã¥Ü)¡C"
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr "  --conflicts     - Åã¥Ü¥þ³¡¤£¬Û®eªº®M¥ó (¦h¦æÅã¥Ü)¡C"
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr "  --obsoletes     - Åã¥Ü¥þ³¡¹L®É®M¥ó (¦h¦æÅã¥Ü)¡C"
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr "  --prereqs       - Åã¥Ü¥þ³¡¥²»Ý¤w¦w¸Ëªº¬ÛÃö®M¥ó (¦h¦æÅã¥Ü)¡C"
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr "Áä¤J urpmf --help Åã¥Ü§ó¦h¿ï¶µ¸ê®Æ"
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "µLªk¼g¤J³]©wÀÉ [%s]"
 
-#: po/placeholder.h:30 urpm.pm:1892
-#, fuzzy
-msgid "retrieving rpms files..."
-msgstr "Â^¨ú [%s]"
-
-#: po/placeholder.h:31
+#: po/placeholder.h:30 po/placeholder.h:216
 msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+#, fuzzy
+msgid "  -y             - impose fuzzy search.\n"
+msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
+
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "µLªk§ä¨ì \"%s\" ªº²M³æÀɮסA©¿²¤³o­Ó´C¤¶"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "¨S¦³¸ê®Æ¼g¤J \"%s\" ªº²M³æÀÉ®×"
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "µLªk§ä¨ì \"%s\" ªº²M³æÀɮסA©¿²¤³o­Ó´C¤¶"
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "µLªk¸ÑªRÀÉÀY²M³æ (hdlist) \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "¨S¦³¸ê®Æ¼g¤J \"%s\" ªº²M³æÀÉ®×"
 
-#: po/placeholder.h:38
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:39 po/placeholder.h:223
 #, fuzzy, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "Â^¨ú [%s]"
 
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "µLªk¦s¨ú \"%s\" ªº²M³æÀÉ¡A©¿²¤³o­Ó´C¤¶ "
-
-#: po/placeholder.h:40 urpm.pm:1768
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
 msgid "package %s is not found."
 msgstr "§ä¤£¨ì®M¥ó %s¡C"
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
-msgstr "¨ø¤U %s"
-
-#: po/placeholder.h:42
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "²¾°£ %d ­Ó¦b§Ö¨ú°Ï¤ºµL¥ÎªºÀÉÀY"
-
-#: po/placeholder.h:43
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "µLªk§ä¨ì´C¤¶ \"%s\" ªºÀÉÀY²M³æ (hdlist)"
-
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr "´C¤¶ \"%s\" ¥ø¹Ï¨Ï¥Î¤@­Ó¤w³Q¨Ï¥ÎªºÀÉÀY²M³æ (hdlist)¡A©¿²¤³o­Ó´C¤¶"
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "Ū¨ú hdlist ÀÉ®× [%s]"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "µLªk¨Ï¥Î³o­Ó¦WºÙ \"%s\"¡A¦]¦P¤@¦WºÙªº´C¤¶¤w¦s¦b"
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "¥ø¹Ï²¾°£¤£¦s¦bªº´C¤¶ \"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "Ū¨ú hdlist ÀÉ®× [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "¤£·|¦Ò¼{¨Ï¥Î´C¤¶ \"%s\" ¦]²M³æÀÉ®× [%s] ¤£¦s¦b"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr "¥u«O¦s¦b\"®M¥ó»P¨ç¦¡®w²M³æ\" (provides) ¤º¦³ÃöªºÀÉ®×"
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "µLªk¬°´C¤¶ \"%s\" «Ø¥ßºî¦XÀÉÀY²M³æ (synthesis)"
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr "¦b§Ö¨úªÅ¶¡¤º§ä¨ì %d ­ÓÀÉÀY"
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "¥ø¹Ï¿ï¾Ü¤£¦s¦bªº´C¤¶ \"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "¨S¦³¿ï¨ú %s ¦]¥¦ªº¥»¦a»y¨¥®M¥ó¤´¥¼¿ï©w"
+msgid "unable to update medium \"%s\"\n"
+msgstr "µLªk§ó·s´C¤¶ \"%s\"\n"
 
-#: po/placeholder.h:55
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
-msgstr ""
-"²¾°£®M¥ó %s ¥H«K¶i¦æ¤É¯Å¨ì ...\n"
-"  ª©¥» %s¡A §_«h¥¦±N¤£·|³Q§ó·s¡I"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+#, fuzzy
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "´C¤¶ \"%s\" ¤w¦s¦b"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "µLªk¼g¤J²M³æÀÉ®× \"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
-msgstr "¼g¤J³]©wÀÉ [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "¨S¦³®M¥ó¨ã¦³³o­Ó¦WºÙ %s"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "¨Ï¥Î±j¨î©Êªº¦w¸Ë¤è¦¡ (--force)¡H(y/N)(¬O/§_)"
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "µLªk§ä¨ì \"%s\" ªºÀÉÀY²M³æ (hdlist)¡A©¿²¤³o­Ó´C¤¶"
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "¬°´C¤¶ \"%s\" «Ø¥ßºî¦XÀÉÀY²M³æ (synthesis)"
 
-#: po/placeholder.h:64
-#, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
 msgstr ""
-"µLªk´M§ä¥þ³¡ºî¦XÀÉÀY²M³æ (synthesis)¡A¨Ï¥ÎÀÉÀY²M³æ¸ÑªR (parsehdlist) ¦øªA¾¹"
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "µLªk§ä¨ì \"%s\" ªºÀÉÀY²M³æ (hdlist)¡A©¿²¤³o­Ó´C¤¶"
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#, fuzzy
+msgid " (y/N) "
+msgstr " (Y/n) (¬O/§_) "
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr "¬°¤F¥i¥H¶¶§Q¤É¯Å¡A¬Y¨Ç®M¥ó¥²¶·¥ý¦æ²¾°£¡A³o­Ó¥\¯à¤´¥¼¤ä´©\n"
+
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "±¾¸ü %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr "µLªk³B²z´C¤¶ \"%s\"¡A¦]¬°¨ä¥¦´C¤¶¥¿¦b¨Ï¥Î²M³æÀÉ"
-
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "Ū¨ú¬ÛÃö²M³æ (depslist) [%s]"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+#, fuzzy
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --group        - Åã¥Ü®M¥ó©ÒÄݸs²Õ¡C"
 
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "µLªk«Ø¥ß´C¤¶ \"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "µL¥i²¾°£ (¨Ï¥Î urpmi.addmedia «ü¥O·s¼W´C¤¶)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "¤£¦X®æ¦¡ªº¿é¤J¡G[%s]"
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
+
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "¦b¨º¸Ì¦³¦h­Ó¬Û¦P¦WºÙªº®M¥ó \"%s\""
+msgid "One of the following packages is needed to install %s:"
+msgstr "¶·­n¦w¸Ë¥H¤U¨ä¤¤ªº¤@­Ó®M¥ó %s¡G"
 
-#: po/placeholder.h:74
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "§¹¦¨«á½Ð«ö <¿é¤JÁä>¡D¡D"
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr "´C¤¶ \"%s\" ¹Á¸Õ¨Ï¥Î¥¿¦b¨Ï¥Î¤¤ªº²M³æ¡A©¿²¤³o­Ó´C¤¶"
 
-#: po/placeholder.h:76
+#: po/placeholder.h:74 po/placeholder.h:448
 #, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "Â^¨ú [%s]"
+msgid "  -h             - print this help message.\n"
+msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
 
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "µLªk¦s¨ú \"%s\" ªºÀÉÀY²M³æ (hdlist)¡A©¿²¤³o­Ó´C¤¶"
+#: po/placeholder.h:75 po/placeholder.h:450
+#, fuzzy
+msgid "  -g             - print groups too with name.\n"
+msgstr "  --group        - Åã¥Ü®M¥ó©ÒÄݸs²Õ¡C"
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "µLªkµn°O®M¥óÀÉ"
+#: po/placeholder.h:76 po/placeholder.h:424
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
 
-#: po/placeholder.h:79
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "\"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "µLªkÀˬd \"%s\" ªº²M³æÀÉ¡A©¿²¤³o­Ó´C¤¶"
+#: po/placeholder.h:78 po/placeholder.h:407
+#, fuzzy
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  --group        - Åã¥Ü®M¥ó©ÒÄݸs²Õ¡C"
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
+#: po/placeholder.h:79 po/placeholder.h:454
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr "                   ¹w³]·|Åã¥Ü®M¥ó¥þ¦W¡A¦ý¤£·|Åã¥Ü®M¥ó²ºÙ)¡C"
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "¤£³s³eªº \"%s\" ªº²M³æÀÉ¡A©¿²¤³o­Ó´C¤¶"
-
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "½Æ»s [%s] ¥¢±Ñ"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "µLªk¥¿½T¸ÑªR [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "µL¥i§ó·s (¨Ï¥Î urpmi.addmedia «ü¥O·s¼W´C¤¶)\n"
+
+#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "Ū¨ú¬ÛÃö²M³æ (depslist) [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "µLªk¸ÑªRÀÉÀY²M³æ (hdlist) \"%s\""
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-#, fuzzy
-msgid "...copying done"
-msgstr "Â^¨ú [%s]"
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "µLªk«Ø¥ß´C¤¶ \"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "Ū¨ú hdlist ÀÉ®× [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "³]©wÀɤºªº²Ä %s ¦æ»yªk¿ù»~"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq¡G¤£¸Ôªº¿ï¶µ \"-%s\"¡A½Ð¿é¤J --help ¿ï¶µ¾\Ū¨Ï¥Î¤èªk\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "¥Îªk¡Gurpmi.removemedia [-a] <´C¤¶¦WºÙ> ..."
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "«Ø¥ßÀÉÀY²M³æ (hdlist) [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "µLªk±q´C¤¶ \"%2$s\" Ū¨ú®M¥óÀÉ [%1$s]"
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr "µn°O¥»¾÷®M¥ó®Éµo¥Í¿ù»~"
-
-#: po/placeholder.h:99
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "µLªk±q´C¤¶ \"%2$s\" Ū¨ú®M¥óÀÉ [%1$s]"
+
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "Â^¨ú [%s]"
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "¦³°ÝÃDªº´C¤¶ \"%s\"¡A¦]¬°¤£¥¿½T¦a¼Ð¥Ü¦¨¥i²¾°£ªº´C¤¶"
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "¨S¦³¸ê®Æ¼g¤J \"%s\" ªº²M³æÀÉ®×"
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "µLªk«Ø¥ßÀÉÀY²M³æ (hdlist)¡G%s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "¤´¥¼¿ï©w´C¤¶ \"%s\""
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "¤£¦Xªkªº®M¥ó¦WºÙ [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "¤£¸Ôªº¸ê®Æ»P %s ¦³©ÒÃö³s"
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "¹Á¸Õ©¿²¤²{¦sªº´C¤¶ \"%s\"¡A©¿²¤³o­Ó´C¤¶"
+msgid "What is your choice? (1-%d) "
+msgstr "¨º¤@­Ó¬O§Aªº¿ï¾Ü¡S (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "µLªk¦s¨ú \"%s\" ªº²M³æÀÉ¡A©¿²¤³o­Ó´C¤¶ "
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "¨S¦³¿ï¨ú %s ¦]¨S¦³¨¬°÷ÀÉ®×¥h¶i¦æ§ó·s"
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "µLªk¦s¨ú®M¥óÀÉ [%s]"
 
-#: po/placeholder.h:111
-#, fuzzy, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-"²¾°£®M¥ó %s ¥H«K¶i¦æ¤É¯Å¨ì ...\n"
-"  ª©¥» %s¡A§_«h¥¦±N¤£¯à¥¿½T¤É¯Å¡I"
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "­«·s±Æ¦C %s ªº¬ÛÃö²M³æ¤ºªº¶µ¥Ø"
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "¹ï¤£°_¡A¿ï¾Ü¿ù»~¡A½Ð¦A¸Õ¤@¦¸\n"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "µLªk¦s¨ú´C¤¶ \"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr "µLªk¥¿½T¸ÑªR¦b¼Æ­È \"%2$s\" ¤ºªº [%1$s]"
+msgid "relocated %s entries in depslist"
+msgstr "­«·s±Æ¦C %s ªº¬ÛÃö²M³æ¤ºªº¶µ¥Ø"
 
-#: po/placeholder.h:118
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "¥ø¹Ï¿ï¾Ü¤£¦s¦bªº´C¤¶ \"%s\""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "¥H¤U®M¥ó¥]§t %s¡G%s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "µLªk¥¿½T¸ÑªR¦b¼Æ­È \"%2$s\" ¤ºªº [%1$s]"
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "¦b [%s] ¤º§ä¤£¨ì®M¥óÀÉ"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "Ū¨ú hdlist ÀÉ®× [%s]"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "µLªk½T©w³o­ÓÀÉÀY²M³æ (hdlist) [%s] ªº¦³Ãö´C¤¶"
 
-#: po/placeholder.h:122 urpm.pm:1191
+#: po/placeholder.h:119 po/placeholder.h:328
 #, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "­«·s±Æ¦C %s ªº¬ÛÃö²M³æ¤ºªº¶µ¥Ø"
+msgid "  --help         - print this help message.\n"
+msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "¥þ³¡³£¤w¦w¸Ë"
 
-#: po/placeholder.h:123 urpm.pm:1897
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
 #, fuzzy
-msgid "...retrieving done"
+msgid "retrieving rpms files..."
 msgstr "Â^¨ú [%s]"
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:123 po/placeholder.h:217
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "¿ï©wªº®M¥óµo¦æª©¥» %s ·|¨Ï¥Î¨ì¨ä¥¦¹L®Éªº®M¥ó"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "¶·­n¥H¤U¨ä¤¤¤@­Ó®M¥ó¡G"
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq¡GµLªkŪ¨ú®M¥óÀÉ \"%s\"\n"
+
+#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "¦w¸Ë¥¢±Ñ"
+
+#: po/placeholder.h:132 po/placeholder.h:224
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr "µLªk¦s¨ú \"%s\" ªº²M³æÀÉ¡A©¿²¤³o­Ó´C¤¶ "
+
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+#, fuzzy
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  --group        - Åã¥Ü®M¥ó©ÒÄݸs²Õ¡C"
+
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "¿ï¨ú¦³ÃöÀɮ׮ɦ۰ʿï©w %s ®M¥ó"
+msgid "unmounting %s"
+msgstr "¨ø¤U %s"
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:136 po/placeholder.h:227
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "²¾°£ %d ­Ó¦b§Ö¨ú°Ï¤ºµL¥ÎªºÀÉÀY"
+
+#: po/placeholder.h:137 po/placeholder.h:228
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "µLªk§ä¨ì´C¤¶ \"%s\" ªºÀÉÀY²M³æ (hdlist)"
+
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "¨S¦³¸ê®Æ¼g¤J \"%s\" ªº²M³æÀÉ®×"
+msgid "removing medium \"%s\""
+msgstr "¥ø¹Ï²¾°£¤£¦s¦bªº´C¤¶ \"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "µLªk¬°´C¤¶ \"%s\" «Ø¥ßºî¦XÀÉÀY²M³æ (synthesis)"
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "¥ø¹Ï¿ï¾Ü¤£¦s¦bªº´C¤¶ \"%s\""
+
+#: po/placeholder.h:144 po/placeholder.h:447
+#, fuzzy
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
+
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "µLªk½T©w³o­ÓÀÉÀY²M³æ (hdlist) [%s] ªº¦³Ãö´C¤¶"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "¨S¦³¿ï¨ú %s ¦]¥¦ªº¥»¦a»y¨¥®M¥ó¤´¥¼¿ï©w"
+
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
+msgstr ""
+
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr "¼g¤J³]©wÀÉ [%s]"
 
-#: po/placeholder.h:132
+#: po/placeholder.h:150 po/placeholder.h:249
 #, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr ""
+"µLªk´M§ä¥þ³¡ºî¦XÀÉÀY²M³æ (synthesis)¡A¨Ï¥ÎÀÉÀY²M³æ¸ÑªR (parsehdlist) ¦øªA¾¹"
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "¥þ³¡³£¤w¦w¸Ë"
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr "µLªk³B²z´C¤¶ \"%s\"¡A¦]¬°¨ä¥¦´C¤¶¥¿¦b¨Ï¥Î²M³æÀÉ"
+
+#: po/placeholder.h:156 po/placeholder.h:254
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "Ū¨ú¬ÛÃö²M³æ (depslist) [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "µLªk«Ø¥ß´C¤¶ \"%s\"\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "¦b¨º¸Ì¦³¦h­Ó¬Û¦P¦WºÙªº®M¥ó \"%s\""
+
+#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "¬°¤F¥O¿ï¨ú¤Fªº®M¥ó¯à¥¿±`°õ¦æ¡A¥H¤Uªº®M¥ó¥ç»Ý­n¤@¦P¦w¸Ë¡C (%d MB)"
+
+#: po/placeholder.h:163 po/placeholder.h:261
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "Â^¨ú [%s]"
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi¡G¤£¸Ôªº¿ï¶µ \"-%s\"¡A½Ð¿é¤J --help ¿ï¶µ¾\Ū¨Ï¥Î¤èªk\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "µLªk¦s¨ú \"%s\" ªºÀÉÀY²M³æ (hdlist)¡A©¿²¤³o­Ó´C¤¶"
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "¶·­n¥H¤U¨ä¤¤¤@­Ó®M¥ó¡G"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "µLªkµn°O®M¥óÀÉ"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "µLªkÀˬd \"%s\" ªº²M³æÀÉ¡A©¿²¤³o­Ó´C¤¶"
+
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "¤£³s³eªº \"%s\" ªº²M³æÀÉ¡A©¿²¤³o­Ó´C¤¶"
+
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "¦w¸Ë¥¢±Ñ"
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "½Æ»s [%s] ¥¢±Ñ"
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:173 po/placeholder.h:462
+#, fuzzy
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "                   ¹w³]·|Åã¥Ü®M¥ó¥þ¦W¡A¦ý¤£·|Åã¥Ü®M¥ó²ºÙ)¡C"
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "µLªk¸ÑªRÀÉÀY²M³æ (hdlist) \"%s\""
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+#, fuzzy
+msgid "...copying done"
+msgstr "Â^¨ú [%s]"
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "¬°¤F¥O¿ï¨ú¤Fªº®M¥ó¯à¥¿±`°õ¦æ¡A¥H¤Uªº®M¥ó¥ç»Ý­n¤@¦P¦w¸Ë¡C (%d MB)"
 
-#: po/placeholder.h:149 po/placeholder.h:273
+#: po/placeholder.h:180 po/placeholder.h:277
 #, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  --group        - Åã¥Ü®M¥ó©ÒÄݸs²Õ¡C"
+msgid "copying hdlists file..."
+msgstr "Ū¨ú hdlist ÀÉ®× [%s]"
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "³]©wÀɤºªº²Ä %s ¦æ»yªk¿ù»~"
+
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "µL¶·Àˬd®M¥óªº¥i°õ¦æ¯à¤O´N¶i¦æ¦w¸Ë¡H(y/N)(¬O/§_)"
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
+msgstr "µn°O¥»¾÷®M¥ó®Éµo¥Í¿ù»~"
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "¨S¦³¸ê®Æ¼g¤J \"%s\" ªº²M³æÀÉ®×"
+
+#: po/placeholder.h:188 po/placeholder.h:288
+#, c-format
+msgid "unable to build hdlist: %s"
+msgstr "µLªk«Ø¥ßÀÉÀY²M³æ (hdlist)¡G%s"
 
-#: po/placeholder.h:159
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "¤´¥¼¿ï©w´C¤¶ \"%s\""
+
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "¹Á¸Õ©¿²¤²{¦sªº´C¤¶ \"%s\"¡A©¿²¤³o­Ó´C¤¶"
+
+#: po/placeholder.h:191 po/placeholder.h:355
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
 
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "¨º¤@­Ó¬O§Aªº¿ï¾Ü¡S (1-%d) "
+msgid "Using \"%s\" as a substring, I found"
+msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
+#, c-format
+msgid "installing %s\n"
+msgstr "¥¿¦b¦w¸Ë %s\n"
+
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "½Ð±N¨ã¦³¦WºÙ \"%s\" ªº´C¤¶©ñ¤J¨ì¸Ë¸m [%s] ¤º"
+
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "¥H¤U®M¥ó¥]§t %s¡G%s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
 #, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-msgstr "³o¬O¤@­Ó¦Û¥Ñµ{¦¡¨Ã¿í·Ó GNU GPL ªº±ø´Úµo§G¡C"
+msgid "examining hdlist file [%s]"
+msgstr "Ū¨ú hdlist ÀÉ®× [%s]"
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "¨Ï¥Î±j¨î©Êªº¦w¸Ë¤è¦¡ (--force)¡H(y/N)(¬O/§_)"
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "­«·s±Æ¦C %s ªº¬ÛÃö²M³æ¤ºªº¶µ¥Ø"
 
-#: po/placeholder.h:171 po/placeholder.h:269
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "¹ï¤£°_¡A¿ï¾Ü¿ù»~¡A½Ð¦A¸Õ¤@¦¸\n"
+#: po/placeholder.h:205 po/placeholder.h:445
+#, fuzzy
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  --group        - Åã¥Ü®M¥ó©ÒÄݸs²Õ¡C"
 
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
+msgid "unable to get source packages, aborting"
+msgstr "ªk¨ú±o­ì©l½X®M¥ó¡A©ñ±ó"
 
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+#, fuzzy
+msgid "...retrieving done"
+msgstr "Â^¨ú [%s]"
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
 #, c-format
-msgid "installing %s\n"
-msgstr "¥¿¦b¦w¸Ë %s\n"
+msgid "selecting %s using obsoletes"
+msgstr "¿ï©wªº®M¥óµo¦æª©¥» %s ·|¨Ï¥Î¨ì¨ä¥¦¹L®Éªº®M¥ó"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "½Ð±N¨ã¦³¦WºÙ \"%s\" ªº´C¤¶©ñ¤J¨ì¸Ë¸m [%s] ¤º"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
-msgid "unable to get source packages, aborting"
-msgstr "ªk¨ú±o­ì©l½X®M¥ó¡A©ñ±ó"
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "¿ï¨ú¦³ÃöÀɮ׮ɦ۰ʿï©w %s ®M¥ó"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "§¹¦¨«á½Ð«ö <¿é¤JÁä>¡D¡D"
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "¨S¦³¸ê®Æ¼g¤J \"%s\" ªº²M³æÀÉ®×"
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "¥u¦³¶W¯Å¨Ï¥ÎªÌ¤~¤¹³\¦w¸Ë¥»¾÷®M¥ó"
 
-#: po/placeholder.h:182 urpmi:216
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "¶·­n¦w¸Ë¥H¤U¨ä¤¤ªº¤@­Ó®M¥ó %s¡G"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:240
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"²¾°£®M¥ó %s ¥H«K¶i¦æ¤É¯Å¨ì ...\n"
+"  ª©¥» %s¡A §_«h¥¦±N¤£·|³Q§ó·s¡I"
+
+#: po/placeholder.h:296
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"²¾°£®M¥ó %s ¥H«K¶i¦æ¤É¯Å¨ì ...\n"
+"  ª©¥» %s¡A§_«h¥¦±N¤£¯à¥¿½T¤É¯Å¡I"
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr "³o¬O¤@­Ó¦Û¥Ñµ{¦¡¨Ã¿í·Ó GNU GPL ªº±ø´Úµo§G¡C"
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -811,7 +974,7 @@ msgstr ""
 "%s\n"
 "¯Ê¤Ö¤F <ÀÉÀY²M³æ (hdlist) ªº¬ÛÃö¸ô®|>\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -833,17 +996,7 @@ msgstr ""
 "         http://<¥D¾÷¦WºÙ>/<¸ô®|> with <hdlist ªº¬ÛÃöÀɮצWºÙ>\n"
 "         removable_<¸Ë¸m>://<¸ô®|>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "µLªk«Ø¥ß´C¤¶ \"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "µLªk§ó·s´C¤¶ \"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -851,12 +1004,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -865,17 +1013,7 @@ msgstr ""
 "%s\n"
 "¯Ê¤Ö¤F <ÀÉÀY²M³æ (hdlist) ªº¬ÛÃö¸ô®|>\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --group        - Åã¥Ü®M¥ó©ÒÄݸs²Õ¡C"
-
-#: po/placeholder.h:211
-#, fuzzy
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  --group        - Åã¥Ü®M¥ó©ÒÄݸs²Õ¡C"
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -884,57 +1022,7 @@ msgstr ""
 "%s\n"
 "ftp ´C¤¶ªº url ¯Ê¤Ö¤F `with' ³o­ÓÃöÁä¦r\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"¥Îªk¡Gurpmi.removemedia [-a] <´C¤¶¦WºÙ> ...\n"
-"<´C¤¶¦WºÙ> §Y¶·­n²¾°£ªº´C¤¶¦WºÙ¡C\n"
-"   -a    ¿ï¾Ü©Ò¦³´C¤¶¡C\n"
-"\n"
-"¤£¸Ôªº¿ï¶µ '%s'\n"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"¯Ê¤Ö¤F¶·­n§ó·sªº¶µ¥Ø\n"
-"(%s ªº¨ä¤¤¤@­Ó)\n"
-
-#: po/placeholder.h:234
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  --group        - Åã¥Ü®M¥ó©ÒÄݸs²Õ¡C"
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "µL¥i§ó·s (¨Ï¥Î urpmi.addmedia «ü¥O·s¼W´C¤¶)\n"
-
-#: po/placeholder.h:236
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "µL¥i²¾°£ (¨Ï¥Î urpmi.addmedia «ü¥O·s¼W´C¤¶)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -943,12 +1031,7 @@ msgstr ""
 "¯Ê¤Ö¤F¶·­n§R°£ªº¶µ¥Ø\n"
 "(%s ªº¨ä¤¤¤@­Ó)\n"
 
-#: po/placeholder.h:247
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -960,35 +1043,28 @@ msgstr ""
 "\n"
 "¤£¸Ôªº¿ï¶µ '%s'\n"
 
-#: po/placeholder.h:252
+#: po/placeholder.h:429
 #, fuzzy
-msgid "  -h             - print this help message.\n"
-msgstr "  --all          - Åã¥Ü¥þ³¡¿ï¶µ©Ò´£¨Ñªº¸ê°T¡C"
-
-#: po/placeholder.h:254
-#, fuzzy
-msgid "  -g             - print groups too with name.\n"
-msgstr "  --group        - Åã¥Ü®M¥ó©ÒÄݸs²Õ¡C"
-
-#: po/placeholder.h:255 urpmq:90
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq¡GµLªkŪ¨ú®M¥óÀÉ \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"¥Îªk¡Gurpmi.removemedia [-a] <´C¤¶¦WºÙ> ...\n"
+"<´C¤¶¦WºÙ> §Y¶·­n²¾°£ªº´C¤¶¦WºÙ¡C\n"
+"   -a    ¿ï¾Ü©Ò¦³´C¤¶¡C\n"
+"\n"
+"¤£¸Ôªº¿ï¶µ '%s'\n"
 
-#: po/placeholder.h:258
-#, fuzzy
-msgid "  -r             - print version and release too with name.\n"
-msgstr "                   ¹w³]·|Åã¥Ü®M¥ó¥þ¦W¡A¦ý¤£·|Åã¥Ü®M¥ó²ºÙ)¡C"
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:438 urpmi.update:59
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"¯Ê¤Ö¤F¶·­n§ó·sªº¶µ¥Ø\n"
+"(%s ªº¨ä¤¤¤@­Ó)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -998,43 +1074,12 @@ msgid ""
 "usage:\n"
 msgstr "³o¬O¤@­Ó¦Û¥Ñµ{¦¡¨Ã¿í·Ó GNU GPL ªº±ø´Úµo§G¡C"
 
-#: po/placeholder.h:266
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                   ¹w³]·|Åã¥Ü®M¥ó¥þ¦W¡A¦ý¤£·|Åã¥Ü®M¥ó²ºÙ)¡C"
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr "¬°¤F¥i¥H¶¶§Q¤É¯Å¡A¬Y¨Ç®M¥ó¥²¶·¥ý¦æ²¾°£¡A³o­Ó¥\¯à¤´¥¼¤ä´©\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq¡G¤£¸Ôªº¿ï¶µ \"-%s\"¡A½Ð¿é¤J --help ¿ï¶µ¾\Ū¨Ï¥Î¤èªk\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1078,18 +1123,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "¥Îªk¡Gurpmi.update [-a] <´C¤¶¦WºÙ> ..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "¥Îªk¡Gurpmi.removemedia [-a] <´C¤¶¦WºÙ> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "¥Îªk¡Gurpmi.removemedia [-a] <´C¤¶¦WºÙ> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "¥Îªk¡Gurpmi.update [-a] <´C¤¶¦WºÙ> ..."
 
 #: urpmq:34
 #, c-format