update

1 files changed, 286 insertions, 288 deletions

diff --git a/po/urpmi.pot b/po/urpmi.pot
index e24fd7d5..dbb95af6 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-08-29 19:51+0200\n"
+"POT-Creation-Date: 2008-09-01 18:57+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../gurpmi:32 ../gurpmi2:73
+#: ../gurpmi:32 ../gurpmi2:75
 #, c-format
 msgid "RPM installation"
 msgstr ""
@@ -24,7 +24,7 @@ msgstr ""
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
+#: ../gurpmi:47 ../gurpmi2:176 ../gurpmi2:200
 #, c-format
 msgid "_Ok"
 msgstr ""
@@ -72,7 +72,7 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
-#: ../gurpmi:101 ../gurpmi2:171
+#: ../gurpmi:101 ../gurpmi2:176
 #, c-format
 msgid "_Cancel"
 msgstr ""
@@ -98,9 +98,8 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
@@ -131,7 +130,7 @@ msgid ""
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -169,17 +168,17 @@ msgstr ""
 msgid "No packages specified"
 msgstr ""
 
-#: ../gurpmi2:52
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr ""
 
-#: ../gurpmi2:61
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr ""
 
-#: ../gurpmi2:103
+#: ../gurpmi2:107
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -187,42 +186,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr ""
 
-#: ../gurpmi2:131
+#: ../gurpmi2:135
 #, c-format
 msgid "Warning"
 msgstr ""
 
-#: ../gurpmi2:131 ../urpmi:640
+#: ../gurpmi2:135 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:168
+#: ../gurpmi2:173
 #, c-format
 msgid " (to install)"
 msgstr ""
 
-#: ../gurpmi2:171
+#: ../gurpmi2:176
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:172
+#: ../gurpmi2:177
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../gurpmi2:196
+#: ../gurpmi2:201
 #, c-format
 msgid "_Abort"
 msgstr ""
 
-#: ../gurpmi2:218
+#: ../gurpmi2:223
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -230,61 +229,61 @@ msgid ""
 "Continue installation anyway?"
 msgstr ""
 
-#: ../gurpmi2:237 ../urpmi:607
+#: ../gurpmi2:242 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 
-#: ../gurpmi2:238 ../urpmi:608
+#: ../gurpmi2:243 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 
-#: ../gurpmi2:240
+#: ../gurpmi2:245
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:246
+#: ../gurpmi2:251
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../gurpmi2:248 ../urpm/main_loop.pm:49
+#: ../gurpmi2:253 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:262 ../urpm/install.pm:88
+#: ../gurpmi2:267 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../gurpmi2:266
+#: ../gurpmi2:271
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../gurpmi2:283 ../urpmi:635
+#: ../gurpmi2:288 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr ""
 
-#: ../gurpmi2:294
+#: ../gurpmi2:299
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr ""
 
-#: ../gurpmi2:320
+#: ../gurpmi2:325
 #, c-format
 msgid "_Done"
 msgstr ""
 
-#: ../gurpmi2:328 ../urpm/main_loop.pm:111
+#: ../gurpmi2:333 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -292,28 +291,28 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:339 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr ""
 
-#: ../gurpmi2:339
+#: ../gurpmi2:344
 #, c-format
 msgid "The package(s) are already installed"
 msgstr ""
 
-#: ../gurpmi2:341
+#: ../gurpmi2:346
 #, c-format
 msgid "Installation finished"
 msgstr ""
 
-#: ../gurpmi2:342 ../urpme:167
+#: ../gurpmi2:347 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr ""
 
-#: ../gurpmi2:350 ../urpmi:702
+#: ../gurpmi2:355 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -390,7 +389,7 @@ msgstr ""
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
+#: ../urpm.pm:283 ../urpm/download.pm:733 ../urpm/get_pkgs.pm:228
 #: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
 #: ../urpm/media.pm:1474
 #, c-format
@@ -609,42 +608,42 @@ msgstr ""
 msgid "aria2 is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:718
+#: ../urpm/download.pm:717
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:720
+#: ../urpm/download.pm:719
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:783
+#: ../urpm/download.pm:778
 #, c-format
 msgid "retrieving %s"
 msgstr ""
 
-#: ../urpm/download.pm:787
+#: ../urpm/download.pm:782
 #, c-format
 msgid "retrieved %s"
 msgstr ""
 
-#: ../urpm/download.pm:815
+#: ../urpm/download.pm:811
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm/download.pm:836
+#: ../urpm/download.pm:842
 #, c-format
 msgid "%s is not available, falling back on %s"
 msgstr ""
 
-#: ../urpm/download.pm:840
+#: ../urpm/download.pm:846
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:872
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
@@ -1295,552 +1294,551 @@ msgstr ""
 msgid "unmounting %s"
 msgstr ""
 
-#: ../urpm/search.pm:29 ../urpmf:29
+#: ../urpm/select.pm:28
 #, c-format
-msgid ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage: urpmf [options] pattern-expression\n"
+msgid "urpmi was restarted, and the list of priority packages did not change"
 msgstr ""
 
-#: ../urpm/search.pm:36 ../urpmf:36
+#: ../urpm/select.pm:30
 #, c-format
-msgid "  --version      - print this tool's version number.\n"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/select.pm:168
 #, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
+msgid "No package named %s"
 msgstr ""
 
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: ../urpm/search.pm:39 ../urpmf:39
+#: ../urpm/select.pm:172
 #, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
+#: ../urpm/select.pm:300
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr ""
 
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/select.pm:543
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "Package %s is already installed"
 msgstr ""
 
-#: ../urpm/search.pm:43 ../urpmf:43
+#: ../urpm/select.pm:544
 #, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
+msgid "Packages %s are already installed"
 msgstr ""
 
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm/search.pm:45 ../urpmf:45
+#: ../urpm/select.pm:563
 #, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
+msgid "due to already installed %s"
 msgstr ""
 
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm/search.pm:47 ../urpmf:47
+#: ../urpm/select.pm:570
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm/search.pm:48 ../urpmf:48
+#: ../urpm/select.pm:571
 #, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
+msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm/search.pm:49 ../urpmf:49
+#: ../urpm/select.pm:607
 #, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgid "in order to install %s"
 msgstr ""
 
-#: ../urpm/search.pm:50 ../urpmf:50
+#: ../urpm/select.pm:617
 #, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm/search.pm:51 ../urpmf:51
+#: ../urpm/signature.pm:29
 #, c-format
-msgid "Pattern expressions:\n"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm/search.pm:52 ../urpmf:52
+#: ../urpm/signature.pm:60
 #, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm/search.pm:53 ../urpmf:53
+#: ../urpm/signature.pm:62
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpm/search.pm:54 ../urpmf:54
+#: ../urpm/sys.pm:156
 #, c-format
-msgid "  -a             - binary AND operator.\n"
+msgid "system"
 msgstr ""
 
-#: ../urpm/search.pm:55 ../urpmf:55
+#: ../urpm/sys.pm:191
 #, c-format
-msgid "  -o             - binary OR operator.\n"
+msgid "You should restart %s for %s"
 msgstr ""
 
-#: ../urpm/search.pm:56 ../urpmf:56
+#: ../urpm/sys.pm:276
 #, c-format
-msgid "  !              - unary NOT.\n"
+msgid "Can't write file"
 msgstr ""
 
-#: ../urpm/search.pm:57 ../urpmf:57
+#: ../urpm/sys.pm:276
 #, c-format
-msgid "  ( )            - left and right parentheses.\n"
+msgid "Can't open file"
 msgstr ""
 
-#: ../urpm/search.pm:58 ../urpmf:58
+#: ../urpm/sys.pm:289
 #, c-format
-msgid "List of tags:\n"
+msgid "Can't move file %s to %s"
 msgstr ""
 
-#: ../urpm/search.pm:59 ../urpmf:59
+#: ../urpme:41
 #, c-format
-msgid "  --qf           - specify a printf-like output format\n"
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpm/search.pm:60 ../urpmf:60
+#: ../urpme:47
 #, c-format
-msgid "                   example: '%%name:%%files'\n"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpm/search.pm:61 ../urpmf:61
+#: ../urpme:48
 #, c-format
-msgid "  --arch         - architecture\n"
+msgid "  --auto-orphans - remove orphans\n"
 msgstr ""
 
-#: ../urpm/search.pm:62 ../urpmf:62
+#: ../urpme:49
 #, c-format
-msgid "  --buildhost    - build host\n"
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpm/search.pm:63 ../urpmf:63
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
 #, c-format
-msgid "  --buildtime    - build time\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpm/search.pm:64 ../urpmf:64
+#: ../urpme:52 ../urpmi:141
 #, c-format
-msgid "  --conffiles    - configuration files\n"
+msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr ""
 
-#: ../urpm/search.pm:65 ../urpmf:65
+#: ../urpme:53
 #, c-format
-msgid "  --conflicts    - conflict tags\n"
+msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
-#: ../urpm/search.pm:66 ../urpmf:66
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
 #, c-format
-msgid "  --description  - package description\n"
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
 
-#: ../urpm/search.pm:67 ../urpmf:67
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --distribution - distribution\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr ""
 
-#: ../urpm/search.pm:68 ../urpmf:68
+#: ../urpme:56
 #, c-format
-msgid "  --epoch        - epoch\n"
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr ""
 
-#: ../urpm/search.pm:69 ../urpmf:69
+#: ../urpme:57
 #, c-format
-msgid "  --filename     - filename of the package\n"
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm/search.pm:70 ../urpmf:70
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
-msgid "  --files        - list of files contained in the package\n"
+msgid "  --verbose, -v  - verbose mode.\n"
 msgstr ""
 
-#: ../urpm/search.pm:71 ../urpmf:71
+#: ../urpme:60
 #, c-format
-msgid "  --group        - group\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpm/search.pm:72 ../urpmf:72
+#: ../urpme:73
 #, c-format
-msgid "  --license      - license\n"
+msgid "Only superuser is allowed to remove packages"
 msgstr ""
 
-#: ../urpm/search.pm:73 ../urpmf:73
+#: ../urpme:106
 #, c-format
-msgid "  --name         - package name\n"
+msgid "unknown packages"
 msgstr ""
 
-#: ../urpm/search.pm:74 ../urpmf:74
+#: ../urpme:106
 #, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
+msgid "unknown package"
 msgstr ""
 
-#: ../urpm/search.pm:75 ../urpmf:75
+#: ../urpme:121
 #, c-format
-msgid "  --packager     - packager\n"
-msgstr ""
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpm/search.pm:76 ../urpmf:76
+#: ../urpme:126
 #, c-format
-msgid "  --provides     - provides tags\n"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpm/search.pm:77 ../urpmf:77
+#: ../urpme:143
 #, c-format
-msgid "  --requires     - requires tags\n"
+msgid "No orphans to remove"
 msgstr ""
 
-#: ../urpm/search.pm:78 ../urpmf:78
+#: ../urpme:149
 #, c-format
-msgid "  --size         - installed size\n"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpm/search.pm:79 ../urpmf:79
+#: ../urpme:154
 #, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr ""
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpm/search.pm:80 ../urpmf:80
+#: ../urpme:161
 #, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpm/search.pm:81 ../urpmf:81
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
-msgid "  --summary      - summary\n"
+msgid " (y/N) "
 msgstr ""
 
-#: ../urpm/search.pm:82 ../urpmf:82
+#: ../urpme:166
 #, c-format
-msgid "  --url          - url\n"
+msgid "testing removal of %s"
 msgstr ""
 
-#: ../urpm/search.pm:83 ../urpmf:83
+#: ../urpme:181
 #, c-format
-msgid "  --vendor       - vendor\n"
+msgid "Removal failed"
 msgstr ""
 
-#: ../urpm/search.pm:84 ../urpmf:84
+#: ../urpme:183
 #, c-format
-msgid "  -m             - the media in which the package was found\n"
+msgid "Removal is possible"
 msgstr ""
 
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#: ../urpmf:29
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage: urpmf [options] pattern-expression\n"
 msgstr ""
 
-#: ../urpm/search.pm:197 ../urpmf:198
+#: ../urpmf:36
 #, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
+msgid "  --version      - print this tool's version number.\n"
 msgstr ""
 
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpm/search.pm:290 ../urpmf:291
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, c-format
-msgid "no hdlist available for medium \"%s\""
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm/search.pm:297 ../urpmf:298
+#: ../urpmf:39
 #, c-format
-msgid "no synthesis available for medium \"%s\""
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpm/search.pm:304 ../urpmf:307
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
-msgid "no xml-info available for medium \"%s\""
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpm/select.pm:28
+#: ../urpmf:43
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
+msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 
-#: ../urpm/select.pm:30
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm/select.pm:168
+#: ../urpmf:45
 #, c-format
-msgid "No package named %s"
+msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr ""
 
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
-msgid "The following packages contain %s: %s"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpm/select.pm:172
+#: ../urpmf:47
 #, c-format
-msgid "You should use \"-a\" to use all of them"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpm/select.pm:300
+#: ../urpmf:48
 #, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
+msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 
-#: ../urpm/select.pm:543
+#: ../urpmf:49
 #, c-format
-msgid "Package %s is already installed"
+msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 
-#: ../urpm/select.pm:544
+#: ../urpmf:50
 #, c-format
-msgid "Packages %s are already installed"
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpmf:51
 #, c-format
-msgid "due to missing %s"
+msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpm/select.pm:563
+#: ../urpmf:52
 #, c-format
-msgid "due to already installed %s"
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpmf:53
 #, c-format
-msgid "due to unsatisfied %s"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpm/select.pm:570
+#: ../urpmf:54
 #, c-format
-msgid "trying to promote %s"
+msgid "  -a             - binary AND operator.\n"
 msgstr ""
 
-#: ../urpm/select.pm:571
+#: ../urpmf:55
 #, c-format
-msgid "in order to keep %s"
+msgid "  -o             - binary OR operator.\n"
 msgstr ""
 
-#: ../urpm/select.pm:607
+#: ../urpmf:56
 #, c-format
-msgid "in order to install %s"
+msgid "  !              - unary NOT.\n"
 msgstr ""
 
-#: ../urpm/select.pm:617
+#: ../urpmf:57
 #, c-format
-msgid "due to conflicts with %s"
+msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 
-#: ../urpm/signature.pm:29
+#: ../urpmf:58
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpm/signature.pm:60
+#: ../urpmf:59
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --qf           - specify a printf-like output format\n"
 msgstr ""
 
-#: ../urpm/signature.pm:62
+#: ../urpmf:60
 #, c-format
-msgid "Missing signature (%s)"
+msgid "                   example: '%%name:%%files'\n"
 msgstr ""
 
-#: ../urpm/sys.pm:156
+#: ../urpmf:61
 #, c-format
-msgid "system"
+msgid "  --arch         - architecture\n"
 msgstr ""
 
-#: ../urpm/sys.pm:191
+#: ../urpmf:62
 #, c-format
-msgid "You should restart %s for %s"
+msgid "  --buildhost    - build host\n"
 msgstr ""
 
-#: ../urpm/sys.pm:276
+#: ../urpmf:63
 #, c-format
-msgid "Can't write file"
+msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpm/sys.pm:276
+#: ../urpmf:64
 #, c-format
-msgid "Can't open file"
+msgid "  --conffiles    - configuration files\n"
 msgstr ""
 
-#: ../urpm/sys.pm:289
+#: ../urpmf:65
 #, c-format
-msgid "Can't move file %s to %s"
+msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpme:41
+#: ../urpmf:66
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "  --description  - package description\n"
 msgstr ""
 
-#: ../urpme:47
+#: ../urpmf:67
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpme:48
+#: ../urpmf:68
 #, c-format
-msgid "  --auto-orphans - remove orphans\n"
+msgid "  --epoch        - epoch\n"
 msgstr ""
 
-#: ../urpme:49
+#: ../urpmf:69
 #, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgid "  --filename     - filename of the package\n"
 msgstr ""
 
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#: ../urpmf:70
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid "  --files        - list of files contained in the package\n"
 msgstr ""
 
-#: ../urpme:52 ../urpmi:141
+#: ../urpmf:71
 #, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
+msgid "  --group        - group\n"
 msgstr ""
 
-#: ../urpme:53
+#: ../urpmf:72
 #, c-format
-msgid "  --root         - use another root for rpm removal.\n"
+msgid "  --license      - license\n"
 msgstr ""
 
-#: ../urpme:55 ../urpmi:101
+#: ../urpmf:73
 #, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgid "  --name         - package name\n"
 msgstr ""
 
-#: ../urpme:56
+#: ../urpmf:74
 #, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpme:57
+#: ../urpmf:75
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+msgid "  --packager     - packager\n"
 msgstr ""
 
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpmf:76
 #, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
+msgid "  --provides     - provides tags\n"
 msgstr ""
 
-#: ../urpme:60
+#: ../urpmf:77
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --requires     - requires tags\n"
 msgstr ""
 
-#: ../urpme:73
+#: ../urpmf:78
 #, c-format
-msgid "Only superuser is allowed to remove packages"
+msgid "  --size         - installed size\n"
 msgstr ""
 
-#: ../urpme:106
+#: ../urpmf:79
 #, c-format
-msgid "unknown packages"
+msgid "  --sourcerpm    - source rpm name\n"
 msgstr ""
 
-#: ../urpme:106
+#: ../urpmf:80
 #, c-format
-msgid "unknown package"
+msgid "  --suggests     - suggests tags\n"
 msgstr ""
 
-#: ../urpme:121
+#: ../urpmf:81
 #, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] ""
-msgstr[1] ""
+msgid "  --summary      - summary\n"
+msgstr ""
 
-#: ../urpme:126
+#: ../urpmf:82
 #, c-format
-msgid "Nothing to remove"
+msgid "  --url          - url\n"
 msgstr ""
 
-#: ../urpme:143
+#: ../urpmf:83
 #, c-format
-msgid "No orphans to remove"
+msgid "  --vendor       - vendor\n"
 msgstr ""
 
-#: ../urpme:149
+#: ../urpmf:84
 #, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-msgstr[1] ""
+msgid "  -m             - the media in which the package was found\n"
+msgstr ""
 
-#: ../urpme:154
+#: ../urpmf:85 ../urpmq:99
 #, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
 
-#: ../urpme:161
+#: ../urpmf:153
 #, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] ""
-msgstr[1] ""
+msgid "unterminated expression (%s)"
+msgstr ""
 
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpmf:198
 #, c-format
-msgid " (y/N) "
+msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpme:166
+#: ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
-msgid "testing removal of %s"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpme:181
+#: ../urpmf:291
 #, c-format
-msgid "Removal failed"
+msgid "no hdlist available for medium \"%s\""
 msgstr ""
 
-#: ../urpme:183
+#: ../urpmf:298
 #, c-format
-msgid "Removal is possible"
+msgid "no synthesis available for medium \"%s\""
 msgstr ""
 
-#: ../urpmf:153
+#: ../urpmf:307
 #, c-format
-msgid "unterminated expression (%s)"
+msgid "no xml-info available for medium \"%s\""
 msgstr ""
 
 #: ../urpmi:81