fixed some ngettext use

2 files changed, 226 insertions, 176 deletions

diff --git a/po/urpmi.pot b/po/urpmi.pot
index 7b39960e..2bf64732 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-02-21 13:05+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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
 #, c-format
 msgid "RPM installation"
 msgstr ""
@@ -24,7 +24,7 @@ msgstr ""
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
 #, c-format
 msgid "_Ok"
 msgstr ""
@@ -72,7 +72,7 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
 #, c-format
 msgid "_Cancel"
 msgstr ""
@@ -92,17 +92,17 @@ msgstr ""
 msgid "No packages specified"
 msgstr ""
 
-#: ../gurpmi2:43
+#: ../gurpmi2:44
 #, c-format
 msgid "Please wait..."
 msgstr ""
 
-#: ../gurpmi2:52
+#: ../gurpmi2:53
 #, c-format
 msgid "Must be root"
 msgstr ""
 
-#: ../gurpmi2:87
+#: ../gurpmi2:88
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -110,42 +110,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr ""
 
-#: ../gurpmi2:111
+#: ../gurpmi2:112
 #, c-format
 msgid "Warning"
 msgstr ""
 
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:629
 #, c-format
 msgid "Ok"
 msgstr ""
 
-#: ../gurpmi2:148
+#: ../gurpmi2:149
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:149
+#: ../gurpmi2:150
 #, c-format
 msgid " (to install)"
 msgstr ""
 
-#: ../gurpmi2:152
+#: ../gurpmi2:153
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../gurpmi2:176
+#: ../gurpmi2:177
 #, c-format
 msgid "_Abort"
 msgstr ""
 
-#: ../gurpmi2:196
+#: ../gurpmi2:197
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -153,41 +153,46 @@ msgid ""
 "Continue installation anyway?"
 msgstr ""
 
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
 #, c-format
-msgid "(%d packages, %d MB)"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 
-#: ../gurpmi2:223
+#: ../gurpmi2:219 ../urpmi:583
+#, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../gurpmi2:225
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../gurpmi2:256
+#: ../gurpmi2:264
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr ""
 
-#: ../gurpmi2:271
+#: ../gurpmi2:279
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -196,7 +201,7 @@ msgid ""
 "Do you want to continue installation ?"
 msgstr ""
 
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -204,37 +209,37 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
 #, c-format
 msgid "removing %s"
 msgstr ""
 
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../gurpmi2:294
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../gurpmi2:326
+#: ../gurpmi2:334
 #, c-format
 msgid "_Done"
 msgstr ""
 
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
 #, c-format
 msgid "Installation failed"
 msgstr ""
 
-#: ../gurpmi2:336
+#: ../gurpmi2:344
 #, c-format
 msgid "The package(s) are already installed"
 msgstr ""
 
-#: ../gurpmi2:338
+#: ../gurpmi2:346
 #, c-format
 msgid "Installation finished"
 msgstr ""
@@ -281,63 +286,63 @@ msgstr ""
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:93
+#: ../urpm.pm:92
 #, c-format
 msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm:112
+#: ../urpm.pm:111
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:128
+#: ../urpm.pm:127
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:134
+#: ../urpm.pm:133
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
 #, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
 #: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr ""
 
-#: ../urpm.pm:144
+#: ../urpm.pm:143
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:149
+#: ../urpm.pm:148
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr ""
 
-#: ../urpm.pm:159
+#: ../urpm.pm:158
 #, c-format
 msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm:161
+#: ../urpm.pm:160
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:165
+#: ../urpm.pm:164
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:261
+#: ../urpm.pm:260
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -357,22 +362,22 @@ msgstr ""
 msgid "You need to be root to use --use-distrib"
 msgstr ""
 
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -642,7 +647,7 @@ msgstr ""
 
 #: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
 msgstr ""
 
 #: ../urpm/lock.pm:50
@@ -1054,18 +1059,18 @@ msgstr ""
 msgid "reading headers from medium \"%s\""
 msgstr ""
 
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
 #, c-format
 msgid "Nn"
 msgstr ""
 
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
 #, c-format
 msgid "Yy"
 msgstr ""
 
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:101
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr ""
@@ -1102,7 +1107,7 @@ msgstr ""
 
 #: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "medium \"%s\" is not available"
 msgstr ""
 
 #: ../urpm/removable.pm:143
@@ -1304,10 +1309,12 @@ msgstr ""
 
 #: ../urpme:134
 #, c-format
-msgid "Remove %d packages?"
-msgstr ""
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
 #, c-format
 msgid " (y/N) "
 msgstr ""
@@ -1555,7 +1562,7 @@ msgstr ""
 msgid "  -m             - the media in which the package was found\n"
 msgstr ""
 
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:93
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
@@ -1565,7 +1572,7 @@ msgstr ""
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:136
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
@@ -1839,7 +1846,7 @@ msgstr ""
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:90
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
@@ -1905,59 +1912,62 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:364
+#: ../urpmi:362
 #, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#: ../urpmi:439
+#: ../urpmi:437
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
 #, c-format
 msgid "%s (to upgrade)"
 msgstr ""
 
-#: ../urpmi:443
+#: ../urpmi:441
 #, c-format
 msgid "%s: %s (to install)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
 #, c-format
 msgid "%s (to install)"
 msgstr ""
 
-#: ../urpmi:452
+#: ../urpmi:450
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: ../urpmi:482
+#: ../urpmi:481
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
 #, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr ""
 
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
 #, c-format
 msgid " (Y/n) "
 msgstr ""
@@ -1967,142 +1977,165 @@ msgstr ""
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
-#: ../urpmi:534
+#: ../urpmi:535
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
 "has to be removed for others to be upgraded:\n"
 "%s\n"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
-#: ../urpmi:541
+#: ../urpmi:544
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
-#: ../urpmi:544
+#: ../urpmi:547
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:586
+#: ../urpmi:589
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:592
+#: ../urpmi:595
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:594
+#: ../urpmi:598
+#, c-format
+msgid "Proceed with the installation of 1 package? (%d MB)"
+msgstr ""
+
+#: ../urpmi:599
 #, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid "Proceed with the installation of the %d package? (%d MB)"
 msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../urpmi:618
+#: ../urpmi:623
 #, c-format
 msgid "Press Enter when ready..."
 msgstr ""
 
-#: ../urpmi:624
+#: ../urpmi:629
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: ../urpmi:666
+#: ../urpmi:672
 #, c-format
 msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmi:673
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr ""
 
-#: ../urpmi:668
+#: ../urpmi:674
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:715
+#: ../urpmi:721
 #, c-format
 msgid "distributing %s"
 msgstr ""
 
-#: ../urpmi:729
+#: ../urpmi:735
 #, c-format
 msgid "installing %s from %s"
 msgstr ""
 
-#: ../urpmi:731
+#: ../urpmi:737
 #, c-format
 msgid "installing %s"
 msgstr ""
 
-#: ../urpmi:756
+#: ../urpmi:762
 #, c-format
 msgid "Installation failed:"
 msgstr ""
 
-#: ../urpmi:763
+#: ../urpmi:769
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: ../urpmi:780
+#: ../urpmi:786
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr ""
 
-#: ../urpmi:819
+#: ../urpmi:825
 #, c-format
 msgid "%d installation transactions failed"
 msgstr ""
 
-#: ../urpmi:828
+#: ../urpmi:834
 #, c-format
 msgid "Installation is possible"
 msgstr ""
 
-#: ../urpmi:833
+#: ../urpmi:839
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:840
+#: ../urpmi:847
 #, c-format
 msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmi:848
+#, c-format
+msgid "Packages %s are already installed"
+msgstr ""
 
-#: ../urpmi:843
+#: ../urpmi:851
 #, c-format
 msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmi:852
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr ""
 
-#: ../urpmi:863
+#: ../urpmi:871
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -2192,17 +2225,17 @@ msgstr ""
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr ""
@@ -2451,42 +2484,48 @@ msgstr ""
 
 #: ../urpmi.update:47
 #, c-format
+msgid ""
+"  --probe-rpms   - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+
+#: ../urpmi.update:48
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:49
+#: ../urpmi.update:50
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
+msgid "  -f             - force updating synthesis/hdlist\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:71
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr ""
 
-#: ../urpmi.update:78
+#: ../urpmi.update:79
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:96
+#: ../urpmi.update:97
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: ../urpmi.update:101
+#: ../urpmi.update:102
 #, c-format
 msgid "ignoring media %s"
 msgstr ""
 
-#: ../urpmi.update:101
+#: ../urpmi.update:102
 #, c-format
 msgid "enabling media %s"
 msgstr ""
@@ -2578,111 +2617,117 @@ msgstr ""
 msgid "  --summary, -S  - print summary.\n"
 msgstr ""
 
-#: ../urpmq:88
+#: ../urpmq:87
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "  --whatrequires - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:89
+#: ../urpmq:88
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid ""
+"  --whatrequires-recursive\n"
+"                   - extended reverse search (includes virtual packages).\n"
 msgstr ""
 
 #: ../urpmq:91
 #, c-format
-msgid "  -g             - print groups with name also.\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
 #: ../urpmq:92
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr ""
-
-#: ../urpmq:93
-#, c-format
-msgid "  -l             - list files in package.\n"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
 #: ../urpmq:94
 #, c-format
-msgid ""
-"  -P             - do not search in provides to find package (default).\n"
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
 #: ../urpmq:95
 #, c-format
-msgid "  -p             - search in provides to find package.\n"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
 #: ../urpmq:96
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
+msgid "  -l             - list files in package.\n"
 msgstr ""
 
 #: ../urpmq:97
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid "  -m             - equivalent to -du\n"
 msgstr ""
 
 #: ../urpmq:98
 #, c-format
-msgid ""
-"  -RR            - extended reverse search (includes virtual packages).\n"
+msgid "  -p             - search in provides to find package.\n"
 msgstr ""
 
 #: ../urpmq:99
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
 #: ../urpmq:100
 #, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+
+#: ../urpmq:101
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:101
+#: ../urpmq:102
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmq:102
+#: ../urpmq:103
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 
-#: ../urpmq:103
+#: ../urpmq:104
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:178
+#: ../urpmq:179
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmq:350
+#: ../urpmq:360
 #, c-format
 msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:361
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
 
-#: ../urpmq:353
+#: ../urpmq:364
 #, c-format
 msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmq:365
+#, c-format
+msgid ""
 "no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
-#: ../urpmq:405
+#: ../urpmq:416
 #, c-format
 msgid "No filelist found\n"
 msgstr ""
 
-#: ../urpmq:417
+#: ../urpmq:428
 #, c-format
 msgid "No changelog found\n"
 msgstr ""
diff --git a/urpme b/urpme
index 94a05d2f..c47453bf 100644
--- a/urpme
+++ b/urpme
@@ -23,11 +23,15 @@ use strict;
 use urpm;
 use urpm::args;
 use urpm::msg;
+use urpm::install;
+use urpm::media;
+use urpm::select;
+
 
 $ENV{PATH} = "/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin";
 delete @ENV{qw(ENV BASH_ENV IFS CDPATH)};
 
-our ($root, $test, $parallel, $auto, $matches, $verbose, $usedistrib, $force, $noscripts, $repackage, @l, $bundle, $restricted);
+our ($test, $parallel, $auto, $matches, $verbose, $force, $noscripts, $repackage, @l, $bundle, $restricted);
 # Translator: Add here the keys which might be pressed in the "Yes"-case.
 my $yesexpr = N("Yy");
 
@@ -44,10 +48,13 @@ usage:
 ") . N("  --parallel     - distributed urpmi across machines of alias.
 ") . N("  --repackage    - Re-package the files before erasing
 ") . N("  --root         - use another root for rpm removal.
+") . N("  --urpmi-root   - use another root for urpmi db & rpm installation.
 ") . N("  --noscripts    - do not execute package scriptlet(s).
 ") . N("  --use-distrib  - configure urpme on the fly from a distrib tree, useful
                    to (un)install a chroot with --root option.
-") . N("  -v             - verbose mode.
+") . N("    --probe-synthesis - use synthesis file.
+") . N("    --probe-hdlist - use hdlist file.
+") . N("  --verbose, -v  - verbose mode.
 ") . N("  -a             - select all packages matching expression.
 ");
     exit(0);
@@ -55,10 +62,10 @@ usage:
 
 @ARGV or usage();
 my @origARGV = @ARGV;
-urpm::args::parse_cmdline() or exit(1);
+my $urpm = new urpm;
+urpm::args::parse_cmdline(urpm => $urpm) or exit(1);
 @l = @ARGV;
 
-my $urpm = new urpm;
 my $state = {};
 
 #- remove verbose if not asked.
@@ -70,7 +77,7 @@ if ($< && !$test) {
 
 #- rurpme checks
 if ($restricted) {
-    urpm::error_restricted($urpm) if $root || $usedistrib || $noscripts || $parallel;
+    urpm::error_restricted($urpm) if $urpm->{root} || $options{usedistrib} || $noscripts || $parallel;
 }
 
 unless ($test) {
@@ -78,15 +85,16 @@ unless ($test) {
 }
 
 #- just configure parallel mode if available.
-$urpm->configure(
+my $_urpmi_lock = urpm::lock::urpmi_db($urpm);
+urpm::media::configure($urpm,
     synthesis => ($parallel ? 'none' : ''),
-    root => $root,
     parallel => $parallel,
-    usedistrib => $usedistrib,
+    probe_with => $options{probe_with},
+    usedistrib => $options{usedistrib},
 );
 
 #- examine packages...
-my @toremove = $urpm->find_packages_to_remove(
+my @toremove = urpm::select::find_packages_to_remove($urpm,
     $state,
     \@l,
     matches => $matches,
@@ -109,10 +117,9 @@ my @toremove = $urpm->find_packages_to_remove(
 	    #- Warning : the following message is parsed in urpm::parallel_*
 	    $urpm->{error}(N("removing package %s will break your system", $_));
 	} 0 },
-    root => $root,
 ) or $urpm->{fatal}(0, N("Nothing to remove"));
 
-my $list = $urpm->translate_why_removed($state, @toremove);
+my $list = urpm::select::translate_why_removed($urpm, $state, @toremove);
 if ($test && $auto) {
     #- Warning : the following message is parsed in urpm::parallel_*
     my $msg = N("Checking to remove the following packages");
@@ -124,25 +131,23 @@ if ($test && $auto) {
     }
     my $msg = N("To satisfy dependencies, the following %d packages will be removed (%d MB)", scalar(@toremove), toMb($sum));
     print STDOUT "$msg:\n$list\n";
-    message_input(N("Remove %d packages?", scalar(@toremove)) . N(" (y/N) "), $force && $yesexpr, boolean => 1) =~ /[$yesexpr]/ or exit 0;
+    message_input(P("Remove %d package?", "Remove %d packages?", scalar(@toremove), scalar(@toremove)) . N(" (y/N) "), $force && $yesexpr, boolean => 1) =~ /[$yesexpr]/ or exit 0;
 }
 
 #- Warning : the following message is parsed in urpm::parallel_*
 print N("removing %s", join(' ', sort @toremove)) . "\n";
 @l = $parallel
-    ? $urpm->parallel_remove(
+    ? urpm::parallel::remove($urpm,
 	\@toremove,
 	test => $test,
 	force => $force,
-	translate_message => 1,
 	noscripts => $noscripts,
 	repackage => $repackage || $urpm->{options}{repackage},
     )
-    : $urpm->install(
+    : urpm::install::install($urpm,
 	\@toremove, {}, {},
 	test => $test,
 	force => $force,
-	translate_message => 1,
 	noscripts => $noscripts,
 	repackage => $repackage || $urpm->{options}{repackage},
     );