sync with code

1 files changed, 267 insertions, 256 deletions

diff --git a/po/urpmi.pot b/po/urpmi.pot
index e18c7998..85a1dfa0 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-10-07 13:39+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -179,7 +179,22 @@ msgstr ""
 msgid "Must be root"
 msgstr ""
 
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, c-format
+msgid "Distribution Upgrade"
+msgstr ""
+
+#: ../gurpmi2:70
+#, c-format
+msgid "Packages installation"
+msgstr ""
+
+#: ../gurpmi2:97
+#, c-format
+msgid "Preparing packages installation..."
+msgstr ""
+
+#: ../gurpmi2:111
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -249,12 +264,7 @@ msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:249
-#, c-format
-msgid "Package installation..."
-msgstr ""
-
-#: ../gurpmi2:251 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
@@ -1294,560 +1304,561 @@ msgstr ""
 msgid "unmounting %s"
 msgstr ""
 
-#: ../urpm/select.pm:30
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
+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/select.pm:32
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid "  --version      - print this tool's version number.\n"
 msgstr ""
 
-#: ../urpm/select.pm:170
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
-msgid "No package named %s"
+msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, c-format
-msgid "The following packages contain %s: %s"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm/select.pm:174
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
-msgid "You should use \"-a\" to use all of them"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
 #, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
 
-#: ../urpm/select.pm:538
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
-msgid "Package %s is already installed"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpm/select.pm:539
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
-msgid "Packages %s are already installed"
+msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
-msgid "due to missing %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm/select.pm:558
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
-msgid "due to already installed %s"
+msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr ""
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
-msgid "due to unsatisfied %s"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpm/select.pm:565
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
-msgid "trying to promote %s"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpm/select.pm:566
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
-msgid "in order to keep %s"
+msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 
-#: ../urpm/select.pm:607
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
+msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 
-#: ../urpm/select.pm:608
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpm/select.pm:635
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
-msgid "in order to install %s"
+msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpm/select.pm:645
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
-msgid "due to conflicts with %s"
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpm/signature.pm:49
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpm/signature.pm:80
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  -a             - binary AND operator.\n"
 msgstr ""
 
-#: ../urpm/signature.pm:82
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
-msgid "Missing signature (%s)"
+msgid "  -o             - binary OR operator.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:178
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
-msgid "system"
+msgid "  !              - unary NOT.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:213
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
-msgid "You should restart %s for %s"
+msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:316
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
-msgid "Can't write file"
+msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpm/sys.pm:316
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
-msgid "Can't open file"
+msgid "  --qf           - specify a printf-like output format\n"
 msgstr ""
 
-#: ../urpm/sys.pm:329
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
-msgid "Can't move file %s to %s"
+msgid "                   example: '%%name:%%files'\n"
 msgstr ""
 
-#: ../urpme:41
+#: ../urpm/search.pm:61 ../urpmf:61
 #, 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 "  --arch         - architecture\n"
 msgstr ""
 
-#: ../urpme:47
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid "  --buildhost    - build host\n"
 msgstr ""
 
-#: ../urpme:48
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
-msgid "  --auto-orphans - remove orphans\n"
+msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpme:49
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgid "  --conffiles    - configuration files\n"
 msgstr ""
 
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpme:52 ../urpmi:142
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
+msgid "  --description  - package description\n"
 msgstr ""
 
-#: ../urpme:53
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
-msgid "  --root         - use another root for rpm removal.\n"
+msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgid "  --epoch        - epoch\n"
 msgstr ""
 
-#: ../urpme:55 ../urpmi:101
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgid "  --filename     - filename of the package\n"
 msgstr ""
 
-#: ../urpme:56
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgid "  --files        - list of files contained in the package\n"
 msgstr ""
 
-#: ../urpme:57
+#: ../urpm/search.pm:71 ../urpmf:71
 #, 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 "  --group        - group\n"
 msgstr ""
 
-#: ../urpme:59 ../urpmi:153 ../urpmq:89
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
+msgid "  --license      - license\n"
 msgstr ""
 
-#: ../urpme:60
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --name         - package name\n"
 msgstr ""
 
-#: ../urpme:73
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
-msgid "Only superuser is allowed to remove packages"
+msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpme:106
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
-msgid "unknown packages"
+msgid "  --packager     - packager\n"
 msgstr ""
 
-#: ../urpme:106
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
-msgid "unknown package"
+msgid "  --provides     - provides tags\n"
 msgstr ""
 
-#: ../urpme:121
+#: ../urpm/search.pm:77 ../urpmf:77
 #, 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 "  --requires     - requires tags\n"
+msgstr ""
 
-#: ../urpme:126
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
-msgid "Nothing to remove"
+msgid "  --size         - installed size\n"
 msgstr ""
 
-#: ../urpme:143
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
-msgid "No orphans to remove"
+msgid "  --sourcerpm    - source rpm name\n"
 msgstr ""
 
-#: ../urpme:149
+#: ../urpm/search.pm:80 ../urpmf:80
 #, 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 "  --suggests     - suggests tags\n"
+msgstr ""
 
-#: ../urpme:154
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "  --summary      - summary\n"
+msgstr ""
 
-#: ../urpme:161
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] ""
-msgstr[1] ""
+msgid "  --url          - url\n"
+msgstr ""
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
-msgid " (y/N) "
+msgid "  --vendor       - vendor\n"
 msgstr ""
 
-#: ../urpme:166
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
-msgid "testing removal of %s"
+msgid "  -m             - the media in which the package was found\n"
 msgstr ""
 
-#: ../urpme:181
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
-msgid "Removal failed"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpme:183
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
-msgid "Removal is possible"
+msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:29
+#: ../urpm/search.pm:290 ../urpmf:291
 #, 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 "no hdlist available for medium \"%s\""
 msgstr ""
 
-#: ../urpmf:36
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
-msgid "  --version      - print this tool's version number.\n"
+msgid "no synthesis available for medium \"%s\""
 msgstr ""
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
+msgid "no xml-info available for medium \"%s\""
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../urpm/select.pm:30
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "urpmi was restarted, and the list of priority packages did not change"
 msgstr ""
 
-#: ../urpmf:39
+#: ../urpm/select.pm:32
 #, c-format
 msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/select.pm:170
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "No package named %s"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpm/select.pm:172 ../urpme:115
 #, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
+msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpm/select.pm:174
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpm/select.pm:295
 #, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
+msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr ""
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/select.pm:538
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "Package %s is already installed"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpm/select.pm:539
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "Packages %s are already installed"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
 #, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpm/select.pm:558
 #, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgid "due to already installed %s"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
 #, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/select.pm:565
 #, c-format
-msgid "Pattern expressions:\n"
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/select.pm:566
 #, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/select.pm:607
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpm/select.pm:608
 #, c-format
-msgid "  -a             - binary AND operator.\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpm/select.pm:635
 #, c-format
-msgid "  -o             - binary OR operator.\n"
+msgid "in order to install %s"
 msgstr ""
 
-#: ../urpmf:56
+#: ../urpm/select.pm:645
 #, c-format
-msgid "  !              - unary NOT.\n"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmf:57
+#: ../urpm/signature.pm:32
 #, c-format
-msgid "  ( )            - left and right parentheses.\n"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpm/signature.pm:63
 #, c-format
-msgid "List of tags:\n"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpm/signature.pm:65
 #, c-format
-msgid "  --qf           - specify a printf-like output format\n"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpm/sys.pm:178
 #, c-format
-msgid "                   example: '%%name:%%files'\n"
+msgid "system"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpm/sys.pm:213
 #, c-format
-msgid "  --arch         - architecture\n"
+msgid "You should restart %s for %s"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpm/sys.pm:316
 #, c-format
-msgid "  --buildhost    - build host\n"
+msgid "Can't write file"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpm/sys.pm:316
 #, c-format
-msgid "  --buildtime    - build time\n"
+msgid "Can't open file"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/sys.pm:329
 #, c-format
-msgid "  --conffiles    - configuration files\n"
+msgid "Can't move file %s to %s"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpme:41
 #, c-format
-msgid "  --conflicts    - conflict tags\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 ""
 
-#: ../urpmf:66
+#: ../urpme:47
 #, c-format
-msgid "  --description  - package description\n"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpmf:67
+#: ../urpme:48
 #, c-format
-msgid "  --distribution - distribution\n"
+msgid "  --auto-orphans - remove orphans\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpme:49
 #, c-format
-msgid "  --epoch        - epoch\n"
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpmf:69
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
 #, c-format
-msgid "  --filename     - filename of the package\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpmf:70
+#: ../urpme:52 ../urpmi:142
 #, c-format
-msgid "  --files        - list of files contained in the package\n"
+msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr ""
 
-#: ../urpmf:71
+#: ../urpme:53
 #, c-format
-msgid "  --group        - group\n"
+msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
-#: ../urpmf:72
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --license      - license\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr ""
 
-#: ../urpmf:73
+#: ../urpme:56
 #, c-format
-msgid "  --name         - package name\n"
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr ""
 
-#: ../urpmf:74
+#: ../urpme:57
 #, c-format
-msgid "  --obsoletes    - obsoletes tags\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 ""
 
-#: ../urpmf:75
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
 #, c-format
-msgid "  --packager     - packager\n"
+msgid "  --verbose, -v  - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:76
+#: ../urpme:60
 #, c-format
-msgid "  --provides     - provides tags\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpmf:77
+#: ../urpme:73
 #, c-format
-msgid "  --requires     - requires tags\n"
+msgid "Only superuser is allowed to remove packages"
 msgstr ""
 
-#: ../urpmf:78
+#: ../urpme:106
 #, c-format
-msgid "  --size         - installed size\n"
+msgid "unknown packages"
 msgstr ""
 
-#: ../urpmf:79
+#: ../urpme:106
 #, c-format
-msgid "  --sourcerpm    - source rpm name\n"
+msgid "unknown package"
 msgstr ""
 
-#: ../urpmf:80
+#: ../urpme:121
 #, c-format
-msgid "  --suggests     - suggests tags\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] ""
 
-#: ../urpmf:81
+#: ../urpme:126
 #, c-format
-msgid "  --summary      - summary\n"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpmf:82
+#: ../urpme:143
 #, c-format
-msgid "  --url          - url\n"
+msgid "No orphans to remove"
 msgstr ""
 
-#: ../urpmf:83
+#: ../urpme:149
 #, c-format
-msgid "  --vendor       - vendor\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] ""
 
-#: ../urpmf:84
+#: ../urpme:154
 #, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr ""
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpme:161
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmf:153
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
 #, c-format
-msgid "unterminated expression (%s)"
+msgid " (y/N) "
 msgstr ""
 
-#: ../urpmf:198
+#: ../urpme:166
 #, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
+msgid "testing removal of %s"
 msgstr ""
 
-#: ../urpmf:291
+#: ../urpme:181
 #, c-format
-msgid "no hdlist available for medium \"%s\""
+msgid "Removal failed"
 msgstr ""
 
-#: ../urpmf:298
+#: ../urpme:183
 #, c-format
-msgid "no synthesis available for medium \"%s\""
+msgid "Removal is possible"
 msgstr ""
 
-#: ../urpmf:307
+#: ../urpmf:153
 #, c-format
-msgid "no xml-info available for medium \"%s\""
+msgid "unterminated expression (%s)"
 msgstr ""
 
 #: ../urpmi:81