changed MandrakeSoft -> Mandrakesoft

author: Pablo Saratxaga <pablo@mandriva.com> 2004-07-20 07:20:33 +0000
committer: Pablo Saratxaga <pablo@mandriva.com> 2004-07-20 07:20:33 +0000
commit: 7e039dd29386d497d168e96a62fd681d3bddee44 (patch)
tree: ee659f9e8d196daa745380b48ac5812dbcd11e2b /perl-install/share/po/translation_size.pl
parent: fafa7b82d182c93045da035bd99e9c1dc6959540 (diff)
download: drakx-7e039dd29386d497d168e96a62fd681d3bddee44.tar
drakx-7e039dd29386d497d168e96a62fd681d3bddee44.tar.gz
drakx-7e039dd29386d497d168e96a62fd681d3bddee44.tar.bz2
drakx-7e039dd29386d497d168e96a62fd681d3bddee44.tar.xz
drakx-7e039dd29386d497d168e96a62fd681d3bddee44.zip
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/share/po/translation_size.pl b/perl-install/share/po/translation_size.pl
index 54a4b120e..ff491d08e 100755
--- a/perl-install/share/po/translation_size.pl
+++ b/perl-install/share/po/translation_size.pl
@@ -3,7 +3,7 @@
 #
 # Guillaume Cottenceau (gc@mandrakesoft.com)
 #
-# Copyright 2003 MandrakeSoft
+# Copyright 2003 Mandrakesoft
 #
 # This software may be freely redistributed under the terms of the GNU
 # public license.
diff --git a/po/af.po b/po/af.po
index 3252c359..9ae768d9 100644
--- a/po/af.po
+++ b/po/af.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+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"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KTranslator v 0.6.0\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
-#, fuzzy
+#: ../gurpmi:30 ../gurpmi2:63
+#, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Stelsel-installasie"
 
@@ -28,7 +28,8 @@ msgstr "Stelsel-installasie"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
@@ -65,21 +66,23 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Installeer"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Stoor"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "Kanselleer"
 
 #: ../gurpmi:107
-#, fuzzy
+#, fuzzy, c-format
 msgid "Choose location to save file"
 msgstr "Kies 'n lêer"
 
@@ -89,20 +92,21 @@ msgid "Unknown option %s"
 msgstr "Onbekende konneksie tipe"
 
 #: ../gurpmi.pm:89
-#, fuzzy
+#, fuzzy, c-format
 msgid "No packages specified"
 msgstr "Geen opdrag gespesifiseer nie"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Asseblief wag..."
 
 #: ../gurpmi2:52
-#, fuzzy
+#, fuzzy, c-format
 msgid "Must be root"
 msgstr "Muispoort"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -110,38 +114,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Sommige pakkette kan nie geïnstalleer word nie"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "OK"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Waarskuwing"
 
-#: ../gurpmi2:146
-#, fuzzy
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
+#: ../gurpmi2:148
+#, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Opgradeer"
 
-#: ../gurpmi2:147
-#, fuzzy
+#: ../gurpmi2:149
+#, fuzzy, c-format
 msgid " (to install)"
 msgstr "Verlaat installasie"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Slegs een van die volgende pakkette word benodig:"
 
-#: ../gurpmi2:174
-#, fuzzy
+#: ../gurpmi2:176
+#, fuzzy, c-format
 msgid "_Abort"
 msgstr "Staak"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -154,7 +162,7 @@ msgstr ""
 "\n"
 "Kan ons voort gaan?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -165,26 +173,27 @@ msgstr ""
 "geïnstalleer word:\n"
 "\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Installasievoorbereiding..."
 
-#: ../gurpmi2:217 ../urpmi:602
-#, fuzzy
+#: ../gurpmi2:219 ../urpmi:608
+#, fuzzy, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Kan nie die bronpakette bekom nie."
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Plaas asseblief die media bekend as \"%s\" in aandrywer [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Laai tans pakket '%s' (%s/%s) af ..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -198,8 +207,7 @@ msgstr ""
 "\n"
 "Wil u hulle steeds installeer?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -211,37 +219,38 @@ msgstr ""
 "\n"
 "Probeer u media se databasis opdateer."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "Verwyder %s"
 
-#: ../gurpmi2:289
-#, fuzzy
+#: ../gurpmi2:291
+#, fuzzy, c-format
 msgid "Preparing..."
 msgstr "Herlaaistelsel word voorberei..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installeer tans pakket %s (%s/%s)...."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Installasie het misluk"
 
-#: ../gurpmi2:329
-#, fuzzy
+#: ../gurpmi2:331
+#, fuzzy, c-format
 msgid "_Done"
 msgstr "Klaar"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Alles is alreeds installeer"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Geïnstalleer"
 
@@ -253,19 +262,22 @@ msgid ""
 msgstr ""
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - druk hierdie help boodskap.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr ""
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr ""
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -v             - woordryke modus.\n"
 
@@ -276,215 +288,126 @@ msgstr ""
 "\n"
 "                      DrakBackup Verslag \n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
-#, fuzzy
+#: ../rurpmi:11 ../urpmi:265
+#, fuzzy, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Daar was 'n fout met die installasie van die pakkette:"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:73
-#, fuzzy
+#: ../urpm.pm:93
+#, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, fuzzy, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "in lêername"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "FAT-grootteverandering het gefaal: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, fuzzy, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm.pm:139
-#, fuzzy
+#: ../urpm.pm:159
+#, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "Laat \"%s\" toe om die lêer te skryf"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
-#, fuzzy
+#: ../urpm.pm:165
+#, fuzzy, c-format
 msgid "error registering local packages"
 msgstr "Daar was 'n fout met pakkette:"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Jy moet stam wees om hierdie opdrag te gebruik !\n"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, fuzzy, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "kan nie kieslyslêer:%s lees nie"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "Nn"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "JjYy"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "Jammer, swak keuse, probeer weer\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
+#: ../urpm/args.pm:426
 #, c-format
-msgid "node %s has an old version of urpme, please upgrade"
+msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
+#: ../urpm/args.pm:440
 #, c-format
-msgid "on node %s"
-msgstr ""
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Installasie het misluk"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-#, fuzzy
-msgid "Installation is possible"
-msgstr "Installasie probleem"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "Installeer tans pakket %s (%s/%s)...."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:183
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "Nn"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "Begin %s:"
+msgid "Yy"
+msgstr "JjYy"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "Installasievoorbereiding..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "%s word installeer\n"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "Installasievoorbereiding..."
+msgid "Sorry, bad choice, try again\n"
+msgstr "Jammer, swak keuse, probeer weer\n"
 
 #: ../urpme:39
 #, fuzzy, c-format
@@ -503,107 +426,119 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
 #: ../urpme:45
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "Wys outogeselekteerde pakkette."
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
-#: ../urpme:51
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
 
 #: ../urpme:52
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr ""
+
+#: ../urpme:53
+#, 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"
 msgstr ""
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr ""
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr ""
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:74
-#, fuzzy
+#: ../urpme:75
+#, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
 #: ../urpme:106
-#, fuzzy
-msgid "unknown package"
-msgstr "Onbekend"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
-#, fuzzy
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "Inligting rakende pakkette"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "Onbekend"
+
 #: ../urpme:112
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Die volgende pakkette geïnstalleer word:\n"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, fuzzy, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 "Jammer maat, nou wil jy jou Linux rekenaar vernietig:\n"
 "\n"
 
-#: ../urpme:121
-#, fuzzy
+#: ../urpme:120
+#, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "Geen etiket om te verwyder nie!"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
-#, fuzzy
+#: ../urpme:125
+#, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "Slegs een van die volgende pakkette word benodig:"
 
-#: ../urpme:133
+#: ../urpme:132
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
@@ -612,19 +547,18 @@ msgstr ""
 "geïnstalleer word:\n"
 "\n"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-#, fuzzy
-msgid " (y/N) "
-msgstr " (J/n) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "Verwyder pakkette..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
-#, fuzzy
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (J/n) "
+
+#: ../urpme:156
+#, fuzzy, c-format
 msgid "Removal failed"
 msgstr "Aanteken gevaal"
 
@@ -646,241 +580,264 @@ msgstr ""
 "gebruik:\n"
 
 #: ../urpmf:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:43
-#, fuzzy
+#: ../urpmf:44
+#, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
-#, fuzzy
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, fuzzy, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmf:45
-#, fuzzy
+#: ../urpmf:46
+#, fuzzy, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmf:46
-#, fuzzy
+#: ../urpmf:47
+#, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:52
-#, fuzzy
+#: ../urpmf:53
+#, fuzzy, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmf:53
-#, fuzzy
+#: ../urpmf:54
+#, fuzzy, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmf:54
-#, fuzzy
+#: ../urpmf:55
+#, fuzzy, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmf:55
-#, fuzzy
+#: ../urpmf:56
+#, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmf:56
-#, fuzzy
+#: ../urpmf:57
+#, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Lys van data om te herstel:\n"
 "\n"
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr ""
 "\n"
 "                      DrakBackup Verslag \n"
 
-#: ../urpmf:59
-#, fuzzy
+#: ../urpmf:60
+#, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Konsole opstelling module"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmf:67
-#, fuzzy
+#: ../urpmf:68
+#, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmf:68
-#, fuzzy
+#: ../urpmf:69
+#, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmf:69
-#, fuzzy
+#: ../urpmf:70
+#, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmf:70
-#, fuzzy
+#: ../urpmf:71
+#, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpmf:72
-#, fuzzy
+#: ../urpmf:73
+#, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr ""
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr ""
 
-#: ../urpmf:78
-#, fuzzy
+#: ../urpmf:79
+#, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmf:79
-#, fuzzy
+#: ../urpmf:80
+#, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmf:80
-#, fuzzy
+#: ../urpmf:81
+#, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmf:81 ../urpmq:86
-#, fuzzy
+#: ../urpmf:82 ../urpmq:89
+#, fuzzy, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr ""
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -897,39 +854,60 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpmi:94
+#, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
+
+#: ../urpmi:95
+#, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr ""
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -937,441 +915,506 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr ""
 
-#: ../urpmi:106
-#, fuzzy
+#: ../urpmi:105
+#, fuzzy, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr ""
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr ""
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr ""
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr ""
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr ""
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr ""
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr ""
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr ""
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:154 ../urpmq:83
-#, fuzzy
+#: ../urpmi:152 ../urpmq:86
+#, fuzzy, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-#, fuzzy
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, fuzzy, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "Groep bestaan alreeds, Gebruik asb. 'n ander Groepnaam"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:249
-#, fuzzy
+#: ../urpmi:247
+#, fuzzy, c-format
 msgid "Copying failed"
 msgstr "Aanteken gevaal"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
 "Use --allow-force to force operation."
 msgstr ""
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "Opgradeer"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "Opgradeer"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Verlaat installasie"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Verlaat installasie"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Wat is u keuse (1-%d)"
 
-#: ../urpmi:481
+#: ../urpmi:482
 #, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Wil u in elk geval voortgaan?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:500
+#: ../urpmi:503
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr "Sommige pakkette kan nie geïnstalleer word nie"
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] "Sommige pakkette kan nie geïnstalleer word nie"
+msgstr[1] "Sommige pakkette kan nie geïnstalleer word nie"
 
-#: ../urpmi:530
+#: ../urpmi:534
 #, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
+"\n"
+"%s\n"
+"\n"
+"Kan ons voort gaan?"
+msgstr[1] ""
 "Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
 "\n"
 "%s\n"
 "\n"
 "Kan ons voort gaan?"
 
-#: ../urpmi:535
+#: ../urpmi:541
 #, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
+"\n"
+"%s\n"
+"\n"
+"Kan ons voort gaan?"
+msgstr[1] ""
 "Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
 "\n"
 "%s\n"
 "\n"
 "Kan ons voort gaan?"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
 "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
 "geïnstalleer word:\n"
 "\n"
-
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr ""
+msgstr[1] ""
 "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
 "geïnstalleer word:\n"
 "\n"
 
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, fuzzy, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr "Jy moet stam wees om hierdie opdrag te gebruik !\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
-#, fuzzy
+#: ../urpmi:618
+#, fuzzy, c-format
 msgid "Press Enter when ready..."
 msgstr "Druk ENTER wanneer u reg is..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../urpmi:660
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "Die volgende pakkette geïnstalleer word:\n"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Die volgende pakkette geïnstalleer word:\n"
+msgstr[1] "Die volgende pakkette geïnstalleer word:\n"
 
-#: ../urpmi:661
-#, fuzzy
+#: ../urpmi:668
+#, fuzzy, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Wil u op hierdie knoppie klik?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "Begin %s:"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "%s word installeer\n"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "%s word installeer\n"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Installasie het misluk"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "installasie instruksies"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Installasie probleem"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Alles is alreeds installeer"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Alles is alreeds installeer"
+msgstr[1] "Alles is alreeds installeer"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Alles is alreeds installeer"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Alles is alreeds installeer"
+msgstr[1] "Alles is alreeds installeer"
 
-#: ../urpmi:847
-#, fuzzy
+#: ../urpmi:863
+#, fuzzy, c-format
 msgid "restarting urpmi"
 msgstr "Begin slurpd: "
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1385,111 +1428,139 @@ msgid ""
 msgstr ""
 
 #: ../urpmi.addmedia:54
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
 msgstr ""
 
 #: ../urpmi.addmedia:59
+#, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
+msgstr ""
+
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
-#, fuzzy
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, fuzzy, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, fuzzy, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, fuzzy, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "Probleme met skep van media."
 
-#: ../urpmi.addmedia:117
-#, fuzzy
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmi.addmedia:120
+#: ../urpmi.addmedia:121
 #, fuzzy, c-format
-msgid "Will create config file [%s]"
+msgid "creating config file [%s]"
 msgstr "Kan nie lêer: %s skep nie"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "Kan nie lêer: %s skep nie"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
-#, fuzzy
+#: ../urpmi.addmedia:166
+#, fuzzy, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "Relatiewe pad na die synthesis/hdlist:"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
 msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, fuzzy, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "Probleme met skep van media."
@@ -1512,146 +1583,151 @@ msgstr ""
 "gebruik:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr ""
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr ""
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "%s is nie gevind nie...\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Fout met die lees van lêer %s"
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "Geen prente beskikbaar"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:55
-#, fuzzy
+#: ../urpmi.removemedia:41
+#, fuzzy, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmi.removemedia:57
-#, fuzzy
+#: ../urpmi.removemedia:43
+#, fuzzy, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmi.removemedia:60
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-
-#: ../urpmi.removemedia:70
-#, fuzzy
+#: ../urpmi.removemedia:65
+#, fuzzy, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1659,60 +1735,74 @@ msgid ""
 msgstr ""
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
 #: ../urpmi.update:41
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr ""
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 
-#: ../urpmi.update:46
-#, fuzzy
+#: ../urpmi.update:47
+#, fuzzy, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmi.update:69
-#, fuzzy
+#: ../urpmi.update:49
+#, fuzzy, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpmi.update:70
+#, fuzzy, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: ../urpmi.update:100
-#, fuzzy, c-format
-msgid "enabling media %s"
-msgstr "%s word installeer\n"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Redigeer media \"%s\":"
 
+#: ../urpmi.update:101
+#, fuzzy, c-format
+msgid "enabling media %s"
+msgstr "%s word installeer\n"
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1731,161 +1821,213 @@ msgstr ""
 "gebruik:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr ""
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
 #: ../urpmq:58
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:81
-#, fuzzy
+#: ../urpmq:83
+#, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:85
-#, fuzzy
+#: ../urpmq:88
+#, fuzzy, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmq:87
-#, fuzzy
+#: ../urpmq:90
+#, fuzzy, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:89
-#, fuzzy
+#: ../urpmq:92
+#, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 
-#: ../urpmq:91
-#, fuzzy
+#: ../urpmq:94
+#, fuzzy, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmq:92
-#, fuzzy
+#: ../urpmq:95
+#, fuzzy, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmq:93
-#, fuzzy
+#: ../urpmq:96
+#, fuzzy, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmq:94
-#, fuzzy
+#: ../urpmq:97
+#, fuzzy, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr ""
 
-#: ../urpmq:405
-#, fuzzy
+#: ../urpmq:406
+#, fuzzy, c-format
 msgid "No filelist found\n"
 msgstr "Geen prente beskikbaar"
 
-#: ../urpmq:417
-#, fuzzy
+#: ../urpmq:418
+#, fuzzy, c-format
 msgid "No changelog found\n"
 msgstr "Geen beeld gevind nie"
 
 #, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Installasie het misluk"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Installeer tans pakket %s (%s/%s)...."
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Begin %s:"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "Installasievoorbereiding..."
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "%s word installeer\n"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Installasievoorbereiding..."
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
+#~ "geïnstalleer word:\n"
+#~ "\n"
+
+#, fuzzy
 #~ msgid "unable to handle protocol: %s"
 #~ msgstr "Aktiveer Network Time Protocol"
 
diff --git a/po/ar.po b/po/ar.po
index 10680ea1..38b3d710 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2005-09-05 17:40+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -20,7 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "تثبيت RPM"
 
@@ -29,7 +30,8 @@ msgstr "تثبيت RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_موافق"
 
@@ -84,20 +86,23 @@ msgstr ""
 "\n"
 "قد ترغب بحفظها فقط. ما هو اختيارك؟"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_تثبيت"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_حفظ"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "ال_غاء"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "اختر مكان حفظ الملف"
 
@@ -109,19 +114,21 @@ msgstr ""
 "خيارات غير معروفة '%s'\n"
 
 #: ../gurpmi.pm:89
-#, fuzzy
+#, fuzzy, c-format
 msgid "No packages specified"
 msgstr "لا توجد حزمة بالإسم %s"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "انتظر من فضلك..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "يجب أن تكون جذراً"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -132,35 +139,42 @@ msgstr ""
 "%s\n"
 "تريد الاستمرار؟"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "موافق"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "موافق"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (للترقية)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (للتثبيت)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "خيارات الحزم"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "أحد الحزم التالية يُحتاج اليه:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "إ_جهاض"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -171,7 +185,7 @@ msgstr ""
 "%s\n"
 "تريد الاستمرار؟"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -181,25 +195,27 @@ msgstr ""
 "لإرضاء المُعتمدات، سيتم تثبيت الحزم %d التّالية:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "تثبيت الحزم..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "لم يمكن الحصول على الحزمة المصدرية، جاري الإنهاء"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "يرجى ادخال الوسيط \"%s\" في الجهاز [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "جاري تنزيل الحزمة `%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -212,8 +228,7 @@ msgstr ""
 "\n"
 "هل تريد متابعة التثبيت؟"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -224,35 +239,38 @@ msgstr ""
 "%s\n"
 "ربما تريد تحديث فاعدة بيانات urpmi الخاصة بك"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "جاري إزالة %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "جاري التحضير..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "فشل التثبيت"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "ا_نتهى"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "كل شئ مثبت مسبقا"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "انتهى التثبيت"
 
@@ -266,19 +284,22 @@ msgstr ""
 "حيث [الخيارات] مأخوذة من\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - تطبع رسالة المساعدة هذه.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <path>  - استخدم الجذر المحدد بدلاً من /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [group]     - حدّد النّتائج إلى مجموعة معيّنة.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - تطبع المجموعات أيضا مع الأسماء أيضاً.\n"
 
@@ -287,210 +308,126 @@ msgstr "  -g             - تطبع المجموعات أيضا مع الأسم�
 msgid "                    defaults to %s.\n"
 msgstr "                    الافتراضات هي %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "المستخدم الجذر فقط مسموح له بتثبيت الحزم"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "تشغيل urpmi في الوضع المحظور..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "تعذر فتح rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "اسم ملف rpm غير موجود [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "جاري استرجاع ملف rpm [%s]..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...تم الاسترجاع"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...فشل الإسترجاع: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "لم يمكن الوصول الى ملف rpm [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "تعذر تحليل \"%s\" في الملف [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "تعذر تسجيل ملف rpm"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "خطأ في تسجيل الحزم المحلية"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "هذه العملية محظورة أثناء العمل في الوضع المحظور"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "تعريف بروكسي خاطئ في سطر الأوامر\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "يجب أن تكون المستخدم الجذري لتشغيل هذا الأمر ! \n"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: لم يمكن ايجاد ملف rpm \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "لاNn"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "نyY"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "المعذرة، اختيار سئ، حاول مرة أخرى\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
+#: ../urpm/args.pm:426
 #, c-format
-msgid "on node %s"
-msgstr ""
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
+msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "فشل التثبيت"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "التثبيت ممكن"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
+#: ../urpm/args.pm:440
 #, c-format
-msgid "scp failed on host %s (%d)"
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "جاري اختبار ملف التخليق [%s]"
-
-#: ../urpm/parallel_ssh.pm:183
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "لاNn"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "جاري توزيع %s"
+msgid "Yy"
+msgstr "نyY"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "تثبيت الحزم..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "جاري تثبيت %s من %s"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "تثبيت الحزم..."
+msgid "Sorry, bad choice, try again\n"
+msgstr "المعذرة، اختيار سئ، حاول مرة أخرى\n"
 
 #: ../urpme:39
 #, fuzzy, c-format
@@ -508,44 +445,56 @@ msgstr ""
 "\n"
 "الاستعمال:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - تطبع رسالة المساعدة هذه.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - قم باختيار حزمة آلياَ في الاختيارات.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - تحقق إن كان بالإمكان الإزالة بشكل صحيح.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - أجبر التنفيذ حتى إن لم تكن بعض الحزم موجودة.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi موزّع على الأجهزة الخاصّة بالاسم البديل.\n"
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --packager     - اطبع الصّفة المُغلّف : المغلّف.\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - استخدام جذر آخر لإزالة rpm.\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - استخدم جذر آخر لتثبيت حزم rpm.\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description  - اطبع وصف الصّفة : الوصف.\n"
 
-#: ../urpme:52
-#, fuzzy
+#: ../urpme:53
+#, fuzzy, 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"
@@ -553,76 +502,79 @@ msgstr ""
 "  --use-distrib  - هيّئ urpmi بشكل سريع من شجرة توزيع، مفيد\n"
 "                   لتثبيت/إزالة chroot باستخدام خيار --root.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - حاول أو تجد وتستخدم ملفّ التخليق.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - حاول أن تجد وتستخدم ملف hdlist.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - وضع تفصيلي.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - وضع التفصيل.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - اختر كل الحزم المتفقة مع المعامل.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "يسمح للمستخدم الجذر فقط بحذف الحزم"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "حزمة غير معروفة"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "حزم غير معروفة"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "حزمة غير معروفة"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "الحزم التالية تحتوي على %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "إزالة الحزمة %s ستتسبب في تعطيل نظامك"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "لا شئ للإزالة"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "جاري التحقق لإزالة الحزم التالية"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "لإرضاء المُعتمدات، ستتم ازالة %d حزمة (%d ميغابايت)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (ن/ل)"
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "جاري حذف الحزمة %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (ن/ل)"
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "فشلت عملية الإزالة"
 
@@ -643,229 +595,251 @@ msgstr ""
 "الاستعمال:\n"
 
 #: ../urpmf:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - تطبع رسالة المساعدة هذه.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - استخدم بيئة محدّدة (عادة تقرير خطا).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - لا تستخدم الوسيط المحدّد، مفصولة بفواصل.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - استخدم فقط الوسيط المحدّد، مفصولة بفواصل.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - افرز الوسيط بناءً على النصّ الفرعي مفصول بفواصل.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - استخدم التخليق التالي بدلاً من قاعدة بيانات urpmi.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - لا تطبع الأسماء المتشابهة.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - استخدم وسيط التحديث فقط.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - وضع التفصيل.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - تجاهل حالة الأحرف على كلّ الهيئات.\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - تجاهل حالة الأحرف على كلّ الهيئات.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - اشمل نصّ perl بشكل مباشر كـ perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - معامل AND الثّنائي،.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - معامل OR الثّنائي،.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - NOT أحاديّة.\n"
 
-#: ../urpmf:55
-#, fuzzy
+#: ../urpmf:56
+#, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  (              - قوس لجهة اليمين لفتح تعبير مجموعة.\n"
 
-#: ../urpmf:56
-#, fuzzy
+#: ../urpmf:57
+#, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "قائمة البيانات التي سيتم استرجاعها:\n"
 "\n"
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - استخدم واجهة X.\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    الافتراضات هي %s.\n"
 
-#: ../urpmf:59
-#, fuzzy
+#: ../urpmf:60
+#, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
 
-#: ../urpmf:60
-#, fuzzy
+#: ../urpmf:61
+#, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - اطبع الصّفة جهاز التجميع : جهاز التجميع.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "اعدادات سطر الأوامر"
 
-#: ../urpmf:63
-#, fuzzy
+#: ../urpmf:64
+#, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - اطبع الصّفة يعارض : كل التعارضات.\n"
 
-#: ../urpmf:64
-#, fuzzy
+#: ../urpmf:65
+#, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - اطبع وصف الصّفة : الوصف.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - اطبع الصّفة epoch: epoch.\n"
 
-#: ../urpmf:67
-#, fuzzy
+#: ../urpmf:68
+#, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
 
-#: ../urpmf:68
-#, fuzzy
+#: ../urpmf:69
+#, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - اسرد الملفّات في الحزمة.\n"
 
-#: ../urpmf:69
-#, fuzzy
+#: ../urpmf:70
+#, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - اطبع علامة المجموعة : المجموعة\n"
 
-#: ../urpmf:70
-#, fuzzy
+#: ../urpmf:71
+#, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
 
-#: ../urpmf:71
-#, fuzzy
+#: ../urpmf:72
+#, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - اطبع الصّفة الملغيّات : كل الملغيّات.\n"
 
-#: ../urpmf:72
-#, fuzzy
+#: ../urpmf:73
+#, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - اطبع الصّفة المُغلّف : المغلّف.\n"
 
-#: ../urpmf:73
-#, fuzzy
+#: ../urpmf:74
+#, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - اطبع الصّفة يُوفّر : كل ما يُوفّره.\n"
 
-#: ../urpmf:74
-#, fuzzy
+#: ../urpmf:75
+#, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - اطبع الصّفة يتطلّب : كل ما يتطلّب.\n"
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - اطبع حجم الصّفة : الصّفة.\n"
 
-#: ../urpmf:76
-#, fuzzy
+#: ../urpmf:77
+#, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - اطبع الصّفة sourcerpm: الحزمة المصدريّة.\n"
 
-#: ../urpmf:77
-#, fuzzy
+#: ../urpmf:78
+#, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary, -S  - عرض التلخيص.\n"
 
-#: ../urpmf:78
-#, fuzzy
+#: ../urpmf:79
+#, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
 
-#: ../urpmf:79
-#, fuzzy
+#: ../urpmf:80
+#, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - وضع التفصيل.\n"
 
-#: ../urpmf:80
-#, fuzzy
+#: ../urpmf:81
+#, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - اسرد الملفّات في الحزمة.\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - اطبع النّسخة، الإصدار وarch مع الاسم.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "جاري استخدام بيئة محددة على %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -873,11 +847,12 @@ msgstr ""
 "ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث فيها يستعمل hdlist، فإنّ "
 "urpmf لم يستطع إرجاع أيّة نتيجة\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "إستعمل --name للبحث عن أسماء الحزم.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -893,36 +868,56 @@ msgstr ""
 "\n"
 "الاستعمال:\n"
 
-#: ../urpmi:92
-#, fuzzy
+#: ../urpmi:88
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - استخدم فقط الوسط المُعطى للبحث عن الحزم المطلوبة (أو "
 "المُحدّثة).\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - اختر الحزم آليا لترقية النظام.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr "  --auto-select  - اختر الحزم آليا لترقية النظام.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - عطّل التحقّق من MD5SUM للملفّات.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - أجبر تحديث مفتاح gpg.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - لا تسأل أبداً أن تزيل حزمةً، بل تجاهل التثبيت.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - عدم تثبيت الحزم (فقط تنزيلها)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -930,7 +925,7 @@ msgstr ""
 "  --keep         - إبقاء الحزم الموجودة إن أمكن، ورفض الحزم\n"
 "                   المطلوبة التي تؤدي إلى إزالة غيرها.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -941,34 +936,38 @@ msgstr ""
 "المحدّة                   سوف يتمّ تثبيته أو تحديثه،\n"
 "                   والمفترض هو %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - small transaction length, default is %d.\n"
 
-#: ../urpmi:105
-#, fuzzy
+#: ../urpmi:104
+#, fuzzy, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - افرض البحث التقريبي (مثل -y).\n"
 
-#: ../urpmi:106
-#, fuzzy
+#: ../urpmi:105
+#, fuzzy, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src          - الحزمة التالية هي حزمة مصدريّة (مثل -s).\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - ثبّت الحزمة المصدريّة فقط (لا المجمّعة).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - أزل حزمة rpm من الذاكرة المخبّئة قبل أي شيء آخر.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - عدم إخلاء حزم rpms من المخزن.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -976,7 +975,8 @@ msgstr ""
 "  --allow-nodeps - اسمح بسؤال المستخدم عن تثبيت الحزم دون\n"
 "                   التّحقّق من المعتمدات.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -984,11 +984,13 @@ msgstr ""
 "  --allow-force  - اسمح بسؤال المستخدم عن تثبيت الحزم دون\n"
 "                   التّحقّق من المعتمدات والتّكامل.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - استخدم جذر آخر لتثبيت حزم rpm.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -996,40 +998,48 @@ msgstr ""
 "  --use-distrib  - أعدّ urpmi بشكل سريع من شجرة توزيع، مفيد\n"
 "                   لتثبيت chroot باستخدام الخيار --root.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - استخدم wget لجلب الملفّات البعيدة.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - استخدم curl لجلب الملفّات البعيدة.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - استخدم curl لجلب الملفّات البعيدة.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - حدّ من سرعة التنزيل.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1038,7 +1048,8 @@ msgstr ""
 "                   (يقوم الخيار --no-resume بتعطيله، والوضع الافتراضي هو "
 "معطّل).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1046,7 +1057,8 @@ msgstr ""
 "  --proxy        - استخدم بروكسي HTTP المحدّد، رقم المنفذ الافتراضي\n"
 "                   هو 1080 (بتنسيق <proxyhost[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1056,6 +1068,7 @@ msgstr ""
 "                   (بتنسيق <user:password>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1064,7 +1077,7 @@ msgstr ""
 "بالكلمة التالية.\n"
 
 #: ../urpmi:138
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1074,48 +1087,44 @@ msgstr ""
 "افتراضي.)\n"
 
 #: ../urpmi:140
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - تحقّق إن كان بالإمكان التثبيت بشكل صحيح.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - استثن المسارات الفصولة بفاصلة.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - استثْن ملفّات التوثيق.\n"
 
 #: ../urpmi:143
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --no-uninstall - لا تسأل أبداً أن تزيل حزمةً، بل تجاهل التثبيت.\n"
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --description  - اطبع وصف الصّفة : الوصف.\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - عطّل التحقّق من MD5SUM للملفّات.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - أجبر تحديث مفتاح gpg.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - الحزم اللّازم تخطّي إعداداها\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1123,73 +1132,81 @@ msgstr ""
 "  --more-choices - في حالة العثور على عدّة حزم، إقترح عددا أكبر من الخيارات\n"
 "                   عن العدد الافتراضي.\n"
 
-#: ../urpmi:152
-#, fuzzy
+#: ../urpmi:150
+#, fuzzy, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --noclean      - عدم إخلاء حزم rpms من المخزن.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - ترقية الحزم ذات البُنية ذاتها فقط.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - اختر كل التطابقات على سطر الأوامر.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - السماح بالبحث في المعطيات ليجاد حزمة.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - لا تبحث في المعطيات لإيجاد حزمة.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - وضع هادئ.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  الأسماء أو ملفات rpm المعطاة على سطر الأوامر سيتم تثبيتها.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
-#, fuzzy
+#: ../urpmi:220
+#, fuzzy, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "ماذا يمكن فعله مع ملف rpm تنفيذي عند استخدام المعامل --install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "الدّليل [%s] موجود مسبقاً، رجاء استخدم دليلاً آخر لتقرير المشكلة أو حذفها"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "تعذر انشاء الدليل [%s] لتقرير العيوب"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "فشل النّسخ"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1198,114 +1215,142 @@ msgstr ""
 "خطأ: يبدو أن %s مركّب بوضع القراءة فقط.\n"
 "استخدم --allow-force لإجبار العملية."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (للترقية)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (للترقية)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (للتثبيت)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (للتثبيت)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "ما هو اختيارك؟ (1-%d)"
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"الحزم التالية لا يمكن تثبيتها لأنها تعتمد على حزم\n"
+"أقدم من المثبتة:\n"
+"%s"
+msgstr[1] ""
 "الحزم التالية لا يمكن تثبيتها لأنها تعتمد على حزم\n"
 "أقدم من المثبتة:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "استمرار على أي حال؟"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (ن/ل)"
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"لا يمكن تثبيت بعض الحزم المطلوبة:\n"
+"%s"
+msgstr[1] ""
 "لا يمكن تثبيت بعض الحزم المطلوبة:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"لم يمكن متابعة التثبيت لأنه يجب ازالة الحزم التالية\n"
+"لكي تتم ترقية الحزم الأخرى:\n"
+"%s\n"
+msgstr[1] ""
 "لم يمكن متابعة التثبيت لأنه يجب ازالة الحزم التالية\n"
 "لكي تتم ترقية الحزم الأخرى:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"يجب حذف الحزم التالية لترقية الحزم الأخرى:\n"
+"%s"
+msgstr[1] ""
 "يجب حذف الحزم التالية لترقية الحزم الأخرى:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"لإرضاء المُعتمدات، سيتم تثبيت الحزم %d التّالية:\n"
+"%s\n"
+msgstr[1] ""
 "لإرضاء المُعتمدات، سيتم تثبيت الحزم %d التّالية:\n"
 "%s\n"
 
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "لإرضاء المُعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1314,91 +1359,106 @@ msgstr ""
 "يجب أن تكون مستخدم جذر لكي تقوم بتثبيت الإعتمادات التالية:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "اضغط Enter عند الاستعداد..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "الحزم التالية تحتوي على توقيعات فاسدة"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "الحزم التالية تحتوي على توقيعات فاسدة"
+msgstr[1] "الحزم التالية تحتوي على توقيعات فاسدة"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "هل تريد متابعة التثبيت؟"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "جاري توزيع %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "جاري تثبيت %s من %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "جاري تثبيت %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "فشل التثبيت"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "محاولة التثبيت دون التأكد من الاعتمادات؟ (y[نعم]/N[لا])"
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "حاول التثبيت بشكل أقوى (--force)؟ (y[نعم]/N[لا])."
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "فشل معاملات تثبيت %d"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "التثبيت ممكن"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "كل شئ مثبت مسبقا"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "كل شئ مثبت مسبقا"
+msgstr[1] "كل شئ مثبت مسبقا"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "كل شئ مثبت مسبقا"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "كل شئ مثبت مسبقا"
+msgstr[1] "كل شئ مثبت مسبقا"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "إعادة تشغيل urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1422,26 +1482,34 @@ msgstr ""
 "و [options]  تأخذ قيمها من القائمة التّالية\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - اعمل وسيط تحديث.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - حاول أو تجد وتستخدم ملفّ التخليق.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - حاول أن تجد وتستخدم ملف hdlist.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - لا تحاول أن تعثر على أي ملفّ تخليق\n"
 "                   أو ملف hdlist.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1449,16 +1517,17 @@ msgstr ""
 "  --distrib      - أنشئ كلّ الوسطاء تلقائيّاً من\n"
 "                   وسيط التّثبيت\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - اسرد الوسائط المتوفّرة.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1467,7 +1536,8 @@ msgstr ""
 "  --from         - استخدم عنوان url المحدّد للائحة المرايا، والافتراضيّة هي\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1475,62 +1545,84 @@ msgstr ""
 "   --virtual      - أنشئ وسائط خيالية محدّثة بصفة دائمة،\n"
 "                   يسمح ببروتوكول file:// فقط.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - عطّل التحقّق من MD5SUM للملفّات.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - عدم استيراد pubkey للوسط المضاف\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - إضافة الوسط في التهيئة، ولكن دون تحديثه.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - نظّف دليل ذاكرة الترويسات المخبّئة.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - أجبر توليد ملفات hdlist.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - وضع هادئ.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - وضع تفصيلي.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "لم يمكن تحديث الوسيط \"%s\"\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "يسمح للمستخدم الجذر فقط بإضافة الوسائط"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "سوف ينشئ ملف التهيئة [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "لا يمكن إنشاء ملف التهيئة [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "لا داعي لإعطاء <المسار النّسبي لـhdlist> مع --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<المسار المُرتبط لـhdlist> مفقود\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "`with' مفقودة لوسط الشّبكة\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "لم يمكن عمل الوسيط \"%s\"\n"
@@ -1552,150 +1644,153 @@ msgstr ""
 "الاستعمال:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - عدم إخلاء حزم rpms من المخزن.\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-url     - اسرد الوسائط المتوفّرة وعناوينها.\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-url     - اسرد الوسائط المتوفّرة وعناوينها.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "لم يمكن ايجاد الحزمة %s"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "جاري استرجاع ملف rpm [%s]..."
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "لم يتمّ إيجاد قائمة ملفّات\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "الاستخدام: urpmi.removemedia [-a] <name> ...\n"
 "حيث أن <name> هو اسم الوسيط المطلوب ازالته.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - استخدم كل الوسائط.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - مطابقة تقريبية على أسماء الوسائط.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"خيارات غير معروفة '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "يسمح للمستخدم الجذر فقط بحذف الوسائط"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "لا شء للإزالة (استخدم urpmi.addmedia لإضافة وسيط)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1705,6 +1800,7 @@ msgstr ""
 "(واحد من %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1713,30 +1809,46 @@ msgstr ""
 "حيث أن <name> هو اسم الوسيط المطلوب تحديثه.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - حدّث فقط وسائط التّحديث.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - أجبر تحديث مفتاح gpg.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - عدم التحديث، ووضع علامة على الوسط كمُتجاهل.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - - عدم التحديث، ووضع علامة على الوسط كمُمكّن.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - اختر كلّ الوسائط الغير قابلة للإزالة.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - أجبر توليد ملفات hdlist.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "يسمح للمستخدم الجذر فقط بتحديث الوسائط"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "لا شئ للتحديث (استخدم urpmi.addmedia لإضافة وسيط)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1745,21 +1857,21 @@ msgstr ""
 "المدخل المطلوب تحديثه غير موجود\n"
 "(واحد من %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "تمكين الوسط %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "تجاهل الوسط %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "تمكين الوسط %s"
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1777,6 +1889,7 @@ msgstr ""
 "الاستعمال:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1785,50 +1898,60 @@ msgstr ""
 "المُحدّثة).\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - افرض البحث التقريبي (مثل -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - اسرد الحزم المتوفّرة.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - اسرد الوسائط المتوفّرة.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - اسرد الوسائط المتوفّرة وعناوينها.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - اسرد النقاط المتوفّرة عند استخدام --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - إصنع قائمة للأسماء المستعارة الموازية.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "   --dump-config  - أكتب الإعداد على شكل متغيّر لـ urpmi.addmedia.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - الحزمة التالية هي حزمة مصدريّة (مثل -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - أعط كل الحزم المصدريّة قبل تنزيلها (المستخدم root فقط).\n"
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1836,96 +1959,165 @@ msgstr ""
 "  --use-distrib  - أعدّ urpmi بشكل سريع من شجرة التوزيعة.\n"
 "                   يسمح هذا بالاستعلام من توزيعة.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - اطبع سجلّ التغيير.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - عرض التلخيص.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - مخرجات تامّة مع الحزمة الواجب حذفها.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - وسّع الاستعلام ليشتمل المعتمدات.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - تطبع المجموعات أيضا مع الأسماء أيضاً.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - اطبع معلومات مفيدة بشكل مقروء للإنسان.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - اسرد الملفّات في الحزمة.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - لا تبحث في المعطيات لإيجاد حزمة (الافتراض).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - إبحث في المعطيات لإيجاد حزمة.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - تطبع الإصدار و رقمه أيضا مع الإسم أيضاً.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - اعكس البحث لما يتطلّب هذه الحزمة.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -RR            - البحث العكسي الموسّع (يشمل الحزم الوهمية).\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s              - الحزمة التالية هي حزمة مصدرية (مثل --src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - أزل الحزمة إن كان هناك إصدارة أحدث منها مثبّتة.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - افرض البحث التّقريبيّ (مثل --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - مثل -y، و لكن بحصر المطابقة دون التّقيّد بشكل الحروف.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  الأسماء أو ملفات rpm المعطاة على سطر الأوامر يتم الاستعلام عنها.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes يمكن استخدامه فقط مع --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "تخطي الوسط %s: لا يحتوي hdlist"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "لم يتمّ إيجاد قائمة ملفّات\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "لم يُعثر على سجلّ تغييرات\n"
 
+#, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "فشل التثبيت"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "جاري اختبار ملف التخليق [%s]"
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "جاري توزيع %s"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "تثبيت الحزم..."
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "جاري تثبيت %s من %s"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "تثبيت الحزم..."
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "لإرضاء المُعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - حاول أو تجد وتستخدم ملفّ التخليق.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - حاول أن تجد وتستخدم ملف hdlist.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "`with' مفقودة لوسط الشّبكة\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "خيارات غير معروفة '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "بروتكول غير معرّف لـ%s"
 
diff --git a/po/az.po b/po/az.po
index fb44165d..1e026d14 100644
--- a/po/az.po
+++ b/po/az.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2004-09-12 20:33+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -21,8 +21,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
-#, fuzzy
+#: ../gurpmi:30 ../gurpmi2:63
+#, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Sistem qurulumu"
 
@@ -31,7 +31,8 @@ msgstr "Sistem qurulumu"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Oldu"
 
@@ -88,20 +89,23 @@ msgstr ""
 "Bunun yerinə sadəcə olaraq qeyd etməyi də seçə bilərsiniz.\n"
 "Seçiminiz nədir?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Qur"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Qeyd Et"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Ləğv Et"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Qeyd ediləcək ünvanı seçin"
 
@@ -113,20 +117,21 @@ msgstr ""
 "naməlum seçənəklər '%s'\n"
 
 #: ../gurpmi.pm:89
-#, fuzzy
+#, fuzzy, c-format
 msgid "No packages specified"
 msgstr "Əmr tə'yin edilməyib"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Xahiş edirik gözləyin..."
 
 #: ../gurpmi2:52
-#, fuzzy
+#, fuzzy, c-format
 msgid "Must be root"
 msgstr "Siçan Qapısı"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -136,37 +141,42 @@ msgstr ""
 "Bəzi istənən paketlər qurula bilmir:\n"
 "%s"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Oldu"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: ../gurpmi2:146
-#, fuzzy
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Oldu"
+
+#: ../gurpmi2:148
+#, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Yeniləmə"
 
-#: ../gurpmi2:147
-#, fuzzy
+#: ../gurpmi2:149
+#, fuzzy, c-format
 msgid " (to install)"
 msgstr "Qurulumun sonu"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Ləğv Et"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -176,7 +186,7 @@ msgstr ""
 "Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
 "%s"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -185,25 +195,27 @@ msgid ""
 msgstr ""
 "Asılıqları ortadan qaldırmaq üçün, aşağıdakı %d paket də qurulmalıdır (%d MB)"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Paket qurulumu..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "qaynaq paketi alına bilmir, çıxılır"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' paketi endirilir..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -217,8 +229,7 @@ msgstr ""
 "\n"
 "Yenə də qurulumu davam etdirmək istəyirsiniz?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -229,36 +240,38 @@ msgstr ""
 "%s\n"
 "Sizə, urpmi databeyzinizi yeniləməyi məsləhət görürük."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "%s silinir"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Hazırlanır..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' paketi qurulur (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Qurulum iflas etdi"
 
-#: ../gurpmi2:329
-#, fuzzy
+#: ../gurpmi2:331
+#, fuzzy, c-format
 msgid "_Done"
 msgstr "Qurtardı"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "hər şey onsuzda quruludur"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Qurulum bitdi"
 
@@ -270,20 +283,22 @@ msgid ""
 msgstr ""
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - bu kömək ismarışını çap edər.\n"
 
 #: ../rpm-find-leaves:17
-#, fuzzy
+#, fuzzy, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "  --synthesis    - urpmi db yerinə verilən synthesis'i işlət.\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [group]     - nəticələri verilən qrup xaricində qadağan et.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - adla birlikdə qrupları da göstər.\n"
 
@@ -292,210 +307,126 @@ msgstr "  -g             - adla birlikdə qrupları da göstər.\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    ön qurğulusu %s-dir.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Paketləri qurma icazəsi ancaq ali istifadəçi verilib"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmb açıla bilmir"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "hökmsüz rpm fayı adı [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "[%s] rpm faylı alınır ..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...alınma bitdi"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...alış bacarılmadı: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm faylı [%s] çatıla bilmir"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "[%s] faylındakı \"%s\" oxuna bilmədi"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "rpm faylı qeydiyyatdan keçirilə bilmədi"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "yerli paket qeydiyyat xətası"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "əmr sətirində hökmsüz vəkil tə'yini\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Bu əmri işlətmək üçün ali istifadəçi olmalısan ! \n"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "XxJjNn"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "YyBb"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "Xətalı seçənək, təkrar sınayın\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
+#: ../urpm/args.pm:426
 #, c-format
-msgid "on node %s"
+msgid "Can't use %s with %s"
 msgstr ""
 
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Qurulum iflas etdi"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Qurulum mümkündür"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "`%s' paketi qurulur (%s/%s)..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
+#: ../urpm/args.pm:440
 #, c-format
-msgid "scp failed on host %s (%d)"
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "[%s] synthesis faylı sınanır "
-
-#: ../urpm/parallel_ssh.pm:183
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "XxJjNn"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "%s paylanır"
+msgid "Yy"
+msgstr "YyBb"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "Paket qurulumu..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "%s qurulur"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "Paket qurulumu..."
+msgid "Sorry, bad choice, try again\n"
+msgstr "Xətalı seçənək, təkrar sınayın\n"
 
 #: ../urpme:39
 #, fuzzy, c-format
@@ -514,123 +445,135 @@ msgstr ""
 "\n"
 "istifadə qaydası:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - bu kömək ismarışını çap edər.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - seçililər arasında paketi avtomatik seç.\n"
 
 #: ../urpme:46
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - qurulumun düzgün edilə biləcəyini yoxla.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - bəzi paketlər mövcud olmasa belə istəməyə zorla.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - alias sistemləri arasında paylaşılmış urpmi.\n"
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --packager     - taq paketləyicisini göstərr: paketləyici.\n"
 
 #: ../urpme:50
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - rpm qurulumu üçün başqa root işlət.\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - rpm qurulumu üçün başqa root işlət.\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description   - taq izahatını göstər: izahat.\n"
 
-#: ../urpme:52
-#, fuzzy
+#: ../urpme:53
+#, fuzzy, 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"
 msgstr "  --use-distrib  - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - synthesis faylını tapıb işlətməyə çalış.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - hdlist faylını tapıb işlətməyə çalış.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - təfsilatlı mod.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - təfsilatlı mod.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - qaydaya uyğun gələn bütün paketləri seç.\n"
 
-#: ../urpme:74
-#, fuzzy
+#: ../urpme:75
+#, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Medianı silmə icazəsi ancaq ali istifadəçiyə verilib"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "na'məlum paket "
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "namə'lum paketlər"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "na'məlum paket "
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s paketini silmək sisteminizi pozacaq"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Silinəcək heç bir şey yoxdur"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Aşağıdakı paketlər silinmək üçün yoxlanır"
 
-#: ../urpme:133
+#: ../urpme:132
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (b/X) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "%s peketi silinir"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (b/X) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Çıxartma bacarılmadı"
 
@@ -652,244 +595,267 @@ msgstr ""
 "istifadə qaydası:\n"
 
 #: ../urpmf:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - bu kömək ismarışını çap edər.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - xüsusi mühit işlət (əsasən bir xəta raportu).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - vergüllə ayrılmış verilən mediya(lar)nı işlətmə.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media       - ancaq vergüllə ayrılmış verilən mediya(lar)nı işlət.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - vergüllə ayrılmış alt qatarlara görə mediyanı sırala.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - urpmi db yerinə verilən synthesis'i işlət.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - identik sətirləri göstərmə.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - təkcə güncəl medyanı işlət.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - təfsilatlı mod.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - hər patterndə bötük/kiçik hərf qaydalarını rədd et.\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - hər patterndə bötük/kiçik hərf qaydalarını rədd et.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - perl kodunu birbaşa perl -e kimi daxil et.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binary AND operatoru.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - OR operatoru.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - NOT operatoru.\n"
 
-#: ../urpmf:55
-#, fuzzy
+#: ../urpmf:56
+#, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - sağ mötərizə qrup ifadəsini bağlamaq üçün.\n"
 
-#: ../urpmf:56
-#, fuzzy
+#: ../urpmf:57
+#, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Geri yüklənəcək mə'lumatların siyahısı:\n"
 "\n"
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - X ara üzünü işlət.\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    ön qurğulusu %s-dir.\n"
 
-#: ../urpmf:59
-#, fuzzy
+#: ../urpmf:60
+#, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - taq url'sini göstər: url.\n"
 
-#: ../urpmf:60
-#, fuzzy
+#: ../urpmf:61
+#, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - taq inşa qovşağını göstər: inşa qovşağı.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Konsol quraşdırma modulu"
 
-#: ../urpmf:63
-#, fuzzy
+#: ../urpmf:64
+#, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - taq toqquşmalarını göstər: bütün toqquşmalar.\n"
 
-#: ../urpmf:64
-#, fuzzy
+#: ../urpmf:65
+#, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - taq izahatını göstər: izahat.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - taq epoch'unu göstər: epoch.\n"
 
-#: ../urpmf:67
-#, fuzzy
+#: ../urpmf:68
+#, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - sadəcə paket adlarını göstər.\n"
 
-#: ../urpmf:68
-#, fuzzy
+#: ../urpmf:69
+#, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - paketdəki faylları göstər.\n"
 
-#: ../urpmf:69
-#, fuzzy
+#: ../urpmf:70
+#, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - taq qrupunu göstər: qrup.\n"
 
-#: ../urpmf:70
-#, fuzzy
+#: ../urpmf:71
+#, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - sadəcə paket adlarını göstər.\n"
 
-#: ../urpmf:71
-#, fuzzy
+#: ../urpmf:72
+#, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - taq mütləqlərini göstər: bütün mütləqlər.\n"
 
-#: ../urpmf:72
-#, fuzzy
+#: ../urpmf:73
+#, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - taq paketləyicisini göstərr: paketləyici.\n"
 
-#: ../urpmf:73
-#, fuzzy
+#: ../urpmf:74
+#, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - taq gətirənini göstər: bütün gətirənlər.\n"
 
-#: ../urpmf:74
-#, fuzzy
+#: ../urpmf:75
+#, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - taq lazımlılarını göstər: bütün lazımlılar.\n"
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - taq böyüklüyünü göstər: böyüklük.\n"
 
-#: ../urpmf:76
-#, fuzzy
+#: ../urpmf:77
+#, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - taq sourcerpm'ini göstər: source rpm.\n"
 
-#: ../urpmf:77
-#, fuzzy
+#: ../urpmf:78
+#, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary       - taq icmalını göstər: icmal.\n"
 
-#: ../urpmf:78
-#, fuzzy
+#: ../urpmf:79
+#, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - taq url'sini göstər: url.\n"
 
-#: ../urpmf:79
-#, fuzzy
+#: ../urpmf:80
+#, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - təfsilatlı mod.\n"
 
-#: ../urpmf:80
-#, fuzzy
+#: ../urpmf:81
+#, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - paketdəki faylları göstər.\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - adla birlikdə buraxılış, yayını və arch'ı da çap et.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s üstündə xüsusi mühit istifadə edilir\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr ""
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -906,36 +872,55 @@ msgstr ""
 "\n"
 "istifadə qaydası:\n"
 
-#: ../urpmi:92
-#, fuzzy
+#: ../urpmi:88
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --media       - ancaq vergüllə ayrılmış verilən mediya(lar)nı işlət.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - sistemi yeniləmək üçün paketləri avtomatik seç.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr "  --auto-select  - sistemi yeniləmək üçün paketləri avtomatik seç.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - MD5SUM fayl yoxlamasını qeyri fəallaşdır.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gpg açarını yeniləməyə məcbur et.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - paket silməyi qətiyyən soruşma, qurulumu bitir.\n"
 
-#: ../urpmi:98
-#, fuzzy
+#: ../urpmi:97
+#, fuzzy, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --install-src  - ancaq mənbə paketini qur (ikililəri yox).\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -944,7 +929,7 @@ msgstr ""
 "paketlərin\n"
 "                   silinməsini məcbur qılan paketləri rədd et.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -955,35 +940,38 @@ msgstr ""
 "                   daha qısa keçişlərə böl,\n"
 "                   əsas qiymət: %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - kiçik keçiş uzunluqu, əsasən %d.\n"
 
-#: ../urpmi:105
-#, fuzzy
+#: ../urpmi:104
+#, fuzzy, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - fuzzy axtarmanı qəbul et ( -y ilə eyni).\n"
 
-#: ../urpmi:106
-#, fuzzy
+#: ../urpmi:105
+#, fuzzy, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src          - növbəti paket mənbə paketidir (-s ilə eyni).\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - ancaq mənbə paketini qur (ikililəri yox).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - hərşeydən əvvəl ara yaddaşdan rpm'i sil.\n"
 
-#: ../urpmi:109
-#, fuzzy
+#: ../urpmi:108
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - rpm'ləri ara yaddaşda işlətmə.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -991,7 +979,8 @@ msgstr ""
 "  --allow-nodeps - istifadəçiyə paketi asıllılıqları diqqətə almadan\n"
 "                   qurma sualı verməyə icazə ver.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -999,50 +988,60 @@ msgstr ""
 "  --allow-force - istifadəçiyə paketi asıllılıqları və uyğunluq\n"
 "                   yoxlanmadan qurma sualı verməyə icazə ver.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - rpm qurulumu üçün başqa root işlət.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr "  --use-distrib  - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - wget'i uzaqdakı faylları almaq üçün işlədin.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - uzaqdakı faylları almaq üçün curl işlət.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - uzaqdakı faylları almaq üçün curl işlət.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - endirmə sür'ətinə sərhəd qoy .\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1051,7 +1050,8 @@ msgstr ""
 "                   (--no-resume bunu qeyri-fəallaşdırır, əsasən qeyri-"
 "fəaldır).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1061,7 +1061,8 @@ msgstr ""
 "                   1080 qəbul edilir (istifadə qaydası: <vəkilqovşaq[:qapı]"
 ">).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1071,6 +1072,7 @@ msgstr ""
 "şifrə>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1079,7 +1081,7 @@ msgstr ""
 "                   xəta raportunu yaz.\n"
 
 #: ../urpmi:138
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1089,101 +1091,104 @@ msgstr ""
 "fəaldır).\n"
 
 #: ../urpmi:140
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - qurulumun düzgün edilə biləcəyini yoxla.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - vergüllə ayrılmış daxil etməmə çığırı.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - sənəd fayllarını ixrac et.\n"
 
 #: ../urpmi:143
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --no-uninstall - paket silməyi qətiyyən soruşma, qurulumu bitir.\n"
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --url          - taq url'sini göstər: url.\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --description   - taq izahatını göstər: izahat.\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - MD5SUM fayl yoxlamasını qeyri fəallaşdır.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - gpg açarını yeniləməyə məcbur et.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - qurulması keçilə bilən paketlər\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
 
-#: ../urpmi:152
-#, fuzzy
+#: ../urpmi:150
+#, fuzzy, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --noclean      - rpm'ləri ara yaddaşda işlətmə.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - əmr sətirindəki bütün uyğun gələnləri seç.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - paketi tapmaq üçün verilənlər arasında axtarmaya icazə "
 "ver.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - paketi tapmaq üçün verilənlər arasında axtarma.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - səssiz mod.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  əmr sətirində verilən adlar ya da rpm faylları qurulacaq.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
-#, fuzzy
+#: ../urpmi:220
+#, fuzzy, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "--install-src istifadə edildiyində rpm faylları ilə nə edilə biləcəyi"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1192,132 +1197,156 @@ msgstr ""
 "[%s] qovluğu onsuz da mövcuddur, xahiş edirik xəta raportu üçün başqa qovluq "
 "işlədin"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Xəta raportu üçün [%s] cərgəsi yaradıla bilmədi"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Köçütrmə bacarılmadı"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
 "Use --allow-force to force operation."
 msgstr ""
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "Yeniləmə"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "Yeniləmə"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Qurulumun sonu"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Qurulumun sonu"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Seçiminiz? (1-%d)"
 
-#: ../urpmi:481
+#: ../urpmi:482
 #, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Davam edilsin?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (B/x) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Bəzi istənən paketlər qurula bilmir:\n"
+"%s"
+msgstr[1] ""
 "Bəzi istənən paketlər qurula bilmir:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Qurulum davam edə bilmir çünki paketlərin yenilənməsi üçün\n"
+"aşağıdakı paketlərin çıxardılması lazımdır:\n"
+"%s\n"
+msgstr[1] ""
 "Qurulum davam edə bilmir çünki paketlərin yenilənməsi üçün\n"
 "aşağıdakı paketlərin çıxardılması lazımdır:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
+"%s"
+msgstr[1] ""
 "Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"Asılıqları ortadan qaldırmaq üçün, aşağıdakı %d paket də qurulmalıdır (%d MB)"
+msgstr[1] ""
 "Asılıqları ortadan qaldırmaq üçün, aşağıdakı %d paket də qurulmalıdır (%d MB)"
 
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr ""
-"Asılıqları ortadan qaldırmaq üçün, aşağıdakılar da qurulmalıdır (%d Mb)"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1326,91 +1355,106 @@ msgstr ""
 "Aşağıdakı asıllılıqları qurmaq üçün ali istifadəçi olmalısınız:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Hazır olanda Enter düyməsinə basın..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Ləğv et"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
+msgstr[1] "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Quruluma davam etmək istəyirsiniz ?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "%s paylanır"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "%s qurulur"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "%s qurulur"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Qurulum iflas etdi"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Paket asılılıqlarına fikir vermədən qurmağı sınayım? (b/X) "
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d qurulum daşınmaları bacarılmadı"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "Qurulum mümkündür"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "hər şey onsuzda quruludur"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "hər şey onsuzda quruludur"
+msgstr[1] "hər şey onsuzda quruludur"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "hər şey onsuzda quruludur"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "hər şey onsuzda quruludur"
+msgstr[1] "hər şey onsuzda quruludur"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "urpmi yenidən başladılır"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1435,26 +1479,34 @@ msgstr ""
 "və [seçənəklər] buradan gəlir\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - yeniləmə mediyumu yarat.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - synthesis faylını tapıb işlətməyə çalış.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - hdlist faylını tapıb işlətməyə çalış.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - hər hansı bir synthesis ya da hdlist\n"
 "                   faylı tapmaya cəhd göstərmə.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1462,16 +1514,17 @@ msgstr ""
 "  --distrib      - bütün medyaları avtomatik olaraq qurulum medyumundan\n"
 "                    yarat.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - mövcud medyanı göstər.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1480,7 +1533,8 @@ msgstr ""
 "  --from         - əkslərin siyahısı üçün verilən url'ni işlət, əsası\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1488,62 +1542,84 @@ msgstr ""
 "  --virtual      - həmişə yeni qalan virtual mediya yarat,\n"
 "                   ancaq file:// protokoluna icazə var.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - MD5SUM fayl yoxlamasını qeyri fəallaşdır.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "   -c            - başlıq ara yaddaşı cərgəsini təmizlə.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - hdlist fayllarının yaradılmasını məcbur et.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - səssiz mod.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - təfsilatlı mod.\n"
+
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr " \"%s\" medyası güncəllənə bilmir\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Media əlavə etmə icazəsi ancaq ali istifadəçiyə verilib"
 
-#: ../urpmi.addmedia:120
+#: ../urpmi.addmedia:121
 #, fuzzy, c-format
-msgid "Will create config file [%s]"
+msgid "creating config file [%s]"
 msgstr "[%s] quraşdırma faylı yazılır"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "[%s] quraşdırma faylı yazılır"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "<hdlist'in nisbi yolu>nu --distrib ilə verməyə ehtiyac yoxdur"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlistin nisbi yolu> mövcud deyildir\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "'with' şəbəkə medyasında əksikdir\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr " \"%s\" medyası yaradıla bilmir\n"
@@ -1566,152 +1642,154 @@ msgstr ""
 "istifadə qaydası:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - rpm'ləri ara yaddaşda işlətmə.\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-url     - mövcud medyanı və onların URL-lərini göstər.\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-url     - mövcud medyanı və onların URL-lərini göstər.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --name         - sadəcə paket adlarını göstər.\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "%s paketi tapılmadı."
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "[%s] rpm faylı alınır ..."
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "Heç rəsm tapılmadı"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "istifadə qaydası: urpmi.removemedia [-a] <ad> ...\n"
 "buradakı <ad> silinəcək mediyanın adıdır.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "   -a            - medya seç.\n"
 
-#: ../urpmi.removemedia:57
-#, fuzzy
+#: ../urpmi.removemedia:43
+#, fuzzy, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -a             - əmr sətirindəki bütün uyğun gələnləri seç.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"naməlum seçənəklər '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Medianı silmə icazəsi ancaq ali istifadəçiyə verilib"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "silinəcək bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia işlədin)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1721,6 +1799,7 @@ msgstr ""
 "(%s dan (dən) biri)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1729,32 +1808,47 @@ msgstr ""
 "buradakı <ad> yenilənəcək mediyumun adıdır.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - ancaq yeniləmə medyanı yenilə.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gpg açarını yeniləməyə məcbur et.\n"
+
 #: ../urpmi.update:44
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --update       - ancaq yeniləmə medyanı yenilə.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - çıxardıla bilməyən medya seç.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - hdlist fayllarının yaradılmasını məcbur et.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Medianı yeniləmə icazəsi ancaq ali istifadəçiyə verilib"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "yenilənəcək bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia işlədin)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1763,21 +1857,21 @@ msgstr ""
 "güncəllənəcək giriş mövcud deyildir\n"
 "(%s dan (dən) biri)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, fuzzy, c-format
-msgid "enabling media %s"
-msgstr "\"%s\" medyumu çıxardılır"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "\"%s\" mediyumu dəyişdirilir:"
 
+#: ../urpmi.update:101
+#, fuzzy, c-format
+msgid "enabling media %s"
+msgstr "\"%s\" medyumu çıxardılır"
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1796,7 +1890,7 @@ msgstr ""
 "istifadə qaydası:\n"
 
 #: ../urpmq:50
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1804,40 +1898,49 @@ msgstr ""
 "  --media       - ancaq vergüllə ayrılmış verilən mediya(lar)nı işlət.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - fuzzy axtarmanı qəbul et ( -y ilə eyni).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - mövcud paketləri göstər.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - mövcud medyanı göstər.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - mövcud medyanı və onların URL-lərini göstər.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - mövcud düyümləri --paralel işlədərkən göstər.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - mövcud paralel aliasları sırala.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - qurğuları urpmi.addmedia arqumenti formasında göstər.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - növbəti paket mənbə paketidir (-s ilə eyni).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
@@ -1845,116 +1948,180 @@ msgstr ""
 "istifadəçi).\n"
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --url          - taq url'sini göstər: url.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr "  --use-distrib  - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - dəyişmə qeydi faylını göstər.\n"
 
-#: ../urpmq:82
-#, fuzzy
+#: ../urpmq:84
+#, fuzzy, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary       - taq icmalını göstər: icmal.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - silinəcək paketlə çıxışı başa çatdır.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - sorğunu paketin asıllılıqlarına qədər uzat.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - adla birlikdə qrupları da göstər.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - insanın oxuya biləcəyi şəkildə faydalı mə'lumatları "
 "göstər.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - paketdəki faylları göstər.\n"
 
-#: ../urpmq:90
-#, fuzzy
+#: ../urpmq:93
+#, fuzzy, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - paketi tapmaq üçün verilənlər arasında axtarma.\n"
 
-#: ../urpmq:91
-#, fuzzy
+#: ../urpmq:94
+#, fuzzy, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr ""
 "  -p             - paketi tapmaq üçün verilənlər arasında axtarmaya icazə "
 "ver.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - adla birlikdə buraxılış və yayını da göstər.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - paketin nəyə ehtiyacı olduğunu tərsdən axtar.\n"
 
-#: ../urpmq:94
-#, fuzzy
+#: ../urpmq:97
+#, fuzzy, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -R             - paketin nəyə ehtiyacı olduğunu tərsdən axtar.\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - növbəti paket mənbə paketidir (--src ilə eyni).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - daha yeni buraxılış qurulu isə paketi çıxart/sil.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - fuzzy axtarmanı qəbul et ( --fuzzy ilə eyni).\n"
 
-#: ../urpmq:99
-#, fuzzy
+#: ../urpmq:101
+#, fuzzy, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -a             - əmr sətirindəki bütün uyğun gələnləri seç.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  əmr sətirində verilən adlar ya da rpm faylları sorğulanacaq.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes ancaq --parallel ilə bərabər istifadə edilə bilər"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr ""
 
-#: ../urpmq:405
-#, fuzzy
+#: ../urpmq:406
+#, fuzzy, c-format
 msgid "No filelist found\n"
 msgstr "Heç rəsm tapılmadı"
 
-#: ../urpmq:417
-#, fuzzy
+#: ../urpmq:418
+#, fuzzy, c-format
 msgid "No changelog found\n"
 msgstr "Rəsm tapıla bilmədi"
 
+#, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Qurulum iflas etdi"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "`%s' paketi qurulur (%s/%s)..."
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "[%s] synthesis faylı sınanır "
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "%s paylanır"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "Paket qurulumu..."
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "%s qurulur"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Paket qurulumu..."
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "Asılıqları ortadan qaldırmaq üçün, aşağıdakılar da qurulmalıdır (%d Mb)"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - synthesis faylını tapıb işlətməyə çalış.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - hdlist faylını tapıb işlətməyə çalış.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "'with' şəbəkə medyasında əksikdir\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "naməlum seçənəklər '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "%s üçün müəyyən edilən protokol namə'lumdur"
 
diff --git a/po/bg.po b/po/bg.po
index 648a34dd..691dcfe5 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2003-08-18 15:59+0300\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -20,7 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "RPM Инсталация"
 
@@ -29,7 +30,8 @@ msgstr "RPM Инсталация"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Добре"
 
@@ -84,20 +86,23 @@ msgstr ""
 "\n"
 "Вие може би предпочитате само да го запишете. Какъв е вашият избор?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Инсталиране"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Запазване"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr " Отказ"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Изберете място за запис на файл"
 
@@ -107,19 +112,21 @@ msgid "Unknown option %s"
 msgstr "Неизвестен хост %1"
 
 #: ../gurpmi.pm:89
-#, fuzzy
+#, fuzzy, c-format
 msgid "No packages specified"
 msgstr "Не е въведена команда"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Моля, изчакайте..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Трябва да бъдете root/админ"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -130,35 +137,42 @@ msgstr ""
 "%s\n"
 "Продължение?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Добре"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Добре"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr "(за обновяване)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr "(към инсталация)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Необходим е един от следните пакети:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Прекъсване"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -170,7 +184,7 @@ msgstr ""
 "%s\n"
 "Продължение"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -181,25 +195,27 @@ msgstr ""
 "бъдат инсталирани:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Инсталиране на пакети..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "не мога да получа сорс пакетите, прекратявам"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Моля, поставете източник с име \"%s\" в устройство [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Сваляне на пакет `%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -212,8 +228,7 @@ msgstr ""
 "\n"
 "Искате ли да продължите въпреки това ?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -224,35 +239,38 @@ msgstr ""
 "%s\n"
 "Вие вероятно трябва да обновите вашата urpmi база данни."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "изтриване на %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Подготовка..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталиране на пакет `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Инсталацията провалена"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Готово"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Пакета(тите) вече са инсталирани"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Инсталацията приключи"
 
@@ -266,20 +284,23 @@ msgstr ""
 "където [опции] са от\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - показва това помощно съобщение.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "  --root <path> - използва се даденият root вместо /\n"
 
 # msgstr "  --group         - отпечатва групата тагове: group."
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "  -g [group]  - ограничава резултатите до дадена група.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - отпечатай също групите с имена.\n"
 
@@ -288,211 +309,126 @@ msgstr "  -g             - отпечатай също групите с име�
 msgid "                    defaults to %s.\n"
 msgstr "                      по подразбиране е %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
-#, fuzzy
+#: ../rurpmi:11 ../urpmi:265
+#, fuzzy, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Появи се грешка при инсталиране на пакетите:"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "не мога да отворя rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "грешно rpm име на файла [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "получавам rpm файла [%s] ... "
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...получаването завършено"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...грешка при получаване: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm файлът [%s] е недостъпен"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "невъзможно да се обработи/парсва \"%s\" в файл [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "невъзможно регистрирането на rpm файл"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "грешка при регистрация на локалните пакети"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "грешна прокси декларация на командния ред\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Трябва да сте root за да ползвате тази команда ! \n"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: не може да се прочете rpm файл \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "НнNn"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "ДдDdYy"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "Съжалявам, грешен избор, опитайте отново\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
+#: ../urpm/args.pm:426
 #, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
+msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
+#: ../urpm/args.pm:440
 #, c-format
-msgid "on node %s"
-msgstr ""
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Инсталацията провалена"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Инсталацията е възможна"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "Инсталиране на пакет `%s' (%s/%s)..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "scp failed on host %s (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "проверявам синтезис файл [%s]"
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "НнNn"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "Стартирам %s:"
+msgid "Yy"
+msgstr "ДдDdYy"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "Инсталиране на пакети..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "инсталиране %s\n"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "Инсталиране на пакети..."
+msgid "Sorry, bad choice, try again\n"
+msgstr "Съжалявам, грешен избор, опитайте отново\n"
 
 #: ../urpme:39
 #, fuzzy, c-format
@@ -511,46 +447,57 @@ msgstr ""
 "\n"
 "начин на ползване:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - показва това помощно съобщение.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - автоматично избира пакет при опции за избор\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - проверка дали изтриването може да се извърши коректно.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - продължи дори ако някои пакети не съществуват.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
 
 #: ../urpme:50
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --size          - отпечатва размера на тага: size."
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --size          - отпечатва размера на тага: size."
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description   - отпечатва описание на тага: description."
 
-#: ../urpme:52
-#, fuzzy
+#: ../urpme:53
+#, fuzzy, 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"
@@ -558,83 +505,84 @@ msgstr ""
 "  --use-distrib  - автоматична конфигурация на urpmi от дървото, полезна\n"
 "                   за (де)инсталация на chroot при --root опция.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  -h             - опитай да намериш и ползваш синтез or hdlist файл.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr ""
 "  -h             - опитай да намериш и ползваш синтез or hdlist файл.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
 msgstr " -v             - показва всички съобщения\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - избиране на всички съвпадащи пакети.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Само superuser-а има право да премахва пакети"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "неизвестен пакет"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "неизвестни пакети"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "неизвестен пакет"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Следните пакети съдържат %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, fuzzy, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 "Премахването на тези пакети би разбило системата ви, съжалявам:\n"
 "\n"
 
-#: ../urpme:121
-#, fuzzy
+#: ../urpme:120
+#, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "Няма маркер за изтриване!"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Проверка за премахване на следните пакети"
 
-#: ../urpme:133
+#: ../urpme:132
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (Д/н) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "изтриване на пакет %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
-#, fuzzy
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (Д/н) "
+
+#: ../urpme:156
+#, fuzzy, c-format
 msgid "Removal failed"
 msgstr "Неуспешно влизане"
 
@@ -656,259 +604,271 @@ msgstr ""
 "начин на ползване:\n"
 
 #: ../urpmf:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - показва това помощно съобщение.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
 # Another meaning of the word is in the sense "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
-#, fuzzy
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, fuzzy, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --update       - създаване на ъпдейт посредник.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
-#, fuzzy
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --update       - обновява само източници на обновяване.\n"
 
 # Another meaning of the word is in the sense "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
-#, fuzzy
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, fuzzy, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --update       - създаване на ъпдейт посредник.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:43
-#, fuzzy
+#: ../urpmf:44
+#, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
-#, fuzzy
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, fuzzy, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - обновява само източници на обновяване.\n"
 
-#: ../urpmf:45
-#, fuzzy
+#: ../urpmf:46
+#, fuzzy, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr " -v             - показва всички съобщения\n"
 
-#: ../urpmf:46
-#, fuzzy
+#: ../urpmf:47
+#, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -e              - включва perl код направо като perl -e .\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -e              - включва perl код направо като perl -e .\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e              - включва perl код направо като perl -e .\n"
 
-#: ../urpmf:52
-#, fuzzy
+#: ../urpmf:53
+#, fuzzy, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr ""
 "  -u             - премахни пакета ако вече е инсталирана по добра версия.\n"
 
-#: ../urpmf:53
-#, fuzzy
+#: ../urpmf:54
+#, fuzzy, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr " -v             - показва всички съобщения\n"
 
-#: ../urpmf:54
-#, fuzzy
+#: ../urpmf:55
+#, fuzzy, c-format
 msgid "  !              - unary NOT.\n"
 msgstr " -v             - показва всички съобщения\n"
 
-#: ../urpmf:55
-#, fuzzy
+#: ../urpmf:56
+#, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
 
-#: ../urpmf:56
-#, fuzzy
+#: ../urpmf:57
+#, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Списък на данни за възстановяване:\n"
 "\n"
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  -g             - отпечатай също групите с имена.\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                      по подразбиране е %s.\n"
 
-#: ../urpmf:59
-#, fuzzy
+#: ../urpmf:60
+#, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:60
-#, fuzzy
+#: ../urpmf:61
+#, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Настройки на конзолата"
 
-#: ../urpmf:63
-#, fuzzy
+#: ../urpmf:64
+#, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 "  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
 "(множество редове)."
 
-#: ../urpmf:64
-#, fuzzy
+#: ../urpmf:65
+#, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - отпечатва описание на тага: description."
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --help         - показва това помощно съобщение.\n"
 
-#: ../urpmf:67
-#, fuzzy
+#: ../urpmf:68
+#, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --all           - отпечатва всички тагове.\n"
 
-#: ../urpmf:68
-#, fuzzy
+#: ../urpmf:69
+#, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - извежда файловете в пакет.\n"
 
-#: ../urpmf:69
-#, fuzzy
+#: ../urpmf:70
+#, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:70
-#, fuzzy
+#: ../urpmf:71
+#, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --all           - отпечатва всички тагове.\n"
 
-#: ../urpmf:71
-#, fuzzy
+#: ../urpmf:72
+#, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 "  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
 "(множество редове)."
 
-#: ../urpmf:72
-#, fuzzy
+#: ../urpmf:73
+#, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
 
-#: ../urpmf:73
-#, fuzzy
+#: ../urpmf:74
+#, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:74
-#, fuzzy
+#: ../urpmf:75
+#, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:76
-#, fuzzy
+#: ../urpmf:77
+#, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
 
-#: ../urpmf:77
-#, fuzzy
+#: ../urpmf:78
+#, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
 
-#: ../urpmf:78
-#, fuzzy
+#: ../urpmf:79
+#, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:79
-#, fuzzy
+#: ../urpmf:80
+#, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr " -v             - показва всички съобщения\n"
 
-#: ../urpmf:80
-#, fuzzy
+#: ../urpmf:81
+#, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - извежда файловете в пакет.\n"
 
-#: ../urpmf:81 ../urpmq:86
-#, fuzzy
+#: ../urpmf:82 ../urpmq:89
+#, fuzzy, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -r             - отпечатай версия и също така реализация с име.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr ""
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -927,41 +887,62 @@ msgstr ""
 
 # Another meaning of the word is in the sense "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi:92
-#, fuzzy
+#: ../urpmi:88
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --update       - създаване на ъпдейт посредник.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - автоматично избира пакети за ъпгрейд на системата.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - автоматично избира пакети за ъпгрейд на системата.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - изключва MD5SUM проверка на файловете.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - активирай обновяване на gpg ключ.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -969,119 +950,139 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr ""
 
-#: ../urpmi:106
-#, fuzzy
+#: ../urpmi:105
+#, fuzzy, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --list           - отпечатва всички налични пакети.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:116
-#, fuzzy
+#: ../urpmi:115 ../urpmq:69
+#, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --size          - отпечатва размера на тага: size."
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr ""
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
 #: ../urpmi:140
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1089,322 +1090,365 @@ msgstr ""
 "  --test         - проверка дали изтриването може да се извърши коректно.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr ""
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --description   - отпечатва описание на тага: description."
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - изключва MD5SUM проверка на файловете.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - активирай обновяване на gpg ключ.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr ""
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr ""
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
 
-#: ../urpmi:155
-#, fuzzy
+#: ../urpmi:153
+#, fuzzy, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
 
-#: ../urpmi:156
-#, fuzzy
+#: ../urpmi:154
+#, fuzzy, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -r             - отпечатай версия и също така реализация с име.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-#, fuzzy
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr " -v             - показва всички съобщения\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, fuzzy, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "Групата вече съществува,моля изберете друго име"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, fuzzy, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Грешка при създаване на директория %s"
 
-#: ../urpmi:249
-#, fuzzy
+#: ../urpmi:247
+#, fuzzy, c-format
 msgid "Copying failed"
 msgstr "Неуспешно влизане"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
 "Use --allow-force to force operation."
 msgstr ""
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "(за обновяване)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "(за обновяване)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "(към инсталация)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "(към инсталация)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Какъв е вашият избор? (1-%d) "
 
-#: ../urpmi:481
+#: ../urpmi:482
 #, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Продължение въпреки всичко ?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (Д/н) "
 
-#: ../urpmi:500
+#: ../urpmi:503
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Някои необходими пакети не могат да бъдат инсталирани:\n"
+"%s\n"
+"Продължение?"
+msgstr[1] ""
 "Някои необходими пакети не могат да бъдат инсталирани:\n"
 "%s\n"
 "Продължение?"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Инсталацията не може да продължи,защото следните пакети\n"
+"трябва да бъдат премахнати за да бъдат обновени други\n"
+"%s\n"
+msgstr[1] ""
 "Инсталацията не може да продължи,защото следните пакети\n"
 "трябва да бъдат премахнати за да бъдат обновени други\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Следните пакети трябва да бъдат премахнати,за да могат други да бъдат "
+"обновени:\n"
+"%s"
+msgstr[1] ""
 "Следните пакети трябва да бъдат премахнати,за да могат други да бъдат "
 "обновени:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"За да се задоволят зависимостите, следните %d пакети ще\n"
+"бъдат инсталирани:\n"
+"%s\n"
+msgstr[1] ""
 "За да се задоволят зависимостите, следните %d пакети ще\n"
 "бъдат инсталирани:\n"
 "%s\n"
 
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr ""
-"За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, fuzzy, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr "Трябва да сте root за да ползвате тази команда ! \n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Натиснете Enter,когато сте готови..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Отказ"
 
-#: ../urpmi:660
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "Следните пакети ще трябва да се инсталират:\n"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Следните пакети ще трябва да се инсталират:\n"
+msgstr[1] "Следните пакети ще трябва да се инсталират:\n"
 
-#: ../urpmi:661
-#, fuzzy
+#: ../urpmi:668
+#, fuzzy, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Искате ли да цъкнете на този бутон?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "Стартирам %s:"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "инсталиране %s\n"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "инсталиране %s\n"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Инсталацията провалена"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Опит за инсталиране без проверка на зависимости? (д/Н) "
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Опит за инсталиране даже по-силно (--force)? (д/Н) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d инсталационните транзакции не можаха да се осъществят"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "Инсталацията е възможна"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Пакета(тите) вече са инсталирани"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Пакета(тите) вече са инсталирани"
+msgstr[1] "Пакета(тите) вече са инсталирани"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Пакета(тите) вече са инсталирани"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Пакета(тите) вече са инсталирани"
+msgstr[1] "Пакета(тите) вече са инсталирани"
 
-#: ../urpmi:847
-#, fuzzy
+#: ../urpmi:863
+#, fuzzy, c-format
 msgid "restarting urpmi"
 msgstr "Стартира slurpd: "
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1418,29 +1462,35 @@ msgid ""
 msgstr ""
 
 #: ../urpmi.addmedia:54
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - обновява само източници на обновяване.\n"
 
 #: ../urpmi.addmedia:55
-#, fuzzy
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  -h             - опитай да намериш и ползваш синтез or hdlist файл.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr ""
+"  -h             - опитай да намериш и ползваш синтез or hdlist файл.\n"
 
 #: ../urpmi.addmedia:57
-#, fuzzy
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
 msgstr ""
-"  -h             - опитай да намериш и ползваш синтез or hdlist файл.\n"
 
 #: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
+msgstr ""
+"  -h             - опитай да намериш и ползваш синтез or hdlist файл.\n"
+
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1449,23 +1499,25 @@ msgstr ""
 "инсталационен\n"
 "                   източник.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - показва наличните източници.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1473,63 +1525,84 @@ msgstr ""
 "  --virtual      - създава псевдо източник, който винаги е актуален,\n"
 "                   само file:// протокола е разрешен.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - изключва MD5SUM проверка на файловете.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - почистване на хедър кеш директорията.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr " -v             - активира създаване на hdlist файлове.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, fuzzy, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr " -v             - показва всички съобщения\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr " -v             - показва всички съобщения\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "невъзможност за обновяване на източник \"%s\"\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Само superuser-а има правото да инсталира източници"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "ще се създаде конфигурационен файл [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "невъзможно да се създаде конфигурационен файл [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "не се въвежда <относителен път до hdlist> при --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
-#, fuzzy
+#: ../urpmi.addmedia:166
+#, fuzzy, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "Липсва относителен път до hdlist\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "`with' липса на мрежов източник\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, fuzzy, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "Невъзможност за създаване на източник."
@@ -1552,151 +1625,153 @@ msgstr ""
 "начин на ползване:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-url     - показва наличните източници и техните url.\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-url     - показва наличните източници и техните url.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --all           - отпечатва всички тагове.\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "пакет %s не е намерен."
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "получавам rpm файла [%s] ... "
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "Не е намерен файлов-списък\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "употреба: urpmi.removemedia [-a] <име> ...\n"
 "където <име> е име на източник за премахване.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - избиране на всички източници.\n"
 
-#: ../urpmi.removemedia:57
-#, fuzzy
+#: ../urpmi.removemedia:43
+#, fuzzy, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - избиране на всички съвпадения на командния ред.\n"
 
-#: ../urpmi.removemedia:60
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"непознати опции '%s'\n"
-
-#: ../urpmi.removemedia:70
-#, fuzzy
+#: ../urpmi.removemedia:65
+#, fuzzy, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr "Само superuser-а има правото да инсталира източници"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "нищо за премахване (ползвай urpmi.addmedia за добавяне на източник)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1706,6 +1781,7 @@ msgstr ""
 "(едно от %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1714,32 +1790,46 @@ msgstr ""
 "където <име> е име на източник за обновяване.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - обновява само източниците за обновяване.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - активирай обновяване на gpg ключ.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --update      - не обновявай, маркирай източника като неактивен.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - не обновявай, маркирай източника като активен.\n"
 
-#: ../urpmi.update:46
-#, fuzzy
+#: ../urpmi.update:47
+#, fuzzy, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - избиране на всички твърди дискове.\n"
 
-#: ../urpmi.update:69
-#, fuzzy
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr " -v             - активира създаване на hdlist файлове.\n"
+
+#: ../urpmi.update:70
+#, fuzzy, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Само superuser-а има правото да обновява източниците"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "нищо за ъпгрейд (ползвай urpmi.addmedia за добавяне на източник)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1748,23 +1838,23 @@ msgstr ""
 "липсва опцията за обновяване\n"
 "(една от %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
+#: ../urpmi.update:101
+#, c-format
+msgid "ignoring media %s"
+msgstr "игнориране на източник %s"
+
 # Another meaning of the word is in the sense "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "enabling media %s"
 msgstr "активиране на източник %s"
 
-#: ../urpmi.update:100
-#, c-format
-msgid "ignoring media %s"
-msgstr "игнориране на източник %s"
-
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1785,39 +1875,45 @@ msgstr ""
 # Another meaning of the word is in the sense "The iron is good medium for the eletricity"
 # in this case must be "проводник"
 #: ../urpmq:50
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr "  --update       - създаване на ъпдейт посредник.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - отпечатва наличните пакети.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - показва наличните източници.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - показва наличните източници и техните url.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - показва наличните възли когато се ползва --parallel.\n"
 
 #: ../urpmq:62
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases   - показва наличните паралелни синоними.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
@@ -1825,22 +1921,24 @@ msgstr ""
 "аргумент.\n"
 
 #: ../urpmq:64
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --list           - отпечатва всички налични пакети.\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - връща всички сорс пакети преди даунлоуд (само root).\n"
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1848,102 +1946,165 @@ msgstr ""
 "  --use-distrib  - конфигурирай urpmi автоматично от дървото.\n"
 "                   Това позволява да се извършват запитвания.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - отпечатва списък с промените.\n"
 
-#: ../urpmq:82
-#, fuzzy
+#: ../urpmq:84
+#, fuzzy, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
 
-#: ../urpmq:84
-#, fuzzy
+#: ../urpmq:87
+#, fuzzy, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - пълен отчет с пакета който ще бъде изтрит.\n"
 
-#: ../urpmq:85
-#, fuzzy
+#: ../urpmq:88
+#, fuzzy, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - разшири запитването и към пакетните зависимости.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - отпечатай също групите с имена.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - отпечатай полезна информация за четене от човек.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - извежда файловете в пакет.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P         - не търси в provides за намиране на пакет.\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr " -p             - търсене в provides за да се намери пакет.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - отпечатай версия и номер а също и име.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr " -R             - обратно търсене за това кой изисква пакета.\n"
 
-#: ../urpmq:94
-#, fuzzy
+#: ../urpmq:97
+#, fuzzy, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr " -R             - обратно търсене за това кой изисква пакета.\n"
 
-#: ../urpmq:95
-#, fuzzy
+#: ../urpmq:98
+#, fuzzy, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -r             - отпечатай версия и също така реализация с име.\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "  -u             - премахни пакета ако вече е инсталирана по-нова версия.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - като -y, но не се отчитат главни-малки букви.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "имена или rpm файлове от командния ред се обработват.\n"
 
-#: ../urpmq:176
-#, fuzzy
+#: ../urpmq:177
+#, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes може да се използва само с --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, fuzzy, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "пропускам източник %s: няма hdlist\n"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Не е намерен файлов-списък\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Не е намерен changelog\n"
 
+#, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Инсталацията провалена"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Инсталиране на пакет `%s' (%s/%s)..."
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "проверявам синтезис файл [%s]"
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Стартирам %s:"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "Инсталиране на пакети..."
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "инсталиране %s\n"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Инсталиране на пакети..."
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
+
+#, fuzzy
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr ""
+#~ "  -h             - опитай да намериш и ползваш синтез or hdlist файл.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "`with' липса на мрежов източник\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "непознати опции '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "Зададен е неизвестен протокол за %s"
 
diff --git a/po/bn.po b/po/bn.po
index db16df67..0136aa3a 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2005-02-13 13:39+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -33,7 +33,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "আরপিএম ইনস্টলেশন"
 
@@ -42,7 +43,8 @@ msgstr "আরপিএম ইনস্টলেশন"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "ঠিক আছে (_ঠ)"
 
@@ -97,20 +99,23 @@ msgstr ""
 "\n"
 "আপনি হয়তো এটা সেভ করে রাখতে চাইবেন। আপনার পছন্দ কি?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_ইনস্টল"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_সংরক্ষণ"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "বাতিল (_ত)"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "ফাইল সংরক্ষণ করার অবস্থান বেছে নিন"
 
@@ -122,19 +127,21 @@ msgstr ""
 "অপরিচিত অপশনসমূহ '%s'\n"
 
 #: ../gurpmi.pm:89
-#, fuzzy
+#, fuzzy, c-format
 msgid "No packages specified"
 msgstr "কোন নির্দেশ পাওয়া যায় নি"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "অনুগ্রহ করে অপেক্ষা করুন..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "অবশ্যই root হতে হবে"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -145,35 +152,42 @@ msgstr ""
 "%s\n"
 "এগিয়ে যাবো?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "ঠিক আছে"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "নোটিশ"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "ঠিক আছে"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (আপগ্রেডের জন্য)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (ইনস্টলের জন্য)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "নিম্নলিখিত প্যাকেজসমুহের মধ্যে একটির প্রয়োজন আছে:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_বাতিল"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -184,7 +198,7 @@ msgstr ""
 "%s\n"
 "এগিয়ে যাবো?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -194,25 +208,27 @@ msgstr ""
 "ডিপেন্ডেন্সি সন্তুষ্ট করতে নিম্নলিখিত %d প্যাকেজগুলো ইনস্টল হতে যাচ্ছে:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "প্যাকেজ ইনস্টলেশন..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "সোর্স প্যাকেজ গুলি পাওয়া যায়নি, থামানো হচ্ছে"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "অনুগ্রহ করে \"%s\" নামের মাধ্যম [%s] নামের ডিভাইসে প্রবেশ করান"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' প্যাকেজ ডাউনলোড করা হচ্ছে..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -225,8 +241,7 @@ msgstr ""
 "\n"
 "আপনি কি ইনস্টলেশন প্রক্রিয়া চালিয়ে যেতে ইচ্ছুক ?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -237,35 +252,38 @@ msgstr ""
 "%s\n"
 "আপনি হয়তো আপনার urpmi ডাটাবেস আপডেট করতে চাইবেন"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "%s সরানো হচ্ছে"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "প্রস্তুত করা হচ্ছে..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' প্যাকেজ ইনস্টল করা হচ্ছে (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "ইনস্টলেশন ব্যর্থ"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_সম্পন্ন"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "ইনস্টলেশন প্রক্রিয়া সম্পূর্ণ হয়েছে"
 
@@ -279,19 +297,22 @@ msgstr ""
 "[অপশসসমূহ] যেখান থেকে\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - এই সাহায্য বার্তাটি প্রিন্ট করো।\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <path>  - / এর পরিবর্তে প্রদত্ত root টি ব্যবহার করো\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [group]     - ফলাফলসমূহ প্রদত্ত গ্রুপের মধ্যেই সীমাবদ্ধ রাখো।\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - নাম সহ গ্রুপ প্রিন্ট করো।\n"
 
@@ -300,210 +321,126 @@ msgstr "  -g             - নাম সহ গ্রুপ প্রিন্�
 msgid "                    defaults to %s.\n"
 msgstr "                    %s ডিফল্ট।\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "শুধুমাত্র superuser-এর প্যাকেজ ইনস্টল করার ক্ষমতা আছে"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb খুলতে অক্ষম"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "অবৈধ rpm ফাইল নাম [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "rpm ফাইল [%s] আনা হচ্ছে..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...আনা হয়ে গেছে"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...আনতে ব্যর্থ হয়েছি: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm ফাইল [%s] ব্যবহার করা যাচ্ছে না"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "\"%s\"-এর পরিচয় [%s] ফাইলে দেয়া সম্ভব হয়নি"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "আরপিএম ফাইল রেজিস্টার করতে অক্ষম"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "স্থানীয় প্যাকেজসমূহ রেজিস্টার করতে সমস্যা হয়েছে"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "কমান্ড লাইনের ওপর বাজে প্রক্সি ঘোষণা\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "ডিরেক্টরি শেয়ার করতে হলে আপনাকে অনুমোদিত ব্যবহারকারী হতে হবে"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: \"%s\" rpm ফাইল পড়া যাচ্ছেনা\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "Nnন"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "Yyহ"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "দুঃখিত, খারাপ পছন্দ, পুনরায় চেষ্টা করুন\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
+#: ../urpm/args.pm:426
 #, c-format
-msgid "on node %s"
+msgid "Can't use %s with %s"
 msgstr ""
 
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "ইনস্টলেশন ব্যর্থ"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "ইনস্টলেশন সম্ভব"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "`%s' প্যাকেজ ইনস্টল করা হচ্ছে (%s/%s)..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
+#: ../urpm/args.pm:440
 #, c-format
-msgid "scp failed on host %s (%d)"
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "synthesis ফাইল [%s] পরীক্ষা করা হচ্ছে"
-
-#: ../urpm/parallel_ssh.pm:183
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "Nnন"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "বিতরণ করা হচ্ছে %s"
+msgid "Yy"
+msgstr "Yyহ"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "প্যাকেজ ইনস্টলেশন..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "প্যাকেজ ইনস্টলেশন..."
+msgid "Sorry, bad choice, try again\n"
+msgstr "দুঃখিত, খারাপ পছন্দ, পুনরায় চেষ্টা করুন\n"
 
 #: ../urpme:39
 #, fuzzy, c-format
@@ -521,44 +458,56 @@ msgstr ""
 "\n"
 "ব্যবহার:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - এই সাহায্যকারী বার্তাটি ছাপাও।\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - পছন্দসমূহ থেকে সয়ংক্রিয়ভাবে প্যাকেজ নির্বাচন করো।\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - সরানোটি সঠিকভাবে সম্পন্ন করা যাবে কি-না যাচাই করো।\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - প্যাকেজ না থাকলেও জোড় করে আমন্ত্রন করো।\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - এলিয়াসের মেশিনসমূহের মধ্যে বিতরণকৃত urpmi\n"
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --packager     - packager: packager ট্যাগ ছাপাও।\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - rpm সরানোর জন্য আরেকটি root ব্যবহার করো।\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - rpm ইনস্টলেশনের জন্য অন্য রুট ব্যবহার করো।\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --epoch        - description: description ট্যাগ ছাপাও।\n"
 
-#: ../urpme:52
-#, fuzzy
+#: ../urpme:53
+#, fuzzy, 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"
@@ -566,76 +515,79 @@ msgstr ""
 "  --use-distrib  - distrib ট্রি থেকে চলন্ত অবস্থায় urpmi কনফিগার করো, --root\n"
 "                    অপশনের সাথে croot (আন)ইনস্টলে কার্যকর।\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - একটি synthesis ফাইল খুঁজে ব্যবহারের চেষ্টা করো।\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - একটি hdlist ফাইল খুঁজে ব্যবহারের চেষ্টা করো।\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - verbose মোড।\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - verbose মোড।\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - expression মিলিয়ে সমস্ত প্যাকেজ নির্বাচন করো।\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "শুধুমাত্র superuser-এর প্যাকেজ সরাবার অনুমতি আছে"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "অজানা প্যাকেজ"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "অজানা প্যাকেজসমুহ"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "অজানা প্যাকেজ"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "এই প্যাকেজগুলিতে রয়েছে %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s প্যাকেজ সরালে আপনার সিস্টেমের সমস্যা হবে"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "সরানোর মতো কিছুই নেই"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "নিম্নলিখিত প্যাকেজসমূহ সরানোর জন্য পরীক্ষা করা হচ্ছে"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "ডিপেন্ডেন্সি সন্তুষ্ট করতে, নিম্নলিখিত %d প্যাকেজগুলো সরানো হবে (%d এমবি)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr "(y/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "%s প্যকেজ সরানো হচ্ছে"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr "(y/N) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "সরাতে ব্যর্থ"
 
@@ -656,230 +608,252 @@ msgstr ""
 "ব্যবহার:\n"
 
 #: ../urpmf:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - এই সাহায্যকারী বার্তাটি ছাপাও।\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - সুনির্দিষ্ট পরিবেশ ব্যবহার করো (বিশেষত একটি ত্রুটি রিপোর্ট।)\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - প্রদত্ত মাধ্যম ব্যবহার করবেনা, কমা দিয়ে ভাগ করা।\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - শুধুমাত্র প্রদত্ত মাধ্যম ব্যবহার করো, কমা দিয়ে ভাগ করা।\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - কমা দ্বারা বিচ্ছিন্ন মতে মাধ্যম ক্রমান্বয়ে সাজাও।\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - urpmi db'র পরিবর্তে প্রদত্ত synthesis ব্যবহার করো।\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - identical লাইনসমূহহ ছাপাবে না।\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - শুধু আপডেট মিডিয়া ব্যবহার করো।\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - verbose মোড।\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - সকল প্যাটার্ণ এ case distinctions অগ্রাহ্য করো ।\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - সকল প্যাটার্ণ এ case distinctions অগ্রাহ্য করো ।\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - perl কোড perl -e এর মতো সরাসরি অন্তর্ভুক্ত করো।\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - বানারি AND অপারেটর.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - বাইনারি OR অপারেটর.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - ইউনারি NOT.\n"
 
-#: ../urpmf:55
-#, fuzzy
+#: ../urpmf:56
+#, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - group expression শেষ করার জন্য।\n"
 
-#: ../urpmf:56
-#, fuzzy
+#: ../urpmf:57
+#, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "যে সকল তথ্য ব্যাক-আপ থেকে পুনরুদ্ধার করতে হবে তাদের তালিকা:\n"
 "\n"
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - ইন্টারফেস ব্যবহার করো।\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    %s ডিফল্ট।\n"
 
-#: ../urpmf:59
-#, fuzzy
+#: ../urpmf:60
+#, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - url: url ট্যাগ ছাপাও।\n"
 
-#: ../urpmf:60
-#, fuzzy
+#: ../urpmf:61
+#, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - build host: buildhost ট্যাগ ছাপাও।\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "কনসোল কনফিগারেশন মডিউল"
 
-#: ../urpmf:63
-#, fuzzy
+#: ../urpmf:64
+#, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - all conflicts: conflicts ট্যাগ ছাপাও।\n"
 
-#: ../urpmf:64
-#, fuzzy
+#: ../urpmf:65
+#, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --epoch        - description: description ট্যাগ ছাপাও।\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - epoch: epoch ট্যাগ ছাপাও।\n"
 
-#: ../urpmf:67
-#, fuzzy
+#: ../urpmf:68
+#, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
 
-#: ../urpmf:68
-#, fuzzy
+#: ../urpmf:69
+#, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - প্যাকেজে ফাইলের তালিকা\n"
 
-#: ../urpmf:69
-#, fuzzy
+#: ../urpmf:70
+#, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - group: group ট্যাগ ছাপাও।\n"
 
-#: ../urpmf:70
-#, fuzzy
+#: ../urpmf:71
+#, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
 
-#: ../urpmf:71
-#, fuzzy
+#: ../urpmf:72
+#, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
 
-#: ../urpmf:72
-#, fuzzy
+#: ../urpmf:73
+#, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - packager: packager ট্যাগ ছাপাও।\n"
 
-#: ../urpmf:73
-#, fuzzy
+#: ../urpmf:74
+#, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - all provides: provides ট্যাগ ছাপাও।\n"
 
-#: ../urpmf:74
-#, fuzzy
+#: ../urpmf:75
+#, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - all requires: requires ট্যাগ ছাপাও।\n"
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - size: size ট্যাগ ছাপাও।\n"
 
-#: ../urpmf:76
-#, fuzzy
+#: ../urpmf:77
+#, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - source rpm: sourcerpm ট্যাগ ছাপাও।\n"
 
-#: ../urpmf:77
-#, fuzzy
+#: ../urpmf:78
+#, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --epoch        - summary: summary ট্যাগ ছাপাও।\n"
 
-#: ../urpmf:78
-#, fuzzy
+#: ../urpmf:79
+#, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url: url ট্যাগ ছাপাও।\n"
 
-#: ../urpmf:79
-#, fuzzy
+#: ../urpmf:80
+#, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - verbose মোড।\n"
 
-#: ../urpmf:80
-#, fuzzy
+#: ../urpmf:81
+#, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - প্যাকেজে ফাইলের তালিকা\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - ভার্সন, প্রকাশ এবং আর্ক এর সঙ্গে নাম ছাপাও।\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s-এর ওপর সুনির্দিষ্ট পরিবেশ ব্যবহার করো\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -887,11 +861,12 @@ msgstr ""
 "নোট: যেহেতু কোনো মাধ্যম hdlists ব্যবহার করে সন্ধান করে নি, urpmf কোনো ফলাফল দিতে "
 "পারে নি\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "প্যাকেজ নাম সমুহ খোঁজার জন্য আপনি --name ব্যবহার করতে পারেন।\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -907,27 +882,46 @@ msgstr ""
 "\n"
 "ব্যবহার:\n"
 
-#: ../urpmi:92
-#, fuzzy
+#: ../urpmi:88
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - অনুরোধকৃত (অথবা আপডেটকৃত) প্যাকেজসমুহ খোঁজার জন্য শুধুমাত্র প্রদত্ত "
 "মাধ্যম ব্যবহার করো।\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - সিস্টেমটি আপগ্রেড করার জন্য সয়ংক্রিয়ভাবে প্যাকেজ নির্বাচন করো।\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - সিস্টেমটি আপগ্রেড করার জন্য সয়ংক্রিয়ভাবে প্যাকেজ নির্বাচন করো।\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - MD5SUM ফাইল পরীক্ষা নিষ্ক্রিয় করো।\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gpg কী আপডেটের জন্য জোর দাও।\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -935,13 +929,14 @@ msgstr ""
 "  --no-uninstall - প্যাকেজ আন-ইনস্টলেশন করতে কখনো জিজ্ঞাসা করো না, ইনস্টলেশন "
 "বাতিল করো।\n"
 
-#: ../urpmi:98
-#, fuzzy
+#: ../urpmi:97
+#, fuzzy, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 "  --install-src  - শুধুমাত্র সোর্স প্যাকেজ সমুহ ইনস্টল করো (বাইনারি সমুহ নয়)।\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -949,7 +944,7 @@ msgstr ""
 "  --keep         - বিদ্যমান প্যাকেজসুমহকে সম্ভব হলে রাখো, আবেদনকৃত প্যাকেজসমুহ\n"
 "                   যেগুলো সরানো হবে তা নাকচ করো ।\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -960,36 +955,39 @@ msgstr ""
 "                   লেনদেন ছোট খন্ড করে নাও,\n"
 "                   স্বাভাবিক হলো %d\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - ছোট লেনদেনের দৈর্ঘ্য, স্বাভাবিক হচ্ছে %d.\n"
 
-#: ../urpmi:105
-#, fuzzy
+#: ../urpmi:104
+#, fuzzy, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - fuzzy খোঁজ চালাও (অনুরূপ -y)।\n"
 
-#: ../urpmi:106
-#, fuzzy
+#: ../urpmi:105
+#, fuzzy, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src          - পরবর্তি প্যাকেজটি একটি সোর্স প্যাকেজ (অনুরূপ --s)।\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - শুধুমাত্র সোর্স প্যাকেজ সমুহ ইনস্টল করো (বাইনারি সমুহ নয়)।\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - কিছু করার পুর্বে ক্যাশ থেকে আর-পি-এম পরিষ্কার করো।\n"
 
-#: ../urpmi:109
-#, fuzzy
+#: ../urpmi:108
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - ক্যাশ এ ব্যবহৃত নয় এমন আর-পি-এম রাখো।\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -997,7 +995,8 @@ msgstr ""
 "  --allow-nodeps - ডিপেন্ডন্সি পরীক্ষা ছাড়া প্যাকেজ ইনস্টল করতে\n"
 "                   ব্যবহারকারী কে জিজ্ঞাসার জন্য অনুমতি দাও।\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -1005,11 +1004,13 @@ msgstr ""
 "  --allow-force  - ডিপেন্ডন্সি এবং অখন্ডতা পরীক্ষা ছাড়া প্যাকেজ ইনস্টল করতে\n"
 "                   ব্যবহারকারী কে জিজ্ঞাসার জন্য অনুমতি দাও।\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - rpm ইনস্টলেশনের জন্য অন্য রুট ব্যবহার করো।\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -1017,40 +1018,48 @@ msgstr ""
 "  --use-distrib  - distrib ট্রি থেকে চলন্ত অবস্থায় urpmi কনফিগার করো, --root\n"
 "                    অপশনের সাথে chroot ইনস্টলে কার্যকর।\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - দুরবর্তী ফাইল আনার জন্য wget ব্যবহার করো।\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - দুরবর্তী ফাইল আনার জন্য curl ব্যবহার করো।\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - দুরবর্তী ফাইল আনার জন্য curl ব্যবহার করো।\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - ডাউনলোড গতির সীমা নির্ধারণ।\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1058,7 +1067,8 @@ msgstr ""
 "  --resume       - আংশিক-ডাউনলোডকৃত ফাইলসমুহ পুনরায় আরম্ভ করো\n"
 "                   (--no-resume অকার্যকর করবে, স্বাভাবিকভাবে কার্যকর).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1066,7 +1076,8 @@ msgstr ""
 "  --proxy        - উল্লেখিত HTTP প্রক্সি ব্যবহার করো, ডিফল্ট ভাবে পোর্ট নম্বরটি\n"
 "                   ১০৮০ ধরা যায় (ফর্ম্যাট হচ্ছে <proxyhost[:port]>)।\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1075,6 +1086,7 @@ msgstr ""
 "                    উল্লেখ করো (ফর্ম্যাট হচ্ছে <user:password>)।\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1083,7 +1095,7 @@ msgstr ""
 "                    তৈরী করো।\n"
 
 #: ../urpmi:138
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1092,50 +1104,46 @@ msgstr ""
 "                   (--no-verify-rpm অকার্যকর করবে, স্বাভাবিকভাবে কার্যকর).\n"
 
 #: ../urpmi:140
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - ইনস্টলেশনটি সঠিকভাবে হবে কি-না যাচাই করো।\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - কমা দিয়ে ভাগকরা পাথ বাদ দাও।\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - ডকুমেন্ট ফাইল বাদে।\n"
 
 #: ../urpmi:143
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --no-uninstall - প্যাকেজ আন-ইনস্টলেশন করতে কখনো জিজ্ঞাসা করো না, ইনস্টলেশন "
 "বাতিল করো।\n"
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --url          - url: url ট্যাগ ছাপাও।\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --epoch        - description: description ট্যাগ ছাপাও।\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - MD5SUM ফাইল পরীক্ষা নিষ্ক্রিয় করো।\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - gpg কী আপডেটের জন্য জোর দাও।\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - যেসব প্যাকেজসমুহ ইনস্টলেশনের বাদ দেয়া উচিত\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1143,52 +1151,59 @@ msgstr ""
 "  --more-choices - যখন কয়েকটি প্যাকেজ পাওয়া যাবে, ডিফল্টের\n"
 "                   অধিক প্রস্তাব করবে\n"
 
-#: ../urpmi:152
-#, fuzzy
+#: ../urpmi:150
+#, fuzzy, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --noclean      - ক্যাশ এ ব্যবহৃত নয় এমন আর-পি-এম রাখো।\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - শুধুমাত্র একই আরকিটেক্চারের প্যাকেজসমুহকে আপগ্রেড করো।\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - কমান্ড লাইনের সমস্ত মিল নির্বাচন করো।\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - প্যাকেজ খোঁজ করতে অনুমতি দাও।\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - প্যাকেজ খোঁজার জন্য প্রদত্তের মধ্যে খোঁজ করবে না।\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - নির্বিকার ভাবে।\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  ইনস্টলের জন্য কমান্ডলাইনে প্রদত্ত নাম অথবা আরপিএম।\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
-#, fuzzy
+#: ../urpmi:220
+#, fuzzy, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "--install-src ব্যবহারের সময় বায়নারি rpm ফাইলগুলির সাথে কি করা যেতে পারে"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1197,21 +1212,22 @@ msgstr ""
 "ডিরেক্টরি [%s] আগে থেকেই উপস্থিত, ত্রুটি রিপোর্টের জন্য অনুগ্রহ করে অন্য ডিরেক্টরি "
 "ব্যবহার করুন বা এটা মুছে ফেলুন"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "ত্রুটি রিপোর্টের জন্য [%s] ডিরেক্টরি তৈরি করতে অক্ষম"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "কপি করতে ব্যর্থ"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1220,115 +1236,142 @@ msgstr ""
 "সমস্যা: %s শুধুমাত্র পড়ার জন্য মাউন্ট করা মনে হচ্ছে।\n"
 "বলপুর্বক কাজের জন্য --allow-force ব্যবহার করুন।"
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (আপগ্রেডের জন্য)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (আপগ্রেডের জন্য)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (ইনস্টলের জন্য)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (ইনস্টলের জন্য)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "আপনার পছন্দ কি? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"নিম্নলিখিত প্যাকেজসমুহকে ইনস্টল করা যাবে না কারন তারা এমন প্যাকেজের পুরাতন "
+"সংস্করণের উপর নির্ভরশীল যার নতুন সংস্করণ ইনস্টল করা আছে:\n"
+"%s"
+msgstr[1] ""
 "নিম্নলিখিত প্যাকেজসমুহকে ইনস্টল করা যাবে না কারন তারা এমন প্যাকেজের পুরাতন "
 "সংস্করণের উপর নির্ভরশীল যার নতুন সংস্করণ ইনস্টল করা আছে:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "অগ্রসর হবে?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr "(Y/n)"
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"আবেদনকৃত কিছু প্যাকেজ ইনস্টল করা যায়নি:\n"
+"%s"
+msgstr[1] ""
 "আবেদনকৃত কিছু প্যাকেজ ইনস্টল করা যায়নি:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"এই ইনস্টলটি চালিয়ে যাওয়া যাবেনা কারণ নিম্নলিখিত প্যাকেজগুলি সরাতে হবে অন্যগুলি "
+"আপগ্রেড করার জন্য:\n"
+"%s\n"
+msgstr[1] ""
 "এই ইনস্টলটি চালিয়ে যাওয়া যাবেনা কারণ নিম্নলিখিত প্যাকেজগুলি সরাতে হবে অন্যগুলি "
 "আপগ্রেড করার জন্য:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"নিম্নলিখিত প্যাকেজগুলি অবশ্যই সরাতে হবে অন্যগুলি আপগ্রেড করার জন্য:\n"
+"%s"
+msgstr[1] ""
 "নিম্নলিখিত প্যাকেজগুলি অবশ্যই সরাতে হবে অন্যগুলি আপগ্রেড করার জন্য:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"ডিপেন্ডেন্সি সন্তুষ্ট করতে নিম্নলিখিত %d প্যাকেজগুলো ইনস্টল হতে যাচ্ছে:\n"
+"%s\n"
+msgstr[1] ""
 "ডিপেন্ডেন্সি সন্তুষ্ট করতে নিম্নলিখিত %d প্যাকেজগুলো ইনস্টল হতে যাচ্ছে:\n"
 "%s\n"
 
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr ""
-"নিম্নলিখিত প্যাকেজগুলি ইনস্টল হতে যাচ্ছে, ডিপেন্ডেন্সিদের সন্তুষ্ট করতে (%d এমবি)"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1337,91 +1380,106 @@ msgstr ""
 "নিম্নলিখিত ডিপেন্ডেন্সিসমূহ ইনস্টল করার জন্য আপনাকে রুট হতে হবে:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "প্রস্তুত হলে Enter চাপুন..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "বাতিল"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "নিম্নের প্যাকেজগুলিতে বাজে স্বাক্ষর রয়েছে"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "নিম্নের প্যাকেজগুলিতে বাজে স্বাক্ষর রয়েছে"
+msgstr[1] "নিম্নের প্যাকেজগুলিতে বাজে স্বাক্ষর রয়েছে"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "আপনি কি ইনস্টলেশন চলিয়ে যেতে চাচ্ছেন ?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "বিতরণ করা হচ্ছে %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "%s ইনস্টল করা হচ্ছে"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "ইনস্টলেশন ব্যর্থ"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "ডিপেন্ডেন্সিসমুহ পরীক্ষা না করে ইনস্টলেশনের চেষ্টা করবো? (y/N)"
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "আরও জোরালোভাবে ইনস্টলের চেষ্টার করবো (--force)? (y/N)"
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d ইনস্টলেশনের লেনদেন ব্যর্থ হয়েছে"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "ইনস্টলেশন সম্ভব"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "সবকিছু আগে থেকেই ইনস্টল করা আছে"
+msgstr[1] "সবকিছু আগে থেকেই ইনস্টল করা আছে"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "সবকিছু আগে থেকেই ইনস্টল করা আছে"
+msgstr[1] "সবকিছু আগে থেকেই ইনস্টল করা আছে"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "urpmi আবার শুরু করা হচ্ছে"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1445,26 +1503,34 @@ msgstr ""
 "এবং [options] গুলো এর থেকে\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - একটি আপডেট মাধ্যম তৈরী করো।\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - একটি synthesis ফাইল খুঁজে ব্যবহারের চেষ্টা করো।\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - একটি hdlist ফাইল খুঁজে ব্যবহারের চেষ্টা করো।\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - কোন synthesis বা hdlist ফাইল খোঁজের\n"
 "                     চেষ্টা করবে না।\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1472,16 +1538,17 @@ msgstr ""
 "  --distrib      - একটি ইনস্টলেশনের মাধ্যম থেকে সমস্থ মাধ্যম তৈরী করো\n"
 "                  সয়ংক্রিয়ভাবে।\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - উপস্থিত মাধ্যমের তালিকাবদ্ধ করো।\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1490,7 +1557,8 @@ msgstr ""
 "  --from         - মিরর লিস্টের জন্য উল্লেখিত URL ব্যাবহার করো, স্বাভাবিক হলো\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1498,62 +1566,84 @@ msgstr ""
 "  --virtual      - ভার্চুয়াল মাধ্যম তৈরী করো যারা সবসময় আপ-টু-ডেট থাকে,\n"
 "                   শুধুমাত্র file:// প্রটোকল অনুমতি পাবে।\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - MD5SUM ফাইল পরীক্ষা নিষ্ক্রিয় করো।\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - হেডার ক্যাশ ডিরেক্টরি পরিষ্কার করো।\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - hdlist ফাইলসমূহ তৈরী করার জন্য জোর দাও।\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - নির্বিকার ভাবে।\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - verbose মোড।\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "\"%s\" মাধ্যম আপডেট করা যায়নি\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "মাধ্যম যোগ করার অনুমতি শুধুমাত্র superuser এর আছে"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "কনফিগ ফাইল [%s] তৈরী করবে"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "কনফিগ ফাইল [%s] তৈরী করা যাচ্ছ না"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "--distrib এর সাথে <relative path of hdlist> দেয়ার প্রয়োজন নেই"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<relative path of hdlist> পাওয়া যাচ্ছে না\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "নেটওয়ার্ক মাধ্যমের জন্য `with' পাওয়া যাচ্ছে না\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "\"%s\" মাধ্যম তৈরী করা যায়নি\n"
@@ -1575,150 +1665,153 @@ msgstr ""
 "ব্যবহার:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - ক্যাশ এ ব্যবহৃত নয় এমন আর-পি-এম রাখো।\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-url     - উপস্থিত মাধ্যম এবং তাঁদের url তালিকাবদ্ধ করো।\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-url     - উপস্থিত মাধ্যম এবং তাঁদের url তালিকাবদ্ধ করো।\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "প্যাকেজ %s পাওয়া যায়নি।"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "rpm ফাইল [%s] আনা হচ্ছে..."
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "filelist পাওয়া যায়নি\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "যেখানে <name> সরানোর জন্য একটি মাধ্যমের নাম।\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - সমস্থ মাধ্যম নির্বাচন করো।\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - fuzzy match on media names.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"অপরিচিত অপশনসমূহ '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "শুধুমাত্র superuser-এর মাধ্যম সরাবার ক্ষমতা আছে"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "সরানোর জন্য কিছু নেই (মাধ্যম যোগ করার জন্য ব্যবহার করো)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1728,6 +1821,7 @@ msgstr ""
 "(%s-এর একটা)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1736,30 +1830,46 @@ msgstr ""
 "যেখানে <নাম> আপডেট করার জন্য মাধ্যমের নাম।\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - শুধুমাত্র আপডেট মাধ্যম আপডেট করো।\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gpg কী আপডেটের জন্য জোর দাও।\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - আপডেট করো না, মাধ্যমটিকে অগ্রাহ্য হিসেবে চিহ্নিত করো।\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - আপগ্রেড করো না, মাধ্যমটিকে সক্রিয় হিসেবে চিহ্নিত করো।\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - স্থানান্তরযোগ্য অযোগ্য এরকম সমস্থ মাধ্যম নির্বাচিত করো।\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - hdlist ফাইলসমূহ তৈরী করার জন্য জোর দাও।\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "শুধুমাত্র superuser-ই মাধ্যম আপডেট করতে পারবে"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "আপডেট করার কিছুই নাই (মাধ্যম যোগ করতে urpmi.addmedia ব্যবহার করো)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1768,21 +1878,21 @@ msgstr ""
 "আপডেটের এন্ট্রি পাওয়া যাচ্ছে না\n"
 "(%s-এর একটা)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "\"%s\" মাধ্যমটি সক্রিয় করা হচ্ছে"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "\"%s\" মাধ্যমটি অগ্রাহ্য করা হচ্ছে"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "\"%s\" মাধ্যমটি সক্রিয় করা হচ্ছে"
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1800,6 +1910,7 @@ msgstr ""
 "ব্যবহারবিধি:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1808,51 +1919,61 @@ msgstr ""
 "মাধ্যম ব্যবহার করো।\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - fuzzy খোঁজ চালাও (অনুরূপ -y)।\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - উপস্থিত প্যাকেজসমূহের তালিকাবদ্ধ করো।\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - উপস্থিত মাধ্যমের তালিকাবদ্ধ করো।\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - উপস্থিত মাধ্যম এবং তাঁদের url তালিকাবদ্ধ করো।\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - ব্যবহারের সময় উপস্থিত নোডগুলির তালিকা বরাদ্দ করো --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - সমান্তরাল alias সমূহের তালিকা দাও।\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - urpmi.addmedia-এর মত কনফিগ ডাম্প করো।\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - পরবর্তি প্যাকেজটি একটি সোর্স প্যাকেজ (অনুরূপ --s)।\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - ডাউনলোড করার আগ সমস্থ সোর্স প্যাকেজের দাও (শুধুমাত্র রুটে)।\n"
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --url          - url: url ট্যাগ ছাপাও।\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1860,99 +1981,167 @@ msgstr ""
 "  --use-distrib  - একটি distrib ট্রি থেকে চলন্ত অবস্থায় urpmi কনফিগার করো।\n"
 "                   এটা distro নিরীক্ষনের অনুমতি দেবে।\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - প্রিন্টের changelog.\n"
 
-#: ../urpmq:82
-#, fuzzy
+#: ../urpmq:84
+#, fuzzy, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --epoch        - summary: summary ট্যাগ ছাপাও।\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - অপসারিত প্যাকেজের সম্পূর্ন ফলাফল।\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - প্যাকেজ নির্ভরতার প্রতি নিরীক্ষা প্রসারিত করো।\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - নাম সহ গ্রুপ প্রিন্ট করো।\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - মানুষের পড়ারমত প্রয়োজনীয় তথ্য প্রিন্ট করো।\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - প্যাকেজে ফাইলের তালিকা\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - পরিবেশকদের মধ্যে প্যাকেজের খোঁজ করোনা (স্বাভাবিক)।\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - পরিবেশকদের মধ্যে প্যাকেজের খোঁজ করো।\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - নাম সহ ভার্সন এবং রিলিজ প্রিন্ট করো।\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - প্যাকেজের কি প্রয়োজন তার জন্য উল্টা খোঁজ করো।\n"
 
-#: ../urpmq:94
-#, fuzzy
+#: ../urpmq:97
+#, fuzzy, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -R             - প্যাকেজের কি প্রয়োজন তার জন্য উল্টা খোঁজ করো।\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - পরবর্তি প্যাকেজটি একটি সোর্স প্যাকেজ (অনুরূপ --src)।\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "  -u             - যদি সাম্প্রতিক সংস্ককরন উপস্থিত থাকে তাহলে প্যাকেজ অপসরন করো।\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - fuzzy খোঁজ চালাও (অনুরূপ --fuzzy)।\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - -y এর মতই, কিন্তু case-insensitively মিলাতে বাধ্য করবে।\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  কমান্ডলাইনে প্রদত্ত নাম বা rmp ফাইলসমূহ নিরীক্ষণ করা হয়েছে।\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes শুধুমাত্র --parallel এর সাথে ব্যবহৃত হতে পারে"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, fuzzy, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "%s মাধ্যম উপেক্ষা করা হচ্ছে: কোন hdlist নেই\n"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "filelist পাওয়া যায়নি\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "changelog পাওয়া যায়নি\n"
 
+#, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "ইনস্টলেশন ব্যর্থ"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "`%s' প্যাকেজ ইনস্টল করা হচ্ছে (%s/%s)..."
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "synthesis ফাইল [%s] পরীক্ষা করা হচ্ছে"
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "বিতরণ করা হচ্ছে %s"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "প্যাকেজ ইনস্টলেশন..."
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "প্যাকেজ ইনস্টলেশন..."
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "নিম্নলিখিত প্যাকেজগুলি ইনস্টল হতে যাচ্ছে, ডিপেন্ডেন্সিদের সন্তুষ্ট করতে (%d এমবি)"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - একটি synthesis ফাইল খুঁজে ব্যবহারের চেষ্টা করো।\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - একটি hdlist ফাইল খুঁজে ব্যবহারের চেষ্টা করো।\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "নেটওয়ার্ক মাধ্যমের জন্য `with' পাওয়া যাচ্ছে না\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "অপরিচিত অপশনসমূহ '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "অজানা প্রোটোকল নির্ধারনের জন্য %s"
 
diff --git a/po/br.po b/po/br.po
index b925b344..704d25a3 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-11-29 02:34+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: Breton <LL@li.org>\n"
@@ -14,7 +14,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "Staliadur ar RPM"
 
@@ -23,7 +24,8 @@ msgstr "Staliadur ar RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Fazi : n'hell ket bet kavet ar restr %s, nullaet vo"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Ya"
 
@@ -65,20 +67,23 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Staliañ"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Enrollañ"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Nullañ"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Dibabit lec'hiadur da enrollañ ar restr"
 
@@ -88,18 +93,21 @@ msgid "Unknown option %s"
 msgstr "Dianav eo an dibarzh %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "N'eus pakad dibabet ebet"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Gortozit mar plij ..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Red eo da bezañ root"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -110,35 +118,42 @@ msgstr ""
 "%s\n"
 "Kenderc'hel ar staliadur evelato ?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Ya"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Diwallit"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Ya"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (da vremanaat)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (da staliañ)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Choazh ar pakad"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Unan eus ar pakadoù a-heul a zo war-nes bezañ staliet :"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Dilaoskel"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -150,7 +165,7 @@ msgstr ""
 "%s\n"
 "Kenderc'hel evelato ?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -158,25 +173,27 @@ msgid ""
 "%s\n"
 msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "O staliañ ar pakad ..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "n'hellan ket tigas ar pakadoù tarzh, emaon o terriñ"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Enlakait ar medium a vez graet « %s » anezhañ war trobarzhell [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "O tigas ar pakad « %s » ..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -189,8 +206,7 @@ msgstr ""
 "\n"
 "Ha fellout a ra deoc'h da genderc'hel ar staliadur ?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -198,35 +214,38 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "lemel %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "O prientiñ ..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "O staliañ ar pakad `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Sac'het eo an staliadur"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Graet"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Staliet eo ar pakad(où) c'hoazh"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Echu eo ar staliadur"
 
@@ -238,18 +257,22 @@ msgid ""
 msgstr ""
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr ""
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr ""
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr ""
 
 #: ../rpm-find-leaves:19
+#, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr ""
 
@@ -258,208 +281,126 @@ msgstr ""
 msgid "                    defaults to %s.\n"
 msgstr ""
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Nemet ez-euz moien da staliañ pakadoù gant ar gourarveriad"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "fazi en ur zigeriñ rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "n'eo ket mat an ar restr rpm [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "o tigas ar restr rpm [%s] ..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "... echu eo ar resev"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... sac'het eo ar resev : %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "n'eo ket possubl da voned ar restr rpm [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "n'hellan ket bet lennet ar restr spec %s [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "n'hell ket bet enskrivet ar restr rpm"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "fazi en ur enskrivañ ar pakadoù lec'hel"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr "n'eo ket endeo renkell ar chroot"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr ""
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq : n'hellan ket lenn ar restr rpm « %s »\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "Nn"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "YyOo"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "Ho tigarez, fall eo an dibab-mañ, klaskit adarre\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr ""
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "O skignañ ar restroù d'ar skoulmoù ..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "Sac'het eo an staliadur war ar skoulm %s"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Possubl eo an staliadur"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "O staliañ ar pakadoù war ar skoulmoù..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "sac'het eo scp war an ostiz %s (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "o lenn ar restr synthesis [%s]"
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/args.pm:426
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
+msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "O skignañ ar restroù ad %s ..."
-
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/args.pm:440
 #, c-format
-msgid "Verifying if install is possible on %s..."
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:267
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Performing install on %s..."
-msgstr "O staliañ war %s ..."
+msgid "Nn"
+msgstr "Nn"
 
-#: ../urpm/parallel_ssh.pm:281
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "Installing %s on %s..."
-msgstr "O staliañ %s war %s ..."
+msgid "Yy"
+msgstr "YyOo"
 
-#: ../urpm/parallel_ssh.pm:282
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Preparing install on %s..."
-msgstr "O prientiñ da staliañ war %s ..."
+msgid "Sorry, bad choice, try again\n"
+msgstr "Ho tigarez, fall eo an dibab-mañ, klaskit adarre\n"
 
 #: ../urpme:39
 #, c-format
@@ -478,115 +419,134 @@ msgstr ""
 "\n"
 "arveriadur :\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr ""
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - implij ur gwrizienn all evit lemel pakadoù.\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - implij ur gwrizienn all evit lemel pakadoù.\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description  - deskrivadur ar pakad\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
 msgstr ""
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr ""
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr ""
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
 msgstr ""
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Ar gourarveriad hepken a c'hell lemel pakadoù"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "pakad anavez"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "dianav eo ar pakadoù"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pakad anavez"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "%s zo er pakadoù a-heul : %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "sac'het e vo ho reizhiad ma eo lemelet ar pakad %s"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "N'eus pakad da zilemel ebet"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr ""
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (y/N)"
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "Lemel %d pakad ?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N)"
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Fazi en ur lemel"
 
@@ -608,212 +568,260 @@ msgstr ""
 "arveriadur : urpmf [dibarzhoù] sil\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr ""
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr ""
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - ostiz ar sevel\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - amzer ar sevel\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    -restroù kefluniadur\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - deskrivadur ar pakad\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr ""
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - anv restr ar pakad\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - roll ar restroù hag a zo er pakad\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - strollad\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - anv ar pakad\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr ""
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - ment pa 'vez staliet\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - anv ar rpm tizh\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - diverrañ\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr ""
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr ""
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr ""
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -830,39 +838,60 @@ msgstr ""
 "\n"
 "arveriadur :\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+
+#: ../urpmi:94
+#, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
+
+#: ../urpmi:95
+#, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr ""
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -870,273 +899,309 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr ""
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr ""
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr ""
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr ""
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr ""
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr ""
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr ""
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr ""
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr ""
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr ""
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr ""
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
-msgstr ""
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
+msgstr "  --buildtime    - amzer ar sevel\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "N'hell ket bet krouer ar renkell [%s] evit reiñ da c'houzout ur gudenn"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Fazi en ur eilañ"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
 "Use --allow-force to force operation."
 msgstr ""
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s : %s (evit bremanaat)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (evit bremanaat)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s : %s (evit staliañ)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (evit staliañ)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Petra eo ho choazh ? (1-%d) "
 
-#: ../urpmi:481
+#: ../urpmi:482
 #, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1144,143 +1209,176 @@ msgstr ""
 "\n"
 "Kenderc'hel evelato ?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (Y/n)"
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Ne m'eus ket gallet staliañ un darn pakad goulennet :\n"
+"%s"
+msgstr[1] ""
 "Ne m'eus ket gallet staliañ un darn pakad goulennet :\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] "Red eo da lemel ar pakadoù-mañ"
+msgstr[1] "Red eo da lemel ar pakadoù-mañ"
 
-#: ../urpmi:535
+#: ../urpmi:541
 #, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr "Red eo da lemel ar pakadoù-mañ"
+msgstr[0] "Red eo da lemel ar pakadoù-mañ"
+msgstr[1] "Red eo da lemel ar pakadoù-mañ"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet"
-
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] "Ar pakadoù a-heul a zo war-nes bezañ staliet"
+msgstr[1] "Ar pakadoù a-heul a zo war-nes bezañ staliet"
 
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Gwaskit « Mont » pa oc'h prest ..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Nullañ"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Bez eus sinadur fall gant ar pakadoù a-heul"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Bez eus sinadur fall gant ar pakadoù a-heul"
+msgstr[1] "Bez eus sinadur fall gant ar pakadoù a-heul"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Fellout a ra deoc'h kenderc'hel staliañ ?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "o skignañ %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "o staliañ %s eus %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "o staliañ %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "Sac'het eo an staliadur :"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr ""
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "gourc'hemennoù staliañ"
 
-#: ../urpmi:824
-msgid "Packages are up to date"
-msgstr "Bremañaet eo ar pakadoù"
-
-#: ../urpmi:827
+#: ../urpmi:828
 #, c-format
-msgid "Packages %s are already installed"
-msgstr "Staliet eo ar pakadoù %s c'hoazh"
+msgid "Installation is possible"
+msgstr "Possubl eo an staliadur"
 
-#: ../urpmi:828
+#: ../urpmi:833
 #, c-format
+msgid "Packages are up to date"
+msgstr "Bremañaet eo ar pakadoù"
+
+#: ../urpmi:840
+#, fuzzy, c-format
 msgid "Package %s is already installed"
-msgstr "Staliet eo ar pakad %s c'hoazh"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Staliet eo ar pakad %s c'hoazh"
+msgstr[1] "Staliet eo ar pakad %s c'hoazh"
 
-#: ../urpmi:847
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Staliet eo ar pakadoù %s c'hoazh"
+msgstr[1] "Staliet eo ar pakadoù %s c'hoazh"
+
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "oc'h adloc'hañ urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1294,106 +1392,139 @@ msgid ""
 msgstr ""
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
 msgstr ""
 
 #: ../urpmi.addmedia:59
+#, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
+msgstr ""
+
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr ""
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "n'hell ket bet bremañaet ar medium « %s »\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Ar gourarveriad hepken a c'hell ouzhpennañ ur vedia"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Ar restr kefluniadur [%s] a vo krouet"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Ne 'meus ket ar restr kefluniadur [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
 msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "ne m'eus ket krouiñ ar mediom « %s »\n"
@@ -1416,144 +1547,152 @@ msgstr ""
 "arveriadur :\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr ""
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr ""
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --filename     - anv restr ar pakad\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "ar pakad %s n'eo ket bet kavet."
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "O skrivañ restr makroù rpm [%s] ...\n"
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "Filelist kavet ebet\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Ar gourarveriad hepken a c'hell lemel ur vedia"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "bez eus netra da lemel (implij urpmi.addmedia evit ouzhpennañ ur vedia)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1563,37 +1702,54 @@ msgstr ""
 "(unan eus %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr ""
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr ""
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Ar gourarveriad hepken a c'hell bremañaat ar media"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "bez eus netra da vremañaat (implij urpmi.addmedia evit ouzhpennañ ur vedia)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1602,21 +1758,21 @@ msgstr ""
 "mankout a ra ar vouetadur da vremañaat\n"
 "(unan eus %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "« %s »"
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "o bevaat ar media %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr ""
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "o bevaat ar media %s"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1635,148 +1791,213 @@ msgstr ""
 "arveriadur :\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr ""
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr ""
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - diskouez an diverrañ.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "o tremen e-biou ar vedia %s : n'eus ket hdlist ebet"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Filelist kavet ebet\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Changelog kavet ebet\n"
 
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "O skignañ ar restroù d'ar skoulmoù ..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Sac'het eo an staliadur war ar skoulm %s"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "O staliañ ar pakadoù war ar skoulmoù..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "sac'het eo scp war an ostiz %s (%d)"
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "o lenn ar restr synthesis [%s]"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "O skignañ ar restroù ad %s ..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "O staliañ war %s ..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "O staliañ %s war %s ..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "O prientiñ da staliañ war %s ..."
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet"
+
 #~ msgid "unable to find hdlist file for \"%s\", medium ignored"
 #~ msgstr "n'hellan ket kavout ar restr hdlist evit « %s », medium dibvrud"
 
diff --git a/po/bs.po b/po/bs.po
index 9b1c3c20..d4f236e4 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-09-13 21:02+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -20,7 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "RPM instalacija"
 
@@ -29,7 +30,8 @@ msgstr "RPM instalacija"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Greška: ne mogu naći datoteku %s, prekidam operaciju"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_U redu"
 
@@ -84,20 +86,23 @@ msgstr ""
 "\n"
 "Možda želite da ih samo snimite. Šta je vaš izbor?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Instaliraj"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Snimi"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Odustani"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Izaberi lokaciju za snimanje"
 
@@ -107,18 +112,21 @@ msgid "Unknown option %s"
 msgstr "Nepoznata opcija '%s'"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Nije naveden paket"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Molim sačekajte..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Morate biti root"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -129,35 +137,42 @@ msgstr ""
 "%s\n"
 "Da nastavim?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "U redu"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "U redu"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (za ažuriranje)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (za instalaciju)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Izbor paketa"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jedan od sljedećih paketa je potreban:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Prekini"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -168,7 +183,7 @@ msgstr ""
 "%s\n"
 "Da nastavim?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -178,25 +193,27 @@ msgstr ""
 "Da bih zadovoljio ovisnosti, instaliraću sljedećih %d paketa:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Instalacija paketa..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ne mogu dobiti izvorne pakete, prekidam"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Downloadujem paket `%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -209,8 +226,7 @@ msgstr ""
 "\n"
 "Želite li nastaviti instalaciju?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -221,35 +237,38 @@ msgstr ""
 "%s\n"
 "Možda ćete trebati osvježiti vašu urpmi bazu podataka"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "uklanjam %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Gotovo"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "sve je već instalirano"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Instalacija završena"
 
@@ -263,19 +282,22 @@ msgstr ""
 "gdje su [opcije] nešto od\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - ispiši ovu poruku.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "  --root <path>  - koristi zadani korijenski direktorij umjesto /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [grupa]     - ograniči rezultate na datu grupu.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - ispiši grupe sa imenom.\n"
 
@@ -284,210 +306,127 @@ msgstr "  -g             - ispiši grupe sa imenom.\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    podrazumijeva se %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Samo administrator (root) može instalirati pakete"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Pokrećem urpmi u ograničenom režimu..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "ne mogu otvoriti rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "neispravno ime rpm datoteke [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "dobavljam rpm datoteku [%s] ..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...download završen"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...dobavljanje nije uspjelo: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ne mogu obraditi spec datoteku %s [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "ne mogu registrovati rpm datoteku"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Nekompatibilna arhitektura za paket [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "greška pri registrovanju lokalnih paketa"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Ova operacija je zabranjena dok ste u ograničenom režimu"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "pogrešna deklaracija proxy-ja na komandnoj liniji\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
-#, fuzzy
+#: ../urpm/args.pm:133
+#, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Direktorij okruženja %s ne postoji"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Morate biti root kako biste koristili --use-distrib"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, c-format
+msgid "Can't use %s with %s"
+msgstr ""
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "Previše argumenata\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "Nn"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "DdYy"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Žalim, pogrešan izbor, probajte kasnije\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "mput nije uspio, možda je čvor nedostupan"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "čvor %s ima staru verziju urpme, molim ažurirajte"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "rshp nije uspio, možda je čvor nedostupan"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "na čvoru %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Propagiram synthesis na čvorove..."
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "Razrješujem ovisnosti na čvorovima..."
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Distribuiram datoteke na čvorove..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Provjeravam da li je moguće instalirati na čvorove..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "Instalacija nije uspjela na čvoru %s"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Instalacija nije moguća"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Instaliram pakete na čvorove..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "scp nije uspio na računaru %s (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "Propagiram synthesis na %s..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "Razrješujem ovisnosti na %s..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "računar %s nema ispravnu verziju urpmi (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "Distribuiram datoteke na %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "Provjeravam da li je moguće instalirati na %s..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "Izvršavam instalaciju na %s..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "Instaliram %s na %s..."
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "Pripremam instalaciju na %s..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -504,43 +443,58 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - ispiši ovu poruku.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - automatski izaberi pakete u izborima.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - provjeri da li se uklanjanje može ispravno izvršiti.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - prisili pozivanje čak i ako neki paketi ne postoje.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - distribuirani urpmi preko mašina sa aliasom.\n"
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Prepakuj datoteke prije brisanja\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - koristi drugi korijen za uklanjanje RPM-a.\n"
 
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - koristi drugi dir. za rpm instalaciju.\n"
+
+#: ../urpme:52
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - ne izvršavaj skripte u paketu.\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
@@ -548,76 +502,79 @@ msgstr ""
 "  --use-distrib  - podesi urpme u letu iz distrib stabla, korisno za\n"
 "                   chroot de-instalacije uz korištenje --root opcije.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - pokušaj naći i koristiti synthesis datoteku.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - pokušaj pronaći i koristiti hdlist datoteku.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - rječiti mod.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - rječiti mod.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - izaberi sve pakete koji odgovaraju izrazu.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Samo administrator (superkorisnik) može uklanjati pakete"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "nepoznat paket"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "nepoznati paket"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "nepoznat paket"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sljedeći paketi sadrže %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "uklanjanje paketa %s će pokvariti vaš sistem"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Nema ništa za uklanjanje"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Provjeravam uklanjanje sljedećih paketa"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (d/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "Da uklonim %d paketa?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (d/N) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Uklanjanje nije uspjelo"
 
@@ -638,209 +595,256 @@ msgstr ""
 "upotreba: urpmf [opcije] izraz\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - ispisuje broj verzije ovog alata.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - koristi navedenu okolinu (tipično izvještaj o bugu).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - ne koristi navedene medije, razdvojene zarezom.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 "  --literal, -l  - bez prepoznavanja uzorka, koristi argument kao doslovan "
 "tekst.\n"
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - koristi samo navedene medije, razdvojene zarezom.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - sortiraj medije prema podstringovima razdvojenim "
 "zarezom.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - koristi zadani synthesis umjesto urpmi baze.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - ne ispisuj identične linije.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - koristi samo medije za unaprjeđenje.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - rječiti mod.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - ne razlikuj velika i mala slova u uzorcima.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - razlikuj velika i mala slova u uzorcima.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - promjena razdjelnika polja (standardno je ':').\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "Izrazi za uzorke:\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - svaki tekst se tretira kao regexp, osim ako se koristi -"
 "I.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - uključi perl kod direktno kao perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binarni I operator.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binarni OR operator.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unarno NE.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - lijeva i desna zagrada.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "Spisak tagova:\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - određuje format izlaza nalik na printf\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   primjer: '%%ime:%%datoteke'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arhitektura\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - računar na kojem je kompajliran\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - vrijeme kompajliranja\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - konfiguracione datoteke\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - tagovi za konflikte\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - opis paketa\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distribucija\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - epoha\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - ime datoteke paketa\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - lista datoteka u paketu\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grupa\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - ime paketa\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - autor paketa\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - tag 'pruža'\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - tag 'zahtijeva'\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - veličina nakon instalacije\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - naziv izvornog rpm-a\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - sažetak.\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - izdavač\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - medij na kojem je paket pronađen\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - štampa verziju, izdanje i arhitekturu sa imenom.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Neispravan format: možete koristiti samo jedan viševrijednosni tag"
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "koristim navedenu okolinu na %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -848,11 +852,12 @@ msgstr ""
 "Napomena: pošto nijedan od pretraženih medija ne koristi hdliste, urpmf nije "
 "mogao vratiti rezultate\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Možda želite koristiti --name da biste tražili imena paketa.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -868,12 +873,14 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --searchmedia  - koristi samo navedene medije za pretragu paketa.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
@@ -881,13 +888,31 @@ msgstr ""
 "  --auto         - ne-interaktivni režim, koristi ponuđene odgovore na sva "
 "pitanja.\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - automatski izaberi pakete za unaprijeđenje sistema.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatski izaberi pakete za unaprijeđenje sistema.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - isključi provjeru MD5SUM datoteke.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - prinudi update gpg ključa.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -895,11 +920,13 @@ msgstr ""
 "  --no-uninstall - nikad ne pitaj za deinstalaciju paketa, prekini "
 "instalaciju.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - nemoj instalirati pakete (samo ih preuzmi)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -907,7 +934,7 @@ msgstr ""
 "  --keep         - čuvaj postojeće pakete ako je moguće, odbaci tražene\n"
 "                   pakete koji vode uklanjanju.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -918,32 +945,38 @@ msgstr ""
 "                   paketi biti instalirani ili unaprijeđeni,\n"
 "                   podrazumijeva se %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - mala dužina transakcije, podrazumijeva se %d.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - nametni fuzzy pretragu.\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s      - sljedeći paket je source paket.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - instaliraj samo izvorne pakete (bez binarnih).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - ukloni rpm iz spremnika prije svega ostalog.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - čuvaj neiskorištene rpm-ove u spremniku.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -951,7 +984,8 @@ msgstr ""
 "  --allow-nodeps - dozvoli pitanje korisniku da instalira pakete\n"
 "                   bez provjere ovisnosti.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -959,11 +993,13 @@ msgstr ""
 "  --allow-force  - dozvoli pitanje korisniku da instalira pakete bez\n"
 "                   provjere ovisnosti i integriteta.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - koristi drugi dir. za rpm instalaciju.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -971,41 +1007,48 @@ msgstr ""
 "  --use-distrib  - podesi urpmi u letu iz distrib stabla, korisno za\n"
 "                   chroot instalacije uz korištenje --root opcije.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - koristi wget za download datoteka.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - koristi curl za download datoteka.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - koristi curl za download datoteka.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - dodatne opcije za curl\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- dodatne opcije za rsync\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - dodatne opcije za wget\n"
 
 #: ../urpmi:127
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --curl-options - dodatne opcije za curl\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - ograniči brzinu downloada.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1013,7 +1056,8 @@ msgstr ""
 "  --resume       - nastavi prijenos djelomično prenesenih datoteka\n"
 "                   (--no-resume isključuje, što je i podrazumijevano).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1021,7 +1065,8 @@ msgstr ""
 "  --proxy        - koristi navedeni HTTP proxy, broj porta se pretpostavlja\n"
 "                   da je 1080 (format je <proxyhost[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1030,6 +1075,7 @@ msgstr ""
 "                   autentifikaciju (format je <user:password>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1038,6 +1084,7 @@ msgstr ""
 "                   idućem argumentu.\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1046,6 +1093,7 @@ msgstr ""
 "                   (--no-verify-rpm isključuje, normalno je uključeno).\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1053,38 +1101,37 @@ msgstr ""
 "  --test         - provjeri da li se instalacija može ispravno izvršiti.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - isključi puteve razdvojene zarezom.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - isključi docs datoteke.\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   -  ne provjeravaj slobodan prostor na disku.\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - dozvoli instalaciju RPMova za druge arhitekture.\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - ne izvršavaj skripte u paketu\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - isključi provjeru MD5SUM datoteke.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - prinudi update gpg ključa.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - paketi čija instalacija treba biti preskočena\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1092,42 +1139,50 @@ msgstr ""
 "  --more-choices - ako je pronađeno više paketa, ponudi više izbora\n"
 "                   nego što je uobičajeno.\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - ne zaključavaj RPM bazu.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - ažuriraj samo pakete sa istom arhitekturom.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - izaberi sve pogotke na komandnoj liniji.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - uključi pretragu 'provides' taga radi nalaženja paketa.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - ne pretražuj 'provides' pri traženju paketa.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - tihi mod.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  imena ili rpm datoteke dati na komandnoj liniji će biti instalirani.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
@@ -1135,11 +1190,12 @@ msgstr ""
 "Greška: Da biste generisali prijavu buga, navedite uobičajene argumente i\n"
 "dodajte --bug.\n"
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Ne možete instalirati binarne RPM datoteke koristeći --install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1148,21 +1204,22 @@ msgstr ""
 "Direktorij [%s] već postoji, molim koristite neki drugi direktorij za "
 "prijavu buga ili ga obrišite"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Ne mogu napraviti direktorij [%s] za prijavu buga"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Kopiranje nije uspjelo"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "Direktorij okruženja %s ne postoji"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1171,52 +1228,59 @@ msgstr ""
 "Greška: izgleda da je %s montiran samo za čitanje.\n"
 "Koristite opciju --allow-force za prinudnu operaciju."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "Ažuriram medije...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (za ažuriranje)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (za ažuriranje)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (za instalaciju)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (za instalaciju)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Vaš izbor je? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Sljedeći paketi se ne mogu instalirati pošto zavise od sljedećih paketa\n"
+"koji su stariji od instaliranih:\n"
+"%s"
+msgstr[1] ""
 "Sljedeći paketi se ne mogu instalirati pošto zavise od sljedećih paketa\n"
 "koji su stariji od instaliranih:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1224,58 +1288,80 @@ msgstr ""
 "\n"
 "Svejedno nastavljate instalaciju?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Neki od traženih paketa se ne mogu instalirati:\n"
+"%s"
+msgstr[1] ""
 "Neki od traženih paketa se ne mogu instalirati:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Instalacija se ne može nastaviti zato što sljedeći paketi trebaju biti\n"
+"uklonjeni da bi drugi mogli biti nadograđeni:\n"
+"%s\n"
+msgstr[1] ""
 "Instalacija se ne može nastaviti zato što sljedeći paketi trebaju biti\n"
 "uklonjeni da bi drugi mogli biti nadograđeni:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
+"%s"
+msgstr[1] ""
 "Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(samo testiraj, uklanjanje neće biti izvršeno)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeće pakete"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] "Da bih zadovoljio ovisnosti, instaliraću sljedeće pakete"
+msgstr[1] "Da bih zadovoljio ovisnosti, instaliraću sljedeće pakete"
 
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeći paket"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d paketa, %d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1284,89 +1370,106 @@ msgstr ""
 "Morate biti root da biste instalirali sljedeće ovisnosti:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(samo testiraj, instalacija neće biti izvršena)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "Da nastavim sa instalacijom %d paketa? (%d MB)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "Da nastavim sa instalacijom %d paketa? (%d MB)"
+msgstr[1] "Da nastavim sa instalacijom %d paketa? (%d MB)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Pritisnite Enter kada budete spremni..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Sljedeći paketi imaju neispravne potpise"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Sljedeći paketi imaju neispravne potpise"
+msgstr[1] "Sljedeći paketi imaju neispravne potpise"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Želite li nastaviti instalaciju ?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "distribuiram %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "instaliram %s iz %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "instaliram %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "Instalacija nije uspjela:"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Da pokušam instalaciju bez provjere ovisnosti? (d/N) "
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Pokušaj instalaciju još jače (--force opcija)? (d/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d instalacionih transakcija nije uspjelo"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalacija nije moguća"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "sve je već instalirano"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "sve je već instalirano"
+msgstr[1] "sve je već instalirano"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "sve je već instalirano"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "sve je već instalirano"
+msgstr[1] "sve je već instalirano"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "restartujem urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1390,26 +1493,34 @@ msgstr ""
 "a [opcije] su\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - napravi medij za unaprjeđenje.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - pokušaj naći i koristiti synthesis datoteku.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - pokušaj pronaći i koristiti hdlist datoteku.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - ne pokušavaj pronaći synthesis ili\n"
 "                   hdlist datoteku.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1417,15 +1528,17 @@ msgstr ""
 "  --distrib      - automatski napravi sve medije iz instalacionog\n"
 "                   medija.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - sa --distrib, pitaj prije svakog medija\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - sa --distrib, dodaj sve navedene medije\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1434,7 +1547,8 @@ msgstr ""
 "  --from         - koristi navedeni url za listu mirrora, podrazumijeva se\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1442,46 +1556,67 @@ msgstr ""
 "  --virtual      - napravi virtuelne medije koji su uvijek osvježeni,\n"
 "                   dozvoljen je samo protokol file:// .\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - isključi provjeru MD5SUM datoteke.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - nemoj uvoziti pubkey dodanog medija\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - dodaj medij u konfiguraciju, ali bez ažuriranja.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - očisti direktorij sa spremnikom zaglavlja.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tihi mod.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - rječiti mod.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Samo administrator (superkorisnik) može dodavati medije"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Napraviću konf. datoteku [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Ne mogu napraviti konf. datoteku [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "nema potrebe da navodite <relativnu putanju do hdlist> sa --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1490,16 +1625,17 @@ msgstr ""
 "\n"
 "Želite li dodati medij '%s'"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<relativni put do datoteke hdlist> nedostaje\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "`with' nedostaje za mrežni medij\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "ne mogu napraviti medij \"%s\"\n"
@@ -1521,29 +1657,35 @@ msgstr ""
 "upotreba:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - podesi početak prepakiranja na trenutno vrijeme\n"
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 "  --noclean      - nemoj prazniti repackage direktorij na kontrolnoj tački\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - spisak transakcija nakon navedenog datuma/trajanja\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-all     - spisak svih transakcija u rpmdb (dugačko)\n"
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-safe    - spisak transakcija nakon kontrolne tačke\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
@@ -1551,118 +1693,121 @@ msgstr ""
 "  --rollback     - vrati na zadani datum,\n"
 "                   ili vrati zadani broj transakcija\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - isključi prepakiranje\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "Neispravan datum ili trajanje [%s]\n"
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr "Direktorij za prepakiranje nije definisan\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "Ne mogu pisati u direktorij za prepakiranje [%s]\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "Čistim direktorij za prepakiranje [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "Uklonjeno %d datoteka\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "Neispravni argumenti na komandnoj liniji [%s]\n"
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr "Ne možete istovremeno navesti --checkpoint i --rollback\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr "Ne možete istovremeno navesti --checkpoint i --list\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "Ne možete istovremeno navesti --rollback i --list\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "Ne možete istovremeno navesti --disable i neku drugu opciju"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "Nema transakcija nakon %s\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "Morate biti root korisnik za ovo"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Zapisujem rpm macros datoteku [%s]...\n"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr "Nije pronađen rollback datum\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "Vraćam se na datum %s...\n"
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr "Isključujem prepakiranje\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "upotreba: urpmi.removemedia [-a] <ime> ...\n"
 "gdje je <ime> naziv medija za uklanjanje.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - izaberi sve medije.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - fuzzy izbor imena medija.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nepoznate opcije '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Samo administrator (superkorisnik) može uklanjati medije"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "ništa za uklanjanje (koristite urpmi.addmedia da dodate medij)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1672,6 +1817,7 @@ msgstr ""
 "(jedan od %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1680,30 +1826,46 @@ msgstr ""
 "gdje je <ime> naziv medija za unaprjeđenje.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - osvježi samo medije za update.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - prinudi update gpg ključa.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - ne ažuriraj, označi medij kao ignorisan.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - ne ažuriraj, označi medij kao uključen.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - izaberi ne-izmjenjive medije.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Samo administrator (superkorisnik) može ažurirati medije"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ništa za update (koristite urpmi.addmedia da dodate medij)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1712,21 +1874,21 @@ msgstr ""
 "stavka za update nedostaje\n"
 "(jedan od %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "uključujem medij %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorišem medij %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "uključujem medij %s"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1744,6 +1906,7 @@ msgstr ""
 "upotreba:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1752,31 +1915,38 @@ msgstr ""
 "paketa.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - nametni fuzzy pretragu (isto što i -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - lista dostupnih paketa.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - izlistaj dostupne medije.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - izlistaj dostupne medije i njihove URLove.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - izlistaj dostupne nodove kod korištenja --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - izlistaj dostupne paralelne aliase.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
@@ -1784,20 +1954,24 @@ msgstr ""
 "addmedia.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - sljedeći paket je source paket (isto što i -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - daj sve source pakete prije downloada (samo root).\n"
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - dozvoli upite na RPMove za druge arhitekture.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1805,100 +1979,198 @@ msgstr ""
 "  --use-distrib  - podesi urpmi u letu iz distrib stabla.\n"
 "                   Ovo omogućuje ispitivanje distribucije.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - ispiši dnevnik izmjena.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - ispiši sažetak.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - kompletan izlaz sa paketom za uklanjanje.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - proširi upit na ovisnosti paketa.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - ispiši grupe sa imenom.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - ispiši korisne informacije u čitljivom obliku.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - lista datoteka u paketu.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - ne pretražuj 'provides' pri traženju paketa (default).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - uključi pretragu 'provides' taga radi nalaženja.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - ispiši verziju i izdanje sa imenom.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - obrnuta pretraga za ono što zahtijeva paket.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR            - proširena obrnuta pretraga (uključuje virtuelne pakete).\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - sljedeći paket je source paket (isto što i --src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "  -u             - ukloni paket ako je već instalirana novija verzija.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - nametni fuzzy pretragu (isto što i --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - kao -y, ali pretraga ne razlikuje mala i velika slova.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  imena ili rpm datoteke dati na komandnoj liniji će biti ispitani.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes se može koristiti samo sa --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "preskačem medij %s: nema hdliste"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Nije nađena lista datoteka\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Nije pronađen changelog\n"
 
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "mput nije uspio, možda je čvor nedostupan"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr "čvor %s ima staru verziju urpme, molim ažurirajte"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "rshp nije uspio, možda je čvor nedostupan"
+
+#~ msgid "on node %s"
+#~ msgstr "na čvoru %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Propagiram synthesis na čvorove..."
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "Razrješujem ovisnosti na čvorovima..."
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Distribuiram datoteke na čvorove..."
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Provjeravam da li je moguće instalirati na čvorove..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Instalacija nije uspjela na čvoru %s"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Instaliram pakete na čvorove..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "scp nije uspio na računaru %s (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "Propagiram synthesis na %s..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "Razrješujem ovisnosti na %s..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "računar %s nema ispravnu verziju urpmi (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Distribuiram datoteke na %s..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "Provjeravam da li je moguće instalirati na %s..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Izvršavam instalaciju na %s..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "Instaliram %s na %s..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Pripremam instalaciju na %s..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeći paket"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr ""
+#~ "  --probe-synthesis - pokušaj naći i koristiti synthesis datoteku.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - pokušaj pronaći i koristiti hdlist datoteku.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "`with' nedostaje za mrežni medij\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "nepoznate opcije '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "nepoznat protokol je definisan za %s"
 
diff --git a/po/ca.po b/po/ca.po
index ff7dbd53..76aa420a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2005-09-19 23:29+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -19,7 +19,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "Instal·lació de RPM"
 
@@ -28,7 +29,8 @@ msgstr "Instal·lació de RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_D'acord"
 
@@ -85,20 +87,23 @@ msgstr ""
 "\n"
 "Potser preferiu només desar-lo. Que voleu fer?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Instal·lació"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Desa"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Escolliu la ubicació un desar el fitxer"
 
@@ -108,18 +113,21 @@ msgid "Unknown option %s"
 msgstr "Opcions desconegudes %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "No s'ha especificat cap paquet"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Si us plau, espereu..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "S'ha de ser root"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -130,35 +138,42 @@ msgstr ""
 "%s\n"
 "Voleu continuar?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "D'acord"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Advertència"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "D'acord"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (a actualitzar)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (a instal·lar)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Cal un dels paquets següents:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Avorta"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -169,7 +184,7 @@ msgstr ""
 "%s\n"
 "Voleu continuar?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -179,25 +194,27 @@ msgstr ""
 "Per complir les dependències, s'instal·laran els %d paquets següents:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Instal·lació de paquets..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "no es poden recuperar els paquets font. S'està interrompent"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Si us plau, inseriu la font anomenada \"%s\" al dispositiu [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "S'està descarregant el paquet `%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -210,8 +227,7 @@ msgstr ""
 "\n"
 "Voleu continuar amb la instal·lació?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -223,35 +239,38 @@ msgstr ""
 "%s\n"
 "Potser voleu actualitzar la base de dades urpmi"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "s'està eliminant %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "S'està preparant..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "S'està instal·lant el paquet `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "La instal·lació ha fallat"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Fet"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Ja està tot instal·lat"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Instal·lació finalitzada"
 
@@ -265,19 +284,22 @@ msgstr ""
 "on [opcions] pot ser\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - mostra aquest missatge d'ajuda.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "  --root <ruta>  - utilitza la ruta donada en comptes de /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [group]     - restringeix els resultats al grup donat.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - imprimeix grups amb el nom.\n"
 
@@ -286,210 +308,126 @@ msgstr "  -g             - imprimeix grups amb el nom.\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    el valor per defecte és %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "El superusuari és l'únic autoritzat per a instal·lar paquets"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "no s'ha pogut obrir rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "el nom del fitxer rpm és incorrecte [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "s'està recuperant els fitxer rpm [%s] ..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...recuperació feta"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...ha fallat la recuperació: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "no es pot analitzar \"%s\" en el fitxer [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "no s'ha pogut registrar el fitxer rpm"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "error registrant els paquets locals"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "declaració errònia del proxy a la línia de comandes\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Necessiteu ser el superusuari per usar aquesta ordre! \n"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: no s'ha pogut llegir el fitxer rpm \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "Nn"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "SsYy"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "Elecció incorrecta, torneu-ho a provar\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
+#: ../urpm/args.pm:426
 #, c-format
-msgid "node %s has an old version of urpme, please upgrade"
+msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr ""
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "La instal·lació ha fallat"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "La instal·lació és possible"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "S'està instal·lant el paquet `%s' (%s/%s)..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
+#: ../urpm/args.pm:440
 #, c-format
-msgid "scp failed on host %s (%d)"
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "s'està examinant el fitxer de síntesi [%s]"
-
-#: ../urpm/parallel_ssh.pm:183
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "Nn"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "s'està distribuint %s"
+msgid "Yy"
+msgstr "SsYy"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "Instal·lació de paquets..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "s'està instal·lant %s des de %s"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "Instal·lació de paquets..."
+msgid "Sorry, bad choice, try again\n"
+msgstr "Elecció incorrecta, torneu-ho a provar\n"
 
 #: ../urpme:39
 #, fuzzy, c-format
@@ -508,124 +446,140 @@ msgstr ""
 "\n"
 "sintaxi:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - mostra aquest missatge d'ajuda.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - en escollir, selecciona un paquets automàticament.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - verifica si l'eliminació pot ser duta a terme.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - força l'execució tot i que hi hagi paquets que no "
 "existeixen.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi distribuït pels ordinadors de l'àlias.\n"
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --packager     - mostra l'etiqueta packager: empaquetador.\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - usa una altre arrel per l'eliminació de rpm.\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - usa una altre arrel per la instal·lació de rpm.\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description   - mostra l'etiqueta description: descripció.\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
 msgstr ""
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - intenta trobar un fitxer de síntesi.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - intenta trobar un fitxer hdlist.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - mode detallat.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  -verbose             - mode detallat.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - selecciona tots els paquets que coincideixen amb "
 "l'expressió.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "El superusuari és l'únic autoritzat per a eliminar paquets"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "paquet desconegut"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "paquets desconeguts"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "paquet desconegut"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Els paquets següents contenen %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "eliminar el paquet %s trencarà el vostre sistema"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Res a eliminar"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr ""
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "Per a complir les dependències, s'eliminaran els següents %d paquets (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "s'està eliminant el paquet %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "L'eliminació ha fallat"
 
@@ -647,255 +601,278 @@ msgstr ""
 "sintaxi:\n"
 
 #: ../urpmf:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - mostra aquest missatge d'ajuda.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - utilitza un entorn concret (normalment un\n"
 "                   informe d'errors).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - no usis les fonts donades, separades per comes.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - utilitza només les fonts donades, s'han de separar amb "
 "comes.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia        - ordena les fonts segons les cadenes donades, s'han de "
 "separar amb comes.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - utilitza la síntesi donada en comptes de la bd de urpmi.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - no imprimeix línies idèntiques.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - utilitza només les fonts d'actualització.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -verbose             - mode detallat.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - ignora les distincions de majúscules en els patrons.\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - ignora les distincions de majúscules en els patrons.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operador binari AND.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operador binari OR.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - NOT unari.\n"
 
-#: ../urpmf:55
-#, fuzzy
+#: ../urpmf:56
+#, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - parentesi dret per tancar expressions de grup.\n"
 
-#: ../urpmf:56
-#, fuzzy
+#: ../urpmf:57
+#, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Llista de dades per restaurar:\n"
 "\n"
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - utilitza l'interfície X.\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    el valor per defecte és %s.\n"
 
-#: ../urpmf:59
-#, fuzzy
+#: ../urpmf:60
+#, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - mostra l'etiqueta url: url.\n"
 
-#: ../urpmf:60
-#, fuzzy
+#: ../urpmf:61
+#, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr ""
 "  --buildhost    - mostra l'etiqueta buildhost: màquina de construcció.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Mòdul de configuració de la consola"
 
-#: ../urpmf:63
-#, fuzzy
+#: ../urpmf:64
+#, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 "  --conflicts     - mostra l'etiqueta conflicts: tots els conflictes.\n"
 
-#: ../urpmf:64
-#, fuzzy
+#: ../urpmf:65
+#, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - mostra l'etiqueta description: descripció.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - mostra l'etiqueta epoch: època.\n"
 
-#: ../urpmf:67
-#, fuzzy
+#: ../urpmf:68
+#, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name           - imprimeix només els noms dels paquets.\n"
 
-#: ../urpmf:68
-#, fuzzy
+#: ../urpmf:69
+#, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - llista els fitxers del paquet.\n"
 
-#: ../urpmf:69
-#, fuzzy
+#: ../urpmf:70
+#, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - mostra l'etiqueta group: grup.\n"
 
-#: ../urpmf:70
-#, fuzzy
+#: ../urpmf:71
+#, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name           - imprimeix només els noms dels paquets.\n"
 
-#: ../urpmf:71
-#, fuzzy
+#: ../urpmf:72
+#, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 "  --obsoletes     - mostra l'etiqueta obsoletes: tots els paquets que deixa "
 "obsolets.\n"
 
-#: ../urpmf:72
-#, fuzzy
+#: ../urpmf:73
+#, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - mostra l'etiqueta packager: empaquetador.\n"
 
-#: ../urpmf:73
-#, fuzzy
+#: ../urpmf:74
+#, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 "  --provides      - mostra l'etiqueta provides: tots allò que proporciona.\n"
 
-#: ../urpmf:74
-#, fuzzy
+#: ../urpmf:75
+#, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 "  --requires      - mostra l'etiqueta requires: tots allò que necessita.\n"
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - mostra l'etiqueta size: mida.\n"
 
-#: ../urpmf:76
-#, fuzzy
+#: ../urpmf:77
+#, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - mostra l'etiqueta sourcerpm: rpm de codi font.\n"
 
-#: ../urpmf:77
-#, fuzzy
+#: ../urpmf:78
+#, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary, -S  - imprimeix el resum.\n"
 
-#: ../urpmf:78
-#, fuzzy
+#: ../urpmf:79
+#, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - mostra l'etiqueta url: url.\n"
 
-#: ../urpmf:79
-#, fuzzy
+#: ../urpmf:80
+#, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  -verbose             - mode detallat.\n"
 
-#: ../urpmf:80
-#, fuzzy
+#: ../urpmf:81
+#, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - llista els fitxers del paquet.\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - mostra la versió, llançament i arquitectura amb el nom.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr ""
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -912,28 +889,48 @@ msgstr ""
 "\n"
 "sintaxi:\n"
 
-#: ../urpmi:92
-#, fuzzy
+#: ../urpmi:88
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia        - utilitza només les fonts donades per cercar (o "
 "actualitzar) paquets.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - selecciona automàticament els paquets per actualitzar el "
 "sistema.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - selecciona automàticament els paquets per actualitzar el "
+"sistema.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deshabilita la comprovació MD5SUM.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - força l'actualització de la clau gpg.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -941,13 +938,14 @@ msgstr ""
 "  --no-uninstall - mai demana desinstal·lar un paquet, avorta la "
 "instal·lació.\n"
 
-#: ../urpmi:98
-#, fuzzy
+#: ../urpmi:97
+#, fuzzy, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 "  --install-src  - instal·la només paquets de codi font (cap binari).\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -956,7 +954,7 @@ msgstr ""
 "paquets demanats\n"
 "                   que porten a la eliminació d'altres paquets.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -964,39 +962,42 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:105
-#, fuzzy
+#: ../urpmi:104
+#, fuzzy, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - utilitza cerca difusa (igual que -y).\n"
 
-#: ../urpmi:106
-#, fuzzy
+#: ../urpmi:105
+#, fuzzy, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr ""
 "  --src          - el paquet següent és un paquet font (igual que -s).\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - instal·la només paquets de codi font (cap binari).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - esborra els rpm de la memòria cau abans de res més.\n"
 
-#: ../urpmi:109
-#, fuzzy
+#: ../urpmi:108
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 "  --noclean      - conserva els rpm que no s'utilitzen a la memòria cau.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -1005,7 +1006,8 @@ msgstr ""
 "sense\n"
 "                   comprovar les dependències.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -1014,56 +1016,67 @@ msgstr ""
 "sense\n"
 "                   comprovar les dependències i la integritat.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - usa una altre arrel per la instal·lació de rpm.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - usa wget per a recuperar fitxers llunyans.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - use curl per a recuperar fitxers llunyans.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - use curl per a recuperar fitxers llunyans.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limita la velocitat de descàrrega.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1073,7 +1086,8 @@ msgstr ""
 "                   que és el 1080 per defecte (el format és "
 "<ordinadorcentralproxy[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1083,6 +1097,7 @@ msgstr ""
 "                   del proxy (el format és <usuari:contrasenya>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1091,7 +1106,7 @@ msgstr ""
 "                   que s'indica en l'argument següent.\n"
 
 #: ../urpmi:138
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1101,106 +1116,110 @@ msgstr ""
 "habilitat).\n"
 
 #: ../urpmi:140
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - verifica si la instal·lació pot ser duta a terme.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - exclou els fitxers de documentació.\n"
 
 #: ../urpmi:143
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --no-uninstall - mai demana desinstal·lar un paquet, avorta la "
 "instal·lació.\n"
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --url          - mostra l'etiqueta url: url.\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --description   - mostra l'etiqueta description: descripció.\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - deshabilita la comprovació MD5SUM.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - força l'actualització de la clau gpg.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - paquets que han de saltase en la instal·lació\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
 
-#: ../urpmi:152
-#, fuzzy
+#: ../urpmi:150
+#, fuzzy, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr ""
 "  --noclean      - conserva els rpm que no s'utilitzen a la memòria cau.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - selecciona totes les coincidències en la línia d'ordres.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - permet la cerca en allò que proporcionen els paquets per "
 "a trobar-los.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - no busquis en 'provides' per a trobar paquets.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - mode silenciós.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  els noms o fitxers rpm subministrats en la línia d'ordres seran "
 "instal·lats.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1209,132 +1228,158 @@ msgstr ""
 "El directori [%s] ja existeix, si us plau usa un altre directori per "
 "l'informe d'error o esborra'l"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "No s'ha pogut crear el directori [%s] per a l'informe d'errors"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "La còpia ha fallat"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
 "Use --allow-force to force operation."
 msgstr ""
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (a actualitzar)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (a actualitzar)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (a instal·lar)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (a instal·lar)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Quina és la vostra elecció? (1-%d) "
 
-#: ../urpmi:481
+#: ../urpmi:482
 #, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Voleu continuar igualment?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Alguns dels paquets demanats no es poden instal·lar:\n"
+"%s"
+msgstr[1] ""
 "Alguns dels paquets demanats no es poden instal·lar:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"La instal·lació no pot continuar ja que els següents paquets\n"
+"s'han d'eliminar per poder actualitzar uns altres:\n"
+"%s\n"
+msgstr[1] ""
 "La instal·lació no pot continuar ja que els següents paquets\n"
 "s'han d'eliminar per poder actualitzar uns altres:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Els paquets següents s'han d'eliminar per poder actualitzar uns altres:\n"
+"%s"
+msgstr[1] ""
 "Els paquets següents s'han d'eliminar per poder actualitzar uns altres:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"Per complir les dependències, s'instal·laran els %d paquets següents:\n"
+"%s\n"
+msgstr[1] ""
 "Per complir les dependències, s'instal·laran els %d paquets següents:\n"
 "%s\n"
 
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Per complir les dependències, s'instal·laran el següent paquet (%d MB)"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1343,92 +1388,107 @@ msgstr ""
 "Es necessita ser 'root' per a instal·lar les següents dependències:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Premeu Intro quan estigui fet..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Els paquets següents tenen signatures incorrectes"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Els paquets següents tenen signatures incorrectes"
+msgstr[1] "Els paquets següents tenen signatures incorrectes"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Voleu continuar la instal·lació ?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "s'està distribuint %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "s'està instal·lant %s des de %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "s'està instal·lant %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "La instal·lació ha fallat"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 "Voleu intentar la instal·lació sense comprovar les dependències? (s/N) "
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Voleu intentar la insta·lació encara amb més força (--force)? (s/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "han fallat %d transaccions d'instal·lació"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "La instal·lació és possible"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Ja està tot instal·lat"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Ja està tot instal·lat"
+msgstr[1] "Ja està tot instal·lat"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Ja està tot instal·lat"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Ja està tot instal·lat"
+msgstr[1] "Ja està tot instal·lat"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "s'esta reiniciant urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1452,26 +1512,34 @@ msgstr ""
 "i [opcions] són\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - crea una font d'actualització.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - intenta trobar un fitxer de síntesi.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - intenta trobar un fitxer hdlist.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - no intenta buscar cap síntesi o\n"
 "                   fitxer hdlist.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1479,16 +1547,17 @@ msgstr ""
 "  --distrib      - automàticament crea tots les fonts des d'una font\n"
 "                   d'instal·lació.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - llista les fonts disponibles.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1497,68 +1566,91 @@ msgstr ""
 "  --from         - usa la url especificada per a la llista de rèpliques, \n"
 "                   la url per defecte és %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deshabilita la comprovació MD5SUM.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - buida el directori de memòria cau de capçaleres.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - imposa la generació de fitxers hdlist.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mode silenciós.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - mode detallat.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "no es pot actualitzar la font \"%s\"\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "El superusuari és l'únic autoritzat per a afegir fonts"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Crearà el fitxer de configuració [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "No s'ha pogut crear el fitxer de configuració [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "no fa falta proporcionar el <camí relatiu de l'hdlist> amb --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "falta el <camí relatiu de l'hdlist>\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "falta el `with' per a les fonts de xarxa\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "no es pot crear la font \"%s\"\n"
@@ -1581,152 +1673,155 @@ msgstr ""
 "sintaxi:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 "  --noclean      - conserva els rpm que no s'utilitzen a la memòria cau.\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-url     - llista les fonts disponibles i la seva url.\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-url     - llista les fonts disponibles i la seva url.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --name           - imprimeix només els noms dels paquets.\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "no s'ha trobat el paquet %s."
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "s'està recuperant els fitxer rpm [%s] ..."
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "No s'ha trobat la llista de fitxers\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\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 de la font a eliminar.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - selecciona totes les fonts.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opcions desconegudes '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "El superusuari és l'únic autoritzat per a eliminar fonts"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "no hi ha res per eliminar (utilitzeu urpmi.addmedia per afegir una font)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1736,6 +1831,7 @@ msgstr ""
 "(una de %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1744,31 +1840,47 @@ msgstr ""
 "on <nom> és el nom de la font a actualitzar.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - utilitza només les fonts d'actualització.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - força l'actualització de la clau gpg.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr ""
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selecciona tots les fonts no extraïbles.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - imposa la generació de fitxers hdlist.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "El superusuari és l'únic autoritzat per a actualitzar fonts"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "no hi ha res per actualitzar (utilitzeu urpmi.addmedia per afegir una font)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1777,21 +1889,21 @@ msgstr ""
 "falta l'entrada per actualitzar\n"
 "(una de %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "s'està habilitant la font %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "s'està ignorant la font %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "s'està habilitant la font %s"
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1810,6 +1922,7 @@ msgstr ""
 "sintaxi:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1818,41 +1931,50 @@ msgstr ""
 "actualitzar) paquets.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - utilitza cerca difusa (igual que -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - llista els paquets disponibles.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - llista les fonts disponibles.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - llista les fonts disponibles i la seva url.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - llista els nodes disponibles quan s'utilitza --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - llista els àlias paral·lels disponibles.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - el paquet següent és un paquet font (igual que -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
@@ -1860,77 +1982,91 @@ msgstr ""
 "'root').\n"
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --url          - mostra l'etiqueta url: url.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - mostra els canvis.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - imprimeix el resum.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - amplia la cerca a les dependències dels paquets.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - imprimeix grups amb el nom.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - mostra informació útil en un forma llegible pels humans.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - llista els fitxers del paquet.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - no busquis en 'provides' per a trobar paquets (per "
 "defecte).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - busca en 'provides' per a trobar paquets.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 "  -r             - mostra la versió i llançament juntament amb el nom.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - cerca inversa a que necessita el paquet.\n"
 
-#: ../urpmq:94
-#, fuzzy
+#: ../urpmq:97
+#, fuzzy, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -R             - cerca inversa a que necessita el paquet.\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - el següent paquet és un paquet font (igual que --src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
@@ -1938,36 +2074,92 @@ msgstr ""
 "  -u             - elimina el paquet si hi ha instal·lada una versió més "
 "nova.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - força una cerca difusa (igual que --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  noms o fitxers rpm subministrats en la línia d'ordres seran demanats.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes només es pot usar amb --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr ""
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "No s'ha trobat la llista de fitxers\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "No s'ha trobat la llista de canvis\n"
 
+#, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "La instal·lació ha fallat"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "S'està instal·lant el paquet `%s' (%s/%s)..."
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "s'està examinant el fitxer de síntesi [%s]"
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "s'està distribuint %s"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "Instal·lació de paquets..."
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "s'està instal·lant %s des de %s"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Instal·lació de paquets..."
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "Per complir les dependències, s'instal·laran el següent paquet (%d MB)"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - intenta trobar un fitxer de síntesi.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - intenta trobar un fitxer hdlist.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "falta el `with' per a les fonts de xarxa\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "opcions desconegudes '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "el protocol definit per a %s és desconegut"
 
diff --git a/po/cs.po b/po/cs.po
index 85801950..30dc2f83 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-09-12 22:22+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -24,7 +24,8 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "Instalace RPM"
 
@@ -33,7 +34,8 @@ msgstr "Instalace RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Chyba: nelze nalézt soubor %s, operace bude zrušena"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
@@ -89,20 +91,23 @@ msgstr ""
 "\n"
 "Možná chcete tento balíček pouze uložit. Jak chcete pokračovat?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Instalovat"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Uložit"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Přerušit"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Vyberte, kam chcete uložit soubor"
 
@@ -112,18 +117,21 @@ msgid "Unknown option %s"
 msgstr "Neznámá volba %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Nebyly zadány žádné balíčky"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Čekejte prosím..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Nutný root"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -134,35 +142,42 @@ msgstr ""
 "%s\n"
 "Pokračovat i přesto v instalaci?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "OK"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Varování"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (k aktualizaci)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (k instalaci)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Výběr balíčků"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Je zapotřebí jeden z následujících balíčků:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Přerušit"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -173,7 +188,7 @@ msgstr ""
 "%s\n"
 "Pokračovat i přesto v instalaci?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -184,25 +199,27 @@ msgstr ""
 "%d):\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Instalace balíčku..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nelze získat zdrojový balíček, končím"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, 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]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Stahuje se balíček `%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -215,8 +232,7 @@ msgstr ""
 "\n"
 "Chcete pokračovat v instalaci?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -227,35 +243,38 @@ msgstr ""
 "%s\n"
 "Možná potřebujete aktualizovat vaši databázi urpmi"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "odstraňuje se %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Připravuji..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaluji balíček `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Chyba při instalaci"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Hotovo"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "vše je již nainstalováno"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Instalace dokončena"
 
@@ -269,19 +288,22 @@ msgstr ""
 "kde [volby] jsou tyto\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - vypíše tuto nápovědu.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <cesta> - použije místo / zadanou cestu\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [group]     - omezí výsledky na danou skupinu.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g         - vypíše tag skupin společně se jménem.\n"
 
@@ -290,210 +312,127 @@ msgstr "  -g         - vypíše tag skupin společně se jménem.\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    výchozí je %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Instalovat balíčky může pouze uživatel root"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Spouštím urpmi v omezeném režimu..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "nelze otevřít databázi rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "neplatný název rpm souboru [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "načítám rpm soubor [%s] ..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...načítání ukončeno"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...načítání selhalo: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nelze zpřístupnit rpm soubor [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "nelze zpracovat soubor SPEC %s [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "nelze registrovat rpm soubor"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Nekompatibilní architektura pro rpm [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "chyba při registraci lokálních balíčků"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Tato operace je zakázána při běhu v omezeném režimu"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "špatně zadaná proxy na příkazové řádce\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
-#, fuzzy
+#: ../urpm/args.pm:133
+#, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "složka prostředí %s neexistuje"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Pro použití volby --use-distrib musíte být root"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: nemohu přečíst rpm soubor \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, c-format
+msgid "Can't use %s with %s"
+msgstr ""
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "Příliš mnoho parametrů\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "Nn"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "AaYy"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Je mi líto, to je špatná volba. Zkuste to znovu\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "mput selhalo, možná že je uzel nedostupný"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "uzel %s má zastaralou verzi urpme, obnovte jí prosím"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "rshp selhalo, možná že je uzel nedostupný"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "na uzlu %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Šířím shrnutí všem uzlům..."
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "zjištuji závislosti uzlů..."
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Distribuuji soubory uzlům..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Zjištuji možnost instalace na uzlech..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "Instalace na uzlu %s selhala"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Instalace je možná"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Instaluji balíčky na uzlech..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "scp selhalo na stroji %s (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "Postupuji soubor syntézy na %s..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "Řeším závislosti na %s..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "stroj %s nemá správnou verzi programu urpmi (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "Přenáším soubory na %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "Kontroluji možnost instalace na %s..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "Provádím instalaci na %s..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "Instaluji %s na %s..."
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "Připravuji instalaci na %s..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -511,45 +450,61 @@ msgstr ""
 "\n"
 "použití:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help           - vypíše tuto nápovědu.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - automaticky vybere balíček z výběru.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - zkontrolovat, zda lze dokončit odstranění správně.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - spustí program i v případě, že některé balíčky chybí.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel     - distribuovaný program urpmi na počítačích s přezdívkou.\n"
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Před smazáním znovu zabalí soubory\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - použít pro odebrání balíčků jiný kořenový adresář.\n"
 
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - použít pro instalaci balíčků jiný kořenový adresář.\n"
+
+#: ../urpme:52
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - nespustí skriptlet(y) balíčku.\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
@@ -557,60 +512,62 @@ msgstr ""
 "  --use-distrib  - nastavit urpme za provozu ze stromu distribuce, užitečné\n"
 "                   při (od)instalaci chroot s volbou --root.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - pokusí se najít a použít soubor se syntézou.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - zkusí najít a použít soubor hdlist.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - režim s výpisy.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - užvaněný režim.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - vybere všechny balíčky vyhovující výrazu.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Odstranit balíčky může pouze uživatel root"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "neznámý balíček"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "neznámé balíčky"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "neznámý balíček"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Následující balíčky obsahují: %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "odebrání balíčku %s naruší funkčnost vašeho systému"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Není co odebrat"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Kontrola odebrání následujících balíčků"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
@@ -618,17 +575,18 @@ msgstr ""
 "Aby byly splněny závislosti, budou odebrány následující balíčky (celkem %d, %"
 "d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (a/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "Odstranit balíčky (%d)?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (a/N) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Odebírání selhalo"
 
@@ -650,212 +608,259 @@ msgstr ""
 "použití: urpmf [volby] vzor-výraz\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - vypíše číslo verze tohoto nástroje.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - použij specifické prostředí (většinou hlášení o chybě).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - nepoužít zadané zdroje, oddělené čárkami.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 "  --literal, -l  - neporovnávat vzory, použije se parametr jako prostý "
 "řetězec.\n"
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media         - použít pouze uvedené zdroje, oddělené čárkou.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - třídit zdroje podle podřetězců oddělených čárkami.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - nevytiskne stejné řádky.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - použít pouze aktualizaci zdroje.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - užvaněný režim.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i         - ignorují se velká a malá písmena ve všech vzorech.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -I             - ve vzorech se bere ohled na malá a velká písmena "
 "(výchozí).\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - změní oddělovač pole (běžně na ':').\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "vzorek výrazů:\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - každ text je brán jako regulerní výraz, pokud není zadáno "
 "-l.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - vloží kód Perl přímo jako perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binární operátor AND.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binární operátor OR.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unární operátor NOT.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - levá a pravá závorka.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "Seznam značek (tagů):\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - udává výstupní formát podle příkazu printf\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   příklad: '%%název:%%soubory'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - architektura\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - sestavovací počítač\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - doba sestavení ze zdrojových kódů\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - soubory s nastavením\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - tag s konflikty\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - popis balíčku\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distribuce\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - epocha\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - název souboru balíčku\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - seznam souborů obsažených v balíčku\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - skupina\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - název balíčku\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - co se nahrazuje (dělá zastaralým)\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - kdo vytvořil balíček\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - co se poskytuje\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - co se požaduje\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - instalovaná velikost\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - název zdrojového balíčku rpm\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - shrnutí\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - dodavatel\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - zdroj, ve kterém byl balíček nalezen\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 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"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Nesprávný formát: můžete použít pouze jeden vícehodnotový tag"
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "používá se specifické prostředí na %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -863,11 +868,12 @@ msgstr ""
 "Poznámka: urpmf nemohl vrátit žádné výsledky, neboť žádný z prohledávaných "
 "zdrojů nepoužívá soubor hdlist\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Chcete-li hledat názvy balíčků, můžete chtít použít přepínač --name.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -884,14 +890,16 @@ msgstr ""
 "\n"
 "použití:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - použít pouze zadané zdroje pro vyhledávání požadovaných "
 "balíčků.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
@@ -899,13 +907,31 @@ msgstr ""
 "  --auto         - neinteraktivní mód, použije implicitní odpovědi k "
 "otázkám.\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - automaticky vybere balíčky pro aktualizaci systému.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automaticky vybere balíčky pro aktualizaci systému.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - vypnout kontrolu souborů MD5SUM.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - přinutí k aktualizaci klíče gpg.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -913,11 +939,13 @@ msgstr ""
 "  --no-uninstall - nikdy se neptat na odstranění balíčku, přerušit "
 "instalaci.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - neinstalovat balíčky (pouze stáhnout)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -926,7 +954,7 @@ msgstr ""
 "požadovaných\n"
 "                   balíčků, které vyžadují odstranění jiných.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -938,35 +966,41 @@ msgstr ""
 "                   aktualizovat více balíčků než zadaná hodnota,\n"
 "                   výchozí hodnota je %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - malé velikost transakce, výchozí je %d.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - vynutit přibližné vyhledávání.\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s      - další balíček je zdrojový.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - instalovat pouze balíček se zdroji (bez binárních "
 "souborů).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - neodstraňovat rpm balíčky z vyrovnávací paměti.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -974,7 +1008,8 @@ msgstr ""
 "  --allow-nodeps - povolí žádost na uživatele, aby instaloval balíčky bez\n"
 "                   kontroly závislostí.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -982,12 +1017,14 @@ msgstr ""
 "  --allow-force  - povolí žádost na uživatele, aby instaloval balíčky bez\n"
 "                   kontroly závislostí a integrity.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --root         - použít pro instalaci balíčků jiný kořenový adresář.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -995,41 +1032,48 @@ msgstr ""
 "  --use-distrib  - nastavit urpmi za provozu ze stromu distribuce, užitečné\n"
 "                   při instalaci chroot s volbou --root.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget          - použije program wget pro načtení souborů.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - použije program curl pro načtení souborů.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - použije program curl pro načtení souborů.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - další volby k programu curl\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- další volby k programu rsync\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - další volby k programu wget\n"
 
 #: ../urpmi:127
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --curl-options - další volby k programu curl\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - omezení rychlosti stahování.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1037,7 +1081,8 @@ msgstr ""
 "  --resume       - obnoví stahování částečně stažených souborů\n"
 "                   (--no-resume obnovení zakáže, implicitně je zakázáno).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1045,7 +1090,8 @@ msgstr ""
 "  --proxy        - použij zadanou HTTP proxy, číslo portu se předpokládá\n"
 "                   1080, jako výchozí (formát je <proxyhost[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1054,6 +1100,7 @@ msgstr ""
 "                   proxy (formát je <uživatel:heslo>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1062,6 +1109,7 @@ msgstr ""
 "                   zadaného následujícím parametrem.\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1070,6 +1118,7 @@ msgstr ""
 "                   (volba --no-verify-rpm toto vypne, jinak povoleno).\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1077,38 +1126,37 @@ msgstr ""
 "  --test         - pouze zkontrolovat, zda lze provést instalacisprávně.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - nebrat v úvahu cestu oddělenou čárkami.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - vynechá soubory s dokumentací.\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - před instalací nekontrolovat prostor na disku.\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - dovolí instalovat balíčky z jiných architektur.\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - nespustí skript(y) balíčku\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - vypnout kontrolu souborů MD5SUM.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - přinutí k aktualizaci klíče gpg.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - balíčky, jejichž instalace by měla být přeskočena\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1116,42 +1164,50 @@ msgstr ""
 "  --more-choices - pokud je nalezeno více balíčků, bude se nabízet "
 "více                    voleb než implicitně.\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - nezamkne se databáze balíčků RPM.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 "  --strict-arch  - aktualizovat pouze balíčky se shodnou architekturou.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - vybere všechny vyhovující z příkazové řádky.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - pokusí se najít balíček v položkách provides.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - nehledá balíček v položkách provides.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q           - režim bez výpisů.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
@@ -1159,11 +1215,12 @@ msgstr ""
 "Chyba: Chcete-li vygenerovat hlášení o chybě, zadejte obvyklé parametry na\n"
 "příkazovém řádku a přidejte parametr --bug.\n"
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Při použití --install-src nelze instalovat binární balíčky RPM"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1172,21 +1229,22 @@ msgstr ""
 "Adresář [%s] již existuje, použijte prosím pro hlášení o chybě jiný adresář "
 "nebo jej odstraňte"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Nelze vytvořit adresář [%s] pro uložení hlášení o chybě"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Kopírování selhalo"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "složka prostředí %s neexistuje"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1195,52 +1253,63 @@ msgstr ""
 "Chyba: %s vypadá, že je připojen pouze ke čtení.\n"
 "Použijte --allow-force, chcete-li operaci provést."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "Obnovuji media...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (k aktualizaci)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (k aktualizaci)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (k instalaci)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (k instalaci)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Jaká je vaše volba? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Následující balíčky nelze instalovat, protože závisí na balíčcích,\n"
+"které jsou starší než instalovaná verze:\n"
+"%s"
+msgstr[1] ""
+"Následující balíčky nelze instalovat, protože závisí na balíčcích,\n"
+"které jsou starší než instalovaná verze:\n"
+"%s"
+msgstr[2] ""
 "Následující balíčky nelze instalovat, protože závisí na balíčcích,\n"
 "které jsou starší než instalovaná verze:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1248,58 +1317,94 @@ msgstr ""
 "\n"
 "Přesto pokračovat v instalaci?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (A/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Některé požadované balíčky nebylo možné nainstalovat:\n"
+"%s"
+msgstr[1] ""
+"Některé požadované balíčky nebylo možné nainstalovat:\n"
+"%s"
+msgstr[2] ""
 "Některé požadované balíčky nebylo možné nainstalovat:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Instalace nemůže pokračovat, protože následující balíčky musí\n"
+"být odstraněny, aby bylo možné jiné aktualizovat:\n"
+"%s\n"
+msgstr[1] ""
+"Instalace nemůže pokračovat, protože následující balíčky musí\n"
+"být odstraněny, aby bylo možné jiné aktualizovat:\n"
+"%s\n"
+msgstr[2] ""
 "Instalace nemůže pokračovat, protože následující balíčky musí\n"
 "být odstraněny, aby bylo možné jiné aktualizovat:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Následující balíčky musí být odstraněny, aby bylo možné jiné aktualizovat:\n"
+"%s"
+msgstr[1] ""
+"Následující balíčky musí být odstraněny, aby bylo možné jiné aktualizovat:\n"
+"%s"
+msgstr[2] ""
 "Následující balíčky musí být odstraněny, aby bylo možné jiné aktualizovat:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(pouze test, k odstranění ve skutečnosti nedojde)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "Aby byly splněny závislosti, budou nainstalovány následující balíčky"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"Aby byly splněny závislosti, budou nainstalovány následující balíčky"
+msgstr[1] ""
+"Aby byly splněny závislosti, budou nainstalovány následující balíčky"
+msgstr[2] ""
+"Aby byly splněny závislosti, budou nainstalovány následující balíčky"
 
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Aby byly splněny závislosti, bude nainstalován následující balíček"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d balíčků, %d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1308,89 +1413,110 @@ msgstr ""
 "Pro instalaci následujících závislostí potřebujete mít právo root:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(pouze test, k instalaci ve skutečnosti nedojde)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "Pokračovat v instalaci balíčků (%d)? (%d MB)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "Pokračovat v instalaci balíčků (%d)? (%d MB)"
+msgstr[1] "Pokračovat v instalaci balíčků (%d)? (%d MB)"
+msgstr[2] "Pokračovat v instalaci balíčků (%d)? (%d MB)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Stiskněte klávesu Enter až budete připraveni..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Následující balíčky mají špatné signatury"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Následující balíčky mají špatné signatury"
+msgstr[1] "Následující balíčky mají špatné signatury"
+msgstr[2] "Následující balíčky mají špatné signatury"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Chcete pokračovat v instalaci?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "distribuuji %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "instaluji %s z %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "instaluji %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "Instalace selhala:"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Mám zkusit instalaci bez kontroly závislostí? (a/N) "
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Mám zkusit instalaci ještě razantněji (--force)? (a/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "Selhalo instalačních transakcí: %d"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalace je možná"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "vše je již nainstalováno"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "vše je již nainstalováno"
+msgstr[1] "vše je již nainstalováno"
+msgstr[2] "vše je již nainstalováno"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "vše je již nainstalováno"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "vše je již nainstalováno"
+msgstr[1] "vše je již nainstalováno"
+msgstr[2] "vše je již nainstalováno"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "restartuji urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1414,26 +1540,34 @@ msgstr ""
 "a [volby] jsou z\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - vytvoří zdroj pro aktualizaci.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - pokusí se najít a použít soubor se syntézou.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - zkusí najít a použít soubor hdlist.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - nepokoušet se hledat žádný soubor hdlist\n"
 "                   nebo soubor se syntézou.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1441,16 +1575,18 @@ msgstr ""
 "  --distrib      - automaticky vytvoří všechny zdroje z instalačního\n"
 "                   média.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - spolu s --distrib se zeptá na potvrzení u každého zdroje\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - spolu s --distrib přidá všechny zdroje ze seznamu\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1459,7 +1595,8 @@ msgstr ""
 "  --from         - pro seznam zrcadel se použije zadané URL, výchozí je\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1467,46 +1604,67 @@ msgstr ""
 "  --virtual      - vytvoří virtuální zdroje, které jsou vždy aktuální,\n"
 "                   je povolen pouze protokol file://.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - vypnout kontrolu souborů MD5SUM.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - neimportovat veřejné klíče z přidaných zdrojů\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - přidat zdroje do nastavení, ale neaktualizovat.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - smaže dočasný adresář.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - provede generování hdlist souborů.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q           - režim bez výpisů.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - režim s výpisy.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "nelze aktualizovat zdroj \"%s\"\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Přidat zdroj může pouze uživatel root"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Vytvořím soubor s nastavením [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Nelze vytvořit soubor s nastavením [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "s volbou --distrib není třeba zadávat <relativní cesta k hdlistu>"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1515,16 +1673,17 @@ msgstr ""
 "\n"
 "Chcete přidat zdroje '%s'"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<relativní cesta k hdlistu> chybí\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "chybí `with' pro síťový zdroj\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "nelze vytvořit zdroj \"%s\"\n"
@@ -1547,27 +1706,33 @@ msgstr ""
 "použití:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - nastaví začátek přebalení na teď\n"
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - nečistit na kontrolním bodu sestavovací adresář\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr "  --list         - vypíše transakce od daného data/doby\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-all     - vypíše všechny transakce v databázi RPM (dlouhé)\n"
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-safe    - vypíše transakce od kontrolního bodu\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
@@ -1575,118 +1740,121 @@ msgstr ""
 "  --rollback     - návrat až do daného data,\n"
 "                   nebo návrat daného množství transakcí\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - vypne přebalování balíčků\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "Neplatné datum nebo doba trvání [%s]\n"
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr "Přebalovací adresář není definován\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "Nelze zapisovat do přebalovacího adresáře [%s]\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "Čištění přebalovacího adresáře [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "%d souborů odstraněno\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "Podvržené příkazy [%s]\n"
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr "Nelze použít --checkpoint a --rollback ve stejném příkaze\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr "Nelze použít --checkpoint a --list ve stejném příkaze\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "Nelze použít--rollback a --list ve stejném příkaze\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "Nelze použít --disable s dalšími volbami"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "Žádná transakce od %s nenalezena\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "musíte být přihlášen jako root k provedení této akce"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Zapisuji soubor s makry RPM [%s]...\n"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr "Nebylo nalezeno datum pro návrat zpět\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "Návrat k %s...\n"
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr "Zakazuje se přebalování\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "použití: urpmi.removemedia [-a] <jméno> ...\n"
 "kde <jméno> je název zdroje pro aktualizaci.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - vybere všechna média.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - přibližná shoda v názvu zdroje.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"neznámé volby '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Odstranit zdroj může pouze uživatel root"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "nic k odebrání (použijte urpmi.addmedia pro přidání zdroje)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1696,6 +1864,7 @@ msgstr ""
 "(jeden z %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1704,30 +1873,46 @@ msgstr ""
 "kde <jméno> je název zdroje pro aktualizaci.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - aktualizovat pouze aktualizační zdroje.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - přinutí k aktualizaci klíče gpg.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - neaktualizovat, označit zdroje jako ignorované.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - neaktualizovat, označit zdroje jako zapnuté.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - vybere všechna nevyjímatelná média.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - provede generování hdlist souborů.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Aktualizovat zdroj může pouze uživatel root"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nic k aktualizaci (použijte urpmi.addmedia pro přidání zdroje)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1736,21 +1921,21 @@ msgstr ""
 "záznam pro update chybí\n"
 "(jeden z %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "zapínám zdroj %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignoruji zdroj %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "zapínám zdroj %s"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1769,6 +1954,7 @@ msgstr ""
 "použití:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1777,42 +1963,51 @@ msgstr ""
 "(nebo aktualizaovaných) balíčků.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - vnutit fuzzy vyhledávání. (stejné jako -y)\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - vypíše balíčky, které jsou k dispozici.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - vypíše seznam dostupných zdrojů.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - vypíše seznam dostupných zdrojů a jejich url.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - vypíše seznam uzlů k dispozici při použití volby --"
 "parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - seznam dostupných paralelních přezdívek.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - vypíše nastavení ve formě parametru pro urpmi.addmedia.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - další balíček je zdrojový (stejné jako -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
@@ -1820,11 +2015,13 @@ msgstr ""
 "root).\n"
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - povolí dotazy na balíčky RPM pro jiné architektury.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1832,100 +2029,198 @@ msgstr ""
 "  --use-distrib  - nastaví urpmi za provozu ze stromu distribuce.\n"
 "                   To umožní dotaz na distribuci.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - vytiskne změnový log.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - vypíše shrnutí.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - doplnit výstup balíčkem k odebrání.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d               - rozšířený dotaz na závislosti balíčku.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g         - vypíše tag skupin společně se jménem.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - tisk užitečných informací v člověkem čitelné podobě.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - vypíše soubory v balíčku.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - nehledá balíček v položkách provides (výchozí).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - bude hledat balíček v položkách provides.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r              - společně se jménem vypíše verzi a vydání.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - reverzní vyhledávání požadavků balíčku.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR            - rozšířené reverzní vyhledávání balíčků (včetně "
 "virtuálních balíčků).\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s              - další balíček je zdrojový (stejné jako --src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "  -u             - odebere balíček pokud je již instalována novější verze.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - vnutit fuzzy vyhledávání (stejné jako --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - jako -y, ale ignoruje velká a malá písmena.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "volbu --list-nodes lze použít pouze s volbou --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "přeskakuji zdroj %s: nenalezen hdlist"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Nebyl nalezen seznam souborů\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Nebyl nalezen záznam změn\n"
 
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "mput selhalo, možná že je uzel nedostupný"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr "uzel %s má zastaralou verzi urpme, obnovte jí prosím"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "rshp selhalo, možná že je uzel nedostupný"
+
+#~ msgid "on node %s"
+#~ msgstr "na uzlu %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Šířím shrnutí všem uzlům..."
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "zjištuji závislosti uzlů..."
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Distribuuji soubory uzlům..."
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Zjištuji možnost instalace na uzlech..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Instalace na uzlu %s selhala"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Instaluji balíčky na uzlech..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "scp selhalo na stroji %s (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "Postupuji soubor syntézy na %s..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "Řeším závislosti na %s..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "stroj %s nemá správnou verzi programu urpmi (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Přenáším soubory na %s..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "Kontroluji možnost instalace na %s..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Provádím instalaci na %s..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "Instaluji %s na %s..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Připravuji instalaci na %s..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "Aby byly splněny závislosti, bude nainstalován následující balíček"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr ""
+#~ "  --probe-synthesis - pokusí se najít a použít soubor se syntézou.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - zkusí najít a použít soubor hdlist.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "chybí `with' pro síťový zdroj\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "neznámé volby '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "neznámý protokol definovaný pro %s"
 
diff --git a/po/cy.po b/po/cy.po
index 53757544..96025281 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-12-11 22:24-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Poedit-Language: Welsh\n"
 "X-Poedit-Country: UK\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "Gosod RPM"
 
@@ -26,7 +27,8 @@ msgstr "Gosod RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Gwall: methu canfod ffeil %s, diddymu'r weithred"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Iawn"
 
@@ -81,20 +83,23 @@ msgstr ""
 "\n"
 "Efallai byddai'n well gennych ei gadw. Beth yw eich dewis?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Gosod"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Dileu"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Dewiswch leoliad i gadw'r ffeil"
 
@@ -104,18 +109,21 @@ msgid "Unknown option %s"
 msgstr "Dewis anhysbys %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Heb enwi pecyn"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Arhoswch..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Rhaid bod yn root"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -126,35 +134,42 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Iawn"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Iawn"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr "(uwchraddio)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr "(gosod)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Dewis pecyn"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Atal"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -165,7 +180,7 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -175,25 +190,27 @@ msgstr ""
 "I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Gosod y pecyn..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -206,8 +223,7 @@ msgstr ""
 "\n"
 "Hoffech chi barhau gyda'r gosod?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -218,35 +234,38 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Gorffen"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Cwblhawyd y gosod"
 
@@ -260,18 +279,22 @@ msgstr ""
 "lle mae [dewisiadau] o\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help     - argraffu neges cymorth.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "  --root <path>   - defnyddio'r root hwn yn lle /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [group]     - cyfyngu canlyniadau i'r grŵp.\n"
 
 #: ../rpm-find-leaves:19
+#, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f            - allbynnu enw llawn rpm (NVRA)\n"
 
@@ -280,97 +303,113 @@ msgstr "  -f            - allbynnu enw llawn rpm (NVRA)\n"
 msgid "                    defaults to %s.\n"
 msgstr "                   rhagosodedig yw %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Rhedeg urpmi mewn modd cyfyngedig..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr "wedi canfod %d pennawd rpm yn yr ystorfa, tynnu %d hen bennawd"
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "methu didoli ffeil spec %s [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Nid yw cyfeiriadur chroot yn bodoli"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Rhaid i chi fod yn wraidd i ddefnyddio --use-distrib"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Methu defnyddio %s heb %s"
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, fuzzy, c-format
+msgid "Can't use %s with %s"
+msgstr "Methu defnyddio %s heb %s"
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "Gormod o ymresymiadau\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "Nn"
 
@@ -378,115 +417,17 @@ msgstr "Nn"
 #  you can put here the letters for 'yes' for your language, so people
 #  can hit those keys in their keyboard to reply.
 #  please keep the 'Yy' for compatibility reasons
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "Yy"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Dewis gwael, ceisiwch eto\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "methodd mput, efallai bod nod yn anghyraeddadwy"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "mae gan nod %s hen fersiwn o urpmi, diweddarwch"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "methodd rshp, efallai bod y nod yn anghyraeddadwy"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "ar nod %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Lledaenu synthesis i nodau"
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "Datrys dibyniaethau ar y nodau"
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Dosbarthu ffeiliau i nodau"
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Gwirio os yw gosod yn bosib ar nodau"
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "Methodd y gosod ar nod %s"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Gosod yn bosibl"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Gosod pecynnau ar nodau..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "methodd scp ar westai %s (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "Lledaenu synthesis i %s..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "Datrys dibyniaethau ar %s..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "nid oes gan westai %s fersiwn dda o urpmi (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "Dosbarthu ffeiliau i %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "Gwirio os yw gosod yn bosibl ar %s..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "Gosod pecyn ar %s..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "Gosod %s ar %s..."
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "Paratoi gosod ar %s..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -503,44 +444,59 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu neges cymorth.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test          - gwirio os oes modd tynnu'n iawn.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
 "bodoli.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
 
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - defnyddio root arall ar gyfer gosod rpm.\n"
+
+#: ../urpme:52
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - peidio gweithredu sgriptledi'r pecyn(au).\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
@@ -548,75 +504,80 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth (ddad)osod chroot gyda dewis  --root.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - defnyddio ffeil synthesis.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - defnyddio ffeil hdlist.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - select all packages matching expression.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "pecyn anhysbys"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "pecynnau anhysbys"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pecyn anhysbys"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "bydd tynnu pecynnau %s yn torri'r system"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Dim i'w dynnu"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Ticio i ddileu'r pecynnau canlynol"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "Tynnu pecynnau %d?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Methodd y tynnu"
 
@@ -637,214 +598,261 @@ msgstr ""
 "defnydd: urpmf [dewisiadau] pattern-expression\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - argraffu rhif fersiwn yr offeryn.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - defnyddio amgylchedd penodol (adroddiad gwall fel "
 "rheol).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 "  --literal, -l  - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
 "llythrennedd.\n"
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
 "choma.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - peidio argraffu llinellau'r un fath.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - cadw gwahaniaeth maint llythrennau ym mhob patrwm "
 "(rhagosodiad).\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - newid ymwahanydd maes (arferol i ':').\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mynegiadau patrymau:\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l "
 "yn cael ei ddefnyddio.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - gweithredwr deuaidd AND.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - gweithredwr deuaidd OR.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unaidd NOT.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )              - parenthesis de a chwith.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "Rhestr tagiau:\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - pennu allbwn fformat printf-aidd\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   esiampl: '%%enw:%%ffeil'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - saernïaeth\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - gwestai'r adeiladedd\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - amser adeiladu\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - ffeiliau ffurfweddiad\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - tagiau gwrthdaro\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - disgrifiad pecyn\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - dosbarthiad\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - cyfnod\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - enw ffeil y pecyn\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - rhestr ffeiliau o fewn y pecyn\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grŵp\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name          - enw'r pecyn\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - tagiau'r hen\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager      - pecynydd\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - tag darparu\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - tagiau angenrhaid\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - maint wedi gosod\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - enw rpm ffynhonnell\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - crynodeb\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - gwerthwr\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - y cyfrwng lle cafwyd y pecyn\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -852,11 +860,12 @@ msgstr ""
 "Sylw: gan nad oedd unrhyw gyfrwng chwiliwyd yn defnyddio hdlists, methodd "
 "urpmf â chynnig canlyniad\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Efallai yr hoffech ddefnyddio --name i chwilio am enwau pecynnau.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -872,14 +881,16 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
 "gofynnwyd.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
@@ -887,23 +898,42 @@ msgstr ""
 "  --auto         - modd anrhyngweithiol, derbyn atebion rhagosodedig i "
 "gwestiynau.\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr "  --auto-select  - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 "  --no-install   - peidio gosod y pecynnau (dim ond eu llwytho i lawr)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -911,7 +941,7 @@ msgstr ""
 "  --keep         - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
 "                   pecynnau sy'n arwain at dynnu.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -923,33 +953,39 @@ msgstr ""
 "                   eu gosod neu eu uwchraddio\n"
 "                   rhagosodiad yw %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - mynnu chwiliad bras.\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s      - pecyn nesaf yn becyn ffynhonnell.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - tynnu rpm o'r storfa cyn unrhyw beth arall.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - peidio glanhau rpm o'r storfa.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -957,7 +993,8 @@ msgstr ""
 "  --allow-nodeps - caniatáu gofyn i ddefnyddiwr i osod pecynnau heb\n"
 "                   wirio dibyniaethau.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -965,11 +1002,13 @@ msgstr ""
 "  --allow-force  - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
 "                   wirio dibyniaethau na'u cyfanrwydd.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer gosod rpm.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -977,39 +1016,48 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth osod chroot gyda dewis o  --root.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla         - defnyddio prozilla i estyn ffeiliau pell.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - dewis ychwanegol wrth ddefnyddio curl\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- dewis ychwanegol wrth ddefnyddio rsync\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - dewis ychwanegol wrth ddefnyddio wget\n"
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --cprozilla-options - dewis ychwanegol wrth ddefnyddio prozilla\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1017,7 +1065,8 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1025,7 +1074,8 @@ msgstr ""
 "  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
 "                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1034,6 +1084,7 @@ msgstr ""
 "                   dilysiad dirprwy (fformat yw <user:password>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1042,6 +1093,7 @@ msgstr ""
 "                   yr arg. nesaf\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1050,44 +1102,44 @@ msgstr ""
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eithrio llwybr wedi ei wahanu a chollnod.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - eithrio ffeiliau docs.\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - peidio gwirio maint ar ddisg cyn gosod.\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - caniatáu gosod rpm ar gyfer saernïaeth annhebyg.\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - peidio gweithredu sgripledi pecyn(au)\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip          - pecynnau dylid osgoi eu gosod.\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1096,43 +1148,51 @@ msgstr ""
 "ddewis\n"
 "                   na'r rhagosodiad.\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - peidio cloi db rpm.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 "  --strict-arch  - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
 "eu gosod.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "Gwall: methu defnyddio --auto-select ynghyd â'r rhestr pecynnau.\n"
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
@@ -1141,11 +1201,12 @@ msgstr ""
 "arferol\n"
 "ynghyd a --bug.\n"
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Methu gosod ffeiliau deuaidd rpm wrth ddefnyddio --install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1154,21 +1215,22 @@ msgstr ""
 "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
 "adroddiad gwall neu ei ddileu."
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Methodd y copïo"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1177,52 +1239,59 @@ msgstr ""
 "Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
 "Defnydd --allow-force gorfodaeth i orfodi gweithred."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "Diweddaru cyfrwng...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uwchraddio)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uwchraddio)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (gosod)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (gosod)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Nid oes modd gosod y pecynnau canlynol am eu bod yn dibynnu ar becynnau\n"
+"sy'n hyn na'r rhai sydd wedi eu gosod:\n"
+"%s"
+msgstr[1] ""
 "Nid oes modd gosod y pecynnau canlynol am eu bod yn dibynnu ar becynnau\n"
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1230,58 +1299,80 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
+"%s"
+msgstr[1] ""
 "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Nid oes modd i'r gosod parhau gan fo'n rhaid i'r pecynnau canlynol\n"
+"gael eu tynnu i eraill gael eu diweddaru.\n"
+"%s\n"
+msgstr[1] ""
 "Nid oes modd i'r gosod parhau gan fo'n rhaid i'r pecynnau canlynol\n"
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
+"%s"
+msgstr[1] ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
+msgstr[1] "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
 
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d pecyn, %d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1290,88 +1381,106 @@ msgstr ""
 "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "Parhau gyda gosod %d pecyn? (%d MB)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "Parhau gyda gosod %d pecyn? (%d MB)"
+msgstr[1] "Parhau gyda gosod %d pecyn? (%d MB)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Pwyso Enter pan yn barod..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Mae gan y pecynnau canlynol lofnod gwallus"
+msgstr[1] "Mae gan y pecynnau canlynol lofnod gwallus"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "dosbarthu %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "gosod %s o %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "gosod %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "Methodd y gosod:"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "methodd trosglwyddiad gosod %d"
 
-#: ../urpmi:824
-msgid "Packages are up to date"
-msgstr "Mae'r pecynnau'n rhai diweddaraf"
-
-#: ../urpmi:827
+#: ../urpmi:828
 #, c-format
-msgid "Packages %s are already installed"
-msgstr "Pecynnau %s wedi eu gosod eisoes"
+msgid "Installation is possible"
+msgstr "Gosod yn bosibl"
 
-#: ../urpmi:828
+#: ../urpmi:833
 #, c-format
+msgid "Packages are up to date"
+msgstr "Mae'r pecynnau'n rhai diweddaraf"
+
+#: ../urpmi:840
+#, fuzzy, c-format
 msgid "Package %s is already installed"
-msgstr "Pecyn %s wedi ei osod eisoes"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Pecyn %s wedi ei osod eisoes"
+msgstr[1] "Pecyn %s wedi ei osod eisoes"
 
-#: ../urpmi:847
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Pecynnau %s wedi eu gosod eisoes"
+msgstr[1] "Pecynnau %s wedi eu gosod eisoes"
+
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1394,26 +1503,34 @@ msgstr ""
 "a [options] o\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - ceisio canfod a defnyddio ffeil synthesis.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
+msgstr "  --probe-synthesis - defnyddio ffeil synthesis.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - ceisio canfod a defnyddio ffeil hdlist.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
+msgstr "  --probe-hdlist - defnyddio ffeil hdlist.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - peidio ceisio canfod unrhyw synthesis neu\n"
 "                   ffeil hdlist.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1421,16 +1538,18 @@ msgstr ""
 "  --distrib      - creu yn awtomatig yr holl gyfrwng o gyfrwng\n"
 "                   gosod\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --rhyngweithiol  - gyda --distrib, gofyn cadarnhad gyda phob cyfrwng\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media   - gyda --distrib, rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1440,7 +1559,8 @@ msgstr ""
 "rhagosodedig yw\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1448,47 +1568,68 @@ msgstr ""
 "  --virtual      - creu cyfrwng rhithiol sydd wedi ei ddiweddaru,\n"
 "                   dom ond protocol file:// sy'n cael ei ganiatáu.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - peidio mewnforio pubkey y cyfrwng ychwanegwyd\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - ychwanegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - gorfodi cynhyrchu ffeiliau hdlist\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  --verbose      - modd llafar.\n"
+
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "methu diweddaru cyfrwng \"%s\"\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Yn creu ffeil config (%s)"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Methu creu ffeil Config (%s)"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1497,16 +1638,17 @@ msgstr ""
 "\n"
 "Hoffech chi ychwanegu cyfrwng '%s'"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<llwybr perthynnol hdlist> ar goll\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
+#: ../urpmi.addmedia:169
+#, fuzzy, c-format
+msgid "Can't use %s with remote medium"
+msgstr "Methu defnyddio %s heb %s"
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "methu creu cyfrwng \"%s\"\n"
@@ -1528,28 +1670,34 @@ msgstr ""
 "defnydd:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - gosod cychwyn ailbacio nawr\n"
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - peidio glanhau rpm ar checkpoint\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - rhestri trafodion ers darparu ymresymiad dyddiad hyd\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-all     - rhestri'r holl drafodion yn rpmdb (hir)\n"
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-safe     - rhestri'r holl drafodion ers y pwynt gwirio\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
@@ -1557,118 +1705,121 @@ msgstr ""
 "  --rollback     - mynd yn ôl i'r dyddiad penodol,\n"
 "                   neu nôl y nifer o drafodion penodwyd\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - diffodd ailbecynnu\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "Dyddiad neu hyd annilys [%s]\n"
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr "Heb ddiffinio cyfeiriadur ailbecynnu\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "Methu ysgrifennu i gyfeiriadur ailbacio [%s]\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "Glanhau cyfeiriadur ailbacio [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "Tynnwyd %d pecyn\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "Ymresymiadau llinell orchymyn annilys [%s]\n"
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr "Methu pennu --checkpoint a --rollback ar yr un pryd\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr "Methu pennu --checkpoint a --list ar yr un pryd\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "Methu pennu --rollback a --list ar yr un pryd\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "Methu pennu --disable gyda dewis arall"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "Dim trafodion ers %s\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "Rhaid bod yn uwch-ddefnyddiwr i wneud hyn"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Ysgrifennu ffeil macros rpm [%s]...\n"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr "Heb ganfod dyddiad rholio nôl\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "Rholio nôl hyd %s...\n"
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr "Anablu ailbecynnu\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "lle mai <name> yw'r enw cyfrwng i'w dynnu.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - dewis pob cyfrwng.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - cydweddiad bras enwau cyfryngau\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"dewisiadau anhysbys '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu cyfrwng"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "dim i'w dynnu (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1678,6 +1829,7 @@ msgstr ""
 "(un o %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1686,32 +1838,48 @@ msgstr ""
 "lle mai <name> yw'r enw cyfrwng i'w dynnu.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr ""
 "  --norebuild    - peidio diweddaru, marcio'r cyfrwng wedi ei anwybyddu.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 "  --no-ignore    - peidiwch diweddaru, marciwch y cyfrwng wedi ei alluogi.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - dewis pob cyfrwng ansymudadwy.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - gorfodi cynhyrchu ffeiliau hdlist\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael diweddaru cyfrwng"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "dim i'w ddiweddaru (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1720,21 +1888,21 @@ msgstr ""
 "mae'r cofnod i ddiweddaru ar goll\n"
 "(un o %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "galluogi cyfrwng %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "anwybyddu cyfrwng %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "galluogi cyfrwng %s"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1752,6 +1920,7 @@ msgstr ""
 "defnydd:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1760,31 +1929,38 @@ msgstr ""
 "gofynnwyd (neu diweddarwyd).\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - mynnu chwiliad fuzzy (fel -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list        - rhestri'r holl gyfrwng ar gael.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - rhestri'r holl gyfrwng ar gael.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - rhestri'r holl gyfrwng ar gael.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
@@ -1792,22 +1968,26 @@ msgstr ""
 "addmedia.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - give all source packages before downloading (root only).\n"
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - caniatáu ymholi rpmau ar gyfer saernïaeth annhebyg.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1815,67 +1995,81 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib.\n"
 "                   Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - cofnod argraffu.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - crynodeb argraffu.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - allbwn cyfan a phecyn i'w dynnu\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
 "i bobl.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - peidio chwilio yn provides i ganfod pecyn "
 "(rhagosodedig).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - chwilio nôl  i'r hyn sydd angen ar becyn.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR             - chwilio nôl  estyndig (yn cynnwys rhith becynnau) \n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  --s          - pecyn nesaf yn becyn ffynhonnell (yr un peth â --src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
@@ -1883,35 +2077,118 @@ msgstr ""
 "  -u             - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
 "osod.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - fel -y, ond yn gorfodi cydweddu diffyg cydweddiad maint "
 "llythrennau.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
 "eu holi.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "hepgor cyfrwng %s: dim hdliist"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Heb ganfod filelist\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
+
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "methodd mput, efallai bod nod yn anghyraeddadwy"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr "mae gan nod %s hen fersiwn o urpmi, diweddarwch"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "methodd rshp, efallai bod y nod yn anghyraeddadwy"
+
+#~ msgid "on node %s"
+#~ msgstr "ar nod %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Lledaenu synthesis i nodau"
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "Datrys dibyniaethau ar y nodau"
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Dosbarthu ffeiliau i nodau"
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Gwirio os yw gosod yn bosib ar nodau"
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Methodd y gosod ar nod %s"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Gosod pecynnau ar nodau..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "methodd scp ar westai %s (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "Lledaenu synthesis i %s..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "Datrys dibyniaethau ar %s..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "nid oes gan westai %s fersiwn dda o urpmi (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Dosbarthu ffeiliau i %s..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "Gwirio os yw gosod yn bosibl ar %s..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Gosod pecyn ar %s..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "Gosod %s ar %s..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Paratoi gosod ar %s..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - ceisio canfod a defnyddio ffeil synthesis.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - ceisio canfod a defnyddio ffeil hdlist.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "dewisiadau anhysbys '%s'\n"
diff --git a/po/da.po b/po/da.po
index b52d8c40..86b1c21f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-10-01 17:20+0200\n"
 "Last-Translator: Keld Simonsen <keld@rap.dk>\n"
 "Language-Team:  <da@li.org>\n"
@@ -26,7 +26,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "RPM-installering"
 
@@ -35,7 +36,8 @@ msgstr "RPM-installering"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Fejl: kunne ikke finde fil %s, vil afbryde handling"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_O.k."
 
@@ -91,20 +93,23 @@ msgstr ""
 "\n"
 "Du vil måske foretrække blot at gemme den. Hvad er dit valg?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Installér"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Gem"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Annullér"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Vælg sted at gemme filen"
 
@@ -114,18 +119,21 @@ msgid "Unknown option %s"
 msgstr "ukendt valg '%s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Ingen pakker angivet"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Vent venligst..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Skal være root"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -136,35 +144,42 @@ msgstr ""
 "%s\n"
 "Skal installationen fortsættes alligevel?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "O.k."
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "O.k."
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (skal opgraderes)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (skal installeres)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Pakkevalg"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Der er brug for en af de følgende pakker:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Afbryd"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -175,7 +190,7 @@ msgstr ""
 "%s\n"
 "Skal installationen fortsættes alligevel?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -186,25 +201,27 @@ msgstr ""
 "installeret:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Pakkeinstallation..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, 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]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Henter pakke %s..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -217,8 +234,7 @@ msgstr ""
 "\n"
 "Ønsker du at fortsætte installeringen?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -229,35 +245,38 @@ msgstr ""
 "%s\n"
 "Du ønsker måske at opdatere din urpmi-database"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "fjerner %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Forbereder..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Installationen fejlede"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Færdig"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "alting er allerede installeret"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Installationen færdig"
 
@@ -271,19 +290,22 @@ msgstr ""
 "hvor [tilvalg] er fra\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - udskriv denne hjælpebesked.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <sti>  - brug den angivne sti som root i stedet for /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "  -g [group}     - begræns resultater til denne gruppe.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - udskriv også grupper med navn.\n"
 
@@ -292,210 +314,127 @@ msgstr "  -g             - udskriv også grupper med navn.\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    standard er %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Kun superbrugeren har lov til at installere pakker"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Kører urpmi i begrænset tilstand..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "kunne ikke åbne rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ugyldigt rpm-filnavn [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "henter rpm-fil [%s]..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...hentning færdig"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...hentning mislykkedes: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kunne ikke nå rpm fil [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "kunne ikke fortolke spec-fil '%s [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "kunne ikke registrere rpm-fil"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Inkompatibel arkitektur for rpm [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "fejl ved registrering af lokale pakker"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Denne handling er forbudt ved kørsel i begrænset tilstand"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "Forkert proxy-erklæring på kommandolinje\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
-#, fuzzy
+#: ../urpm/args.pm:133
+#, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Miljøkatalog %s eksisterer ikke"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Du skal være rod (root) for at bruge --use-distrib"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: kan ikke læse rpm-fil \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, c-format
+msgid "Can't use %s with %s"
+msgstr ""
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "For mange argumenter\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "Nn"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "YyJj"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Undskyld, dårligt valg, prøv igen\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "mput mislykkedes, måske kan en node ikke nås"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "node %s har en gammel version af urpme, venligst opgradér"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "rshp mislykkedes, måske kan en node ikke nås"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "på node %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Spreder syntese til noder..."
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "Løser afhængigheder på noder..."
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Distribuerer filer til noder..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Tjekker at installation er mulig på noder..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "Installationen fejlede for maskine %s"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Installation er mulig"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Installerer pakker på maskiner..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "scp mislykkedes på vært %s (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "Spreder syntese til %s..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "Løser afhængigheder på %s..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "vært %s har ikke en god version af urpmi (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "distribuerer filer til %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "Tjekker at installation er mulig på %s..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "Udfører installering på %s..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "installerer %s på %s"
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "Forbereder installation på %s..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -512,42 +451,57 @@ msgstr ""
 "\n"
 "brug:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - udskriv denne hjælpebesked.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - vælg automatisk en pakke ved valg.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - afprøv om fjernelsen kan udføres korrekt.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - gennemfør kald selv om nogen pakker ikke eksisterer.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - distribueret urpmi over maskiner med alias.\n"
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Ompak filer før sletning\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - brug en anden root for rpm-fjernelse.\n"
 
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - brug en anden root for rpm-installation.\n"
+
+#: ../urpme:52
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - udfør ikke pakke-småskripter.\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
@@ -555,61 +509,63 @@ msgstr ""
 "  --use-distrib  - konfigurér urpme løbende fra et distrib træ, "
 "nyttigt               til at (af)installere en chroot med root-tilvalget.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis forsøg at finde og bruge syntese- eller hdlist-fil.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - forsøg at finde og bruge hdlist-fil.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  -v             - udførlig tilstand.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - vælg alle pakker matchende udtryk.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Kun superbrugeren har lov til at fjerne pakker"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "ukendt pakke"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "ukendte pakker"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "ukendt pakke"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Følgende pakker indeholder %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "fjernelse af pakke %s vil skade dit system"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Ingenting at fjerne"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Tjekker for at fjerne de følgende pakker"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
@@ -617,17 +573,18 @@ msgstr ""
 "For at tilfredsstille afhængigheder vil de følgende %d pakker blive fjernet "
 "(%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (j/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "Skal %d pakker  fjernes?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Fjernelse mislykkedes"
 
@@ -648,213 +605,260 @@ msgstr ""
 "brug: urpmf [tilvalg] mønster-udtryk\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - udskriv dette værktøjs versionsnummer.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - brug specifikt miljø (typisk ved en fejlrapport).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - brug ikke de opgivne medier, adskilt med komma.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 "  --literal, -l  - kontrollér ikke søgestrenge, brug argumenter som "
 "bogstavelige strenge.\n"
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - brug kun de opgivne medier, adskilt med komma.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - sortér medier ifølge delstrenge, adskilt med komma.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - brug synthesis angivet i stedet for urpmi-db.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq          - udskriv ikke identiske linjer.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - brug kun opdateringsmedie.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -v             - udførlig tilstand.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - ignorér forskel på store og små bogstaver i alle "
 "mønstre.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -I             - skeln mellem store og små bogstaver i søgestrenge "
 "(standard).\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - ændr feltseparator (standard er ':').\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "Søgestrengsudtryk:\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - al tekst er forstået som regulære udtryk, med mindre -l "
 "er brugt.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - inkludér perl-kode direkte som perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binær OG-operator.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binær ELLER-operator.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - negation.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - venstre- og højreparenteser.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Liste over mærker:\n"
 "\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - angiv et printf-lignende uddata-format\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   eksempel: '%%navn:%%filer'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arkitektur\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost     - byggevært\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - byggetidspunkt\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - konfigurationsfiler\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - konfliktmærker\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - pakkebeskrivelse.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distribution\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - epoke\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - filnavn på pakken\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - liste over filer i pakken\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - gruppe\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - pakkenavn\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - mærk forældet\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager      - pakkeprogram.\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - tilbudsetiketter\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - afhængighedsetiketter\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - installeret størrelse\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - navn på kilde-rpm\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - sammendrag\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url           - url\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - leverandør\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - mediet i hvilken pakken blev fundet\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - udskriv version, udgave og arkitektur med navn.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Ugyldigt format: du kan kun bruge flerværdi-etiketter"
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "bruger særligt miljø på %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -862,11 +866,12 @@ msgstr ""
 "Bemærk: da ingen af de undersøgte medier bruger en hdlist, var urpmf ikke i "
 "stand til at returnere noget resultat\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Måske ønsker du at bruge --name for at søge efter pakkenavne.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -882,14 +887,16 @@ msgstr ""
 "\n"
 "brug:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - brug kun det opgivne medie for at søge efter de ønskede "
 "pakker.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
@@ -897,13 +904,31 @@ msgstr ""
 "  --auto         - ikke-interaktiv tilstand, antag standardsvar på "
 "spørgsmål.\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - vælg automatisk pakker for opgradering af systemet.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - vælg automatisk pakker for opgradering af systemet.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deaktivér kontrol med MD5SUM fil.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gennemtving opdatering af gpg-nøgle.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -911,11 +936,13 @@ msgstr ""
 "  --no-uninstall - spørg aldirig om afinstallering af en pakke, afbryd "
 "installationen.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - installér ikke pakker (kun nedhentning)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -923,7 +950,7 @@ msgstr ""
 "  --keep         - behold eksisterende pakker om muligt, afvis anmodede\n"
 "                   pakker som fører til fjernelse.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -934,32 +961,38 @@ msgstr ""
 "                       skal installeres eller opgraderes,\n"
 "                       standard er %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - lille tansaktionslængde, standard er %d.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - gennemfør søgning efter fuzzy.\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src -s      - næste pakke er en kildepakke.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - installér kun kildepakker (ingen binære).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - fjern rpm fra cache før noget andet.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - fjern ikke rpm'er fra cache.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -968,7 +1001,8 @@ msgstr ""
 "kontrol af\n"
 "                   afhængigheder.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -976,11 +1010,13 @@ msgstr ""
 "  --allow-force  - tillad at spørge bruger om installering af pakker\n"
 "                   uden kontrol af afhængigheder og integritet.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - brug en anden root for rpm-installation.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -988,41 +1024,48 @@ msgstr ""
 "  --use-distrib  - konfigurér urpmi løbende fra et distrib-træ, "
 "nyttigt               til at installere en chroot med --root-tilvalget.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - brug wget til at hente eksterne filer.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - brug 'curl' til at hente retrieve eksterne filer.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - brug 'curl' til at hente retrieve eksterne filer.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - ekstra valg som skal gives til curl\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- ekstra valg som skal gives til rsync\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - ekstra valg som skal gives til wget\n"
 
 #: ../urpmi:127
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --curl-options - ekstra valg som skal gives til curl\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - begræns hastighed på hentning.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1030,7 +1073,8 @@ msgstr ""
 " --resume       - genoptag overførsel af delvist hentede filer\n"
 "                   (--no-resume deaktiverer det, standard er deaktiveret).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1038,7 +1082,8 @@ msgstr ""
 "  --proxy        - brug den angivne HTTP proxy, portnummeret antages at\n"
 "                   være 1080 som standard (formatet er <proxyvært[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1047,6 +1092,7 @@ msgstr ""
 "                   af proxy (formatet er <bruger:adgangskode>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1055,6 +1101,7 @@ msgstr ""
 "                   argument.\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1064,47 +1111,47 @@ msgstr ""
 "aktiveret).\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - afprøv kun om installationen kan udføres korrekt.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - udelukkelsessti adskilt med komma.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - udelader docs-filer.\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --ignoresize   - kontrollér ikke for ledig diskplads før installation.\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - tillad at installere rpm'er for forskellige "
 "arkitekturer.\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - kør ikke pakkers skript\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - deaktivér kontrol med MD5SUM fil.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - gennemtving opdatering af gpg-nøgle.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - pakker hvis installation bør overspringes\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1112,41 +1159,49 @@ msgstr ""
 "  --more-choices - når flere pakker er fundet, så foreslå flere muligheder\n"
 "                   end normalt.\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - lås ikke rpm-database.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - opgradér kun pakker med den samme arkitektur.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - vælg alle træffere på kommandolinje.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - tillad søgning i 'provides' for at finde pakke.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - søg ikke i 'provides' for at finde pakke.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - stille udgave.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  navne eller rpm-filer givne på kommandolinjen vil blive installeret.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
@@ -1154,11 +1209,12 @@ msgstr ""
 "Fejl: For at generere en fejlrapport skal du specificere de almindelige "
 "kommandolinjeargumenter med --bug.\n"
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Du kan ikke installere binære rpm-filer ved brug af --install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1167,21 +1223,22 @@ msgstr ""
 "Kataloget [%s] eksisterer allerede, brug venligst et andet katalog til "
 "fejlrapporten, eller slet det"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "kunne ikke oprette katalog [%s] til fejlrapport"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Kopiering mislykkedes"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "Miljøkatalog %s eksisterer ikke"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1190,52 +1247,59 @@ msgstr ""
 "Fejl: %s ser ud til at være monteret kun læsbart.\n"
 "Brug --allow-force for at gennemtvinge handlingen."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "Opdaterer medie...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (skal opgraderes)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (skal opgraderes)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (skal installeres)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (skal installeres)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Hvad er dit valg? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"De følgende pakker kan ikke installeres, fordi de afhænger af pakker,\n"
+"som er ældre end de installerede:\n"
+"%s"
+msgstr[1] ""
 "De følgende pakker kan ikke installeres, fordi de afhænger af pakker,\n"
 "som er ældre end de installerede:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1243,60 +1307,82 @@ msgstr ""
 "\n"
 "Fortsæt installationen alligevel?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Nogen forespurgte pakker kan ikke installeres:\n"
+"%s"
+msgstr[1] ""
 "Nogen forespurgte pakker kan ikke installeres:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Installationen kan ikke fortsætte fordi de følgende pakker\n"
+"skal fjernes for at andre kan opgraderes:\n"
+"%s\n"
+msgstr[1] ""
 "Installationen kan ikke fortsætte fordi de følgende pakker\n"
 "skal fjernes for at andre kan opgraderes:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"De følgende pakker skal fjernes for at andre kan opgraderes:\n"
+"%s"
+msgstr[1] ""
 "De følgende pakker skal fjernes for at andre kan opgraderes:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(kun test, fjernelse vil egentlig ikke blive gennemført)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"For at tilfredsstille afhængigheder vil de følgende pakker blive installeret"
+msgstr[1] ""
 "For at tilfredsstille afhængigheder vil de følgende pakker blive installeret"
 
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr ""
-"For at tilfredsstille afhængigheder vil den følgende pakke blive installeret "
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d pakker, %d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1305,89 +1391,106 @@ msgstr ""
 "Du skal være root for at installere de følgende afhængigheder:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(kun test, installation vil egentlig ikke blive gennemført)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "Fortsæt installationen med de %d pakker? (%d MB)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "Fortsæt installationen med de %d pakker? (%d MB)"
+msgstr[1] "Fortsæt installationen med de %d pakker? (%d MB)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Tryk på retur, når den er klar..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Annullér"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "De følgende pakker har dårlige signaturer"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "De følgende pakker har dårlige signaturer"
+msgstr[1] "De følgende pakker har dårlige signaturer"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ønsker du at fortsætte installationen?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "distribuerer %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "installerer %s fra %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "installerer %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "Installationen fejlede:"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Prøv installation uden at tjekke afhængigheder? (j/N) "
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Prøv endnu hårdere at installere (--force)? (j/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d installationstrasaktioner mislykkedes"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "Installation er mulig"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "alting er allerede installeret"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "alting er allerede installeret"
+msgstr[1] "alting er allerede installeret"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "alting er allerede installeret"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "alting er allerede installeret"
+msgstr[1] "alting er allerede installeret"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "genstarter urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1411,42 +1514,52 @@ msgstr ""
 "og [valgmuligheder] er følgende\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - opret et opdateringsmedium.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis forsøg at finde og bruge syntese- eller hdlist-fil.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - forsøg at finde og bruge hdlist-fil.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
 msgstr ""
-"  --no-probe     - forsøg ikke at finde og bruge syntese- eller hdlist-fil.\n"
 
 #: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
+msgstr ""
+"  --no-probe     - forsøg ikke at finde og bruge syntese- eller hdlist-fil.\n"
+
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 "  --distrib      - opret automatisk alle media fra et installationsmedium.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - med --distrib, spøger om bekræftelse for hvert medie\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - med --distrib, tilføj hvert listede medie\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1455,7 +1568,8 @@ msgstr ""
 "  --from         - brug angivet adresse for liste over spejl, standard er\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1463,46 +1577,67 @@ msgstr ""
 "  --virtual       - opret virtuelt medie som altid er opdatere,\n"
 "                     kun protokollen file:// er tilladt.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deaktivér kontrol med MD5SUM fil.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - importér ikke pubkey fra tilføjet medie\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - tilføj mediet i config, men opdatér det ikke.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - rydder katalog med cache for headere.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - gennemfør generering af hdlist-filer.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - stille udgave.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - udførlig tilstand.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "kan ikke opdatere medie \"%s\"\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Kun superbrugeren har lov til at tilføje medier"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Vil oprette config-fil [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Kan ikke oprette config-fil [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "ingen grund til at angive <relativ sti for hdlist> med --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1511,16 +1646,17 @@ msgstr ""
 "\n"
 "Ønsker du at tilføje medie '%s'"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<relativ sti for hdlist> mangler\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "'with' mangler for netværks-medie\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "kan ikke oprette medie \"%s\"\n"
@@ -1542,29 +1678,35 @@ msgstr ""
 "brug:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - sæt genpakkestart nu\n"
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 "  --noclean      - rens ikke ud i genpakningskatalog ved kontrolpunkt\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - list transaktioner siden opgivet dato/varighed-argument\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-all     - list alle transaktioner i rpm-database (lang)\n"
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-safe    - list transaktioner siden kontrolpunkt\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
@@ -1572,118 +1714,121 @@ msgstr ""
 "  --rollback     - rul tilbage til specificeret dato,\n"
 "                   eller rul det specificerede antal transaktioner tilbage\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - slå genpakning fra\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "Ugyldig dato eller varighed [%s]\n"
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr "Genpakningskatalog ikke defineret\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "Kan ikke skrive til genpakningskatalog [%s]\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "Renser ud i genpakningskatalog [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "%d filer fjernet\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "Mærkelige kommandolinjeargumenter [%s]\n"
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr "Du kan ikke specificere --checkpoint og --rollback samtidigt\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr "Du kan ikke specificere --checkpoint og --list samtidigt\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "Du kan ikke specificere --rollback og --list samtidigt\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "Du kan ikke specificere --disable med andre valg"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "Ingen transaktion fundet siden %s\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "Du skal være superbruger for at gøre dette"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Skriver rpm-makrofil [%s]...\n"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr "Ingen tilbagerulningsdato fundet\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "Rul tilbage til %s...\n"
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr "Deaktiverer genpakning\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "brug: urpmi.removemedia [-a] <navn> ...\n"
 "hvor <navn> er et medie-navn der skal fjernes.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - vælg alle medier.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - upræcis matchning på medienavne.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"ukendte valg '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Kun superbrugeren har lov til at fjerne medier"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "ingenting at fjerne (brug urpmi.addmedia til at tilføje et medie)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1693,6 +1838,7 @@ msgstr ""
 "(én af %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1701,30 +1847,46 @@ msgstr ""
 "hvor <navn> er et medie-navn der skal opdateres.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - opdatér kun opdateringsmedie.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gennemtving opdatering af gpg-nøgle.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - opdatér ikke, markér mediet som ignoreret.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - opdatér ikke, markér mediet som aktiveret.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - vælg alle ikke-udskiftelige medier.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - gennemfør generering af hdlist-filer.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Kun superbrugeren har lov til at opdatere medier"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ingenting at opdatere (brug urpmi.addmedia til at tilføje et medie)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1733,21 +1895,21 @@ msgstr ""
 "mangler det element der skal opdateres\n"
 "(én af %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "aktiverer medie %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorerer medie %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "aktiverer medie %s"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1765,6 +1927,7 @@ msgstr ""
 "brug:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1773,30 +1936,37 @@ msgstr ""
 "(eller opdaterede) pakker.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - gennemfør søgning efter fuzzy (samme som -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list          - skriv tilgængelige pakker.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - list tilgængelige medier.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - list tilgængelige medier og deres url.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - list tilgængelige knuder ved brug af --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - list tilgængelige parallelle aliaser.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
@@ -1804,21 +1974,25 @@ msgstr ""
 "argumenter.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - næste pakke er en kildepakke (samme som -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - giv alle kildepakker før hentning (kun root).\n"
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - tillad at spørge efter rpm'er for forskellige "
 "arkitekturer.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1826,63 +2000,77 @@ msgstr ""
 "  --use-distrib  - konfigurér urpmi løbende fra et distrib-træ.\n"
 "              Dette muliggør at spørge efter en distro.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - udskriv ændringslog.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - skriv resumé.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - færdiggør uddata med pakke der skal fjernes.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - udvid forespørgsel til pakkeafhængigheder.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - udskriv også grupper med navn.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - udskriv nyttig information på læsevenlig form.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l..          - udskriv filer i pakken.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - søg ikke i 'provides' for at finde pakke (standard).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - søg i 'provides' for at finde pakke.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - udskriv også version og udgave med navn.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - omvendt søgning til hvad der kræver pakke.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR            - udvidet omvendt søgning (inklusive virtuelle pakker).\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - næste pakke er en kildepakke (samme som --src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
@@ -1890,37 +2078,123 @@ msgstr ""
 "  -u             - fjern pakke hvis en nyere version allerede er "
 "installeret.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - gennemfør upræcis søgning (samme som --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - som -y, men tvinger matchning uden forske på små og store "
 "bogstaver.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  navne eller rpm-filer givne på kommandolinjen bliver forespurgt.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes kan kun bruges med --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "overspringer medie %s: ingen hdlist"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Ingen filliste fundet\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Ingen ændringslog fundet\n"
 
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "mput mislykkedes, måske kan en node ikke nås"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr "node %s har en gammel version af urpme, venligst opgradér"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "rshp mislykkedes, måske kan en node ikke nås"
+
+#~ msgid "on node %s"
+#~ msgstr "på node %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Spreder syntese til noder..."
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "Løser afhængigheder på noder..."
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Distribuerer filer til noder..."
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Tjekker at installation er mulig på noder..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Installationen fejlede for maskine %s"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Installerer pakker på maskiner..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "scp mislykkedes på vært %s (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "Spreder syntese til %s..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "Løser afhængigheder på %s..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "vært %s har ikke en god version af urpmi (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "distribuerer filer til %s..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "Tjekker at installation er mulig på %s..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Udfører installering på %s..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "installerer %s på %s"
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Forbereder installation på %s..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "For at tilfredsstille afhængigheder vil den følgende pakke blive "
+#~ "installeret "
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr ""
+#~ "  --probe-synthesis forsøg at finde og bruge syntese- eller hdlist-fil.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - forsøg at finde og bruge hdlist-fil.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "'with' mangler for netværks-medie\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "ukendte valg '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "ukendt protokol defineret for %s"
 
diff --git a/po/de.po b/po/de.po
index a1450c84..26967e9e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-12-18 11:26+0100\n"
 "Last-Translator: Nicolas Bauer <rastafarii@mandrivauer.de>\n"
 "Language-Team: deutsch\n"
@@ -17,7 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "RPM Installation"
 
@@ -26,7 +27,8 @@ msgstr "RPM Installation"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Fehler: kann die Datei %s nicht finden, Vorgang wird abgebrochen"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_OK"
 
@@ -82,20 +84,23 @@ msgstr ""
 "\n"
 "Vielleicht bevorzugen Sie es nur zu speichern. Was ist Ihre Wahl?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Installieren"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Wähle Speicherort aus"
 
@@ -105,18 +110,21 @@ msgid "Unknown option %s"
 msgstr "Unbekannte Option %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Keine Pakete angegeben"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Bitte warten..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Muss root sein"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -127,35 +135,42 @@ msgstr ""
 "%s\n"
 "Wollen Sie trotzdem fortfahren?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (zu aktualisieren)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (zu installieren)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Paketwahl"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Eines der folgenden Pakete wird benötigt:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Abbruch"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -167,7 +182,7 @@ msgstr ""
 "%s\n"
 "Wollen Sie trotzdem fortfahren?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -178,25 +193,27 @@ msgstr ""
 "installiert:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Paketinstallation ..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Ich kann die Quellpakete nicht finden, Abbruch"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, 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“"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Holen des Pakets „%s“ ..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -209,8 +226,7 @@ msgstr ""
 "\n"
 "Wollen Sie die Installation fortsetzen ?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -221,35 +237,38 @@ msgstr ""
 "%s\n"
 "Sie sollten Ihre urpmi-Datenbank aktualisieren"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "Entferne %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Vorbereiten ..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installieren des Pakets „%s“ (%s/%s) ..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Die Installation schlug Fehl"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Fertig"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Alles bereits installiert"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Installation beendet"
 
@@ -263,18 +282,22 @@ msgstr ""
 "wobei [Optionen] sind von\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - Diese Hilfe-Botschaft anzeigen.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   -root <path>  - benutze den gegebenen root, anstelle von /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [group]     - beschränke Ausgabe auf angegebene Gruppe.\n"
 
 #: ../rpm-find-leaves:19
+#, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - Voller RPM Name (NVRA)\n"
 
@@ -283,209 +306,127 @@ msgstr "   -f             - Voller RPM Name (NVRA)\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    Voreinstellung ist %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Nur der Systemadministrator darf Pakete installieren"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Urpmi läuft im eingeschränkten Modus..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "Ich kann deie RPM-Datei kann nicht öffnen"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Ungültiger RPM Name [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "Holen des RPMs [%s]..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...Holen fertig"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...Holen fehlgeschlagen: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Ich habe keinen Zugriff auf die RPM-Datei [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "Nicht möglich spec file %s [%s] zu parsen"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "Ich kann die RPM-Datei nicht registrieren"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Nicht kompatible Architektur für RPM [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "Fehler bei der Registrierung lokaler Pakete"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Diese Funktion ist während des eingeschränkten Modus verboten"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "Ungültige Proxyangabe als Kommandozeilenparameter\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot Verzeichnis existiert nicht"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Sie müssen als \"root\" angemeldet sein, um --use-distrib zu nutzen"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: Ich kann das RPM „%s“ nicht lesen.\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Es ist nicht möglich %s ohne %s zu verwenden"
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, fuzzy, c-format
+msgid "Can't use %s with %s"
+msgstr "Es ist nicht möglich %s ohne %s zu verwenden"
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "zu viele Argumente\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "Nn"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Eine schlechte Wahl, versuchen Sie es erneut\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "mput fehlgeschlagen, vielleicht ist ein Knotenpunkt nicht erreichbar"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "Knotenpunkt %s hat eine alte urpme Version, bitte aktualisieren"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "rshp fehlgeschlagen, vielleicht ist ein Knotenpunkt nicht erreichbar"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "auf Knotenpunkt %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Verbreite Synthese auf Knotenpunkten..."
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "Löse Abhängigkeiten auf Knotenpunkten auf..."
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Verteile Synthese an Knotenpunkte..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Überprüfe ob Installation auf Knotenpunkten möglich..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "Die Installation schlug auf Knotenpunkt %s fehl"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Die Installation ist möglich"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Installiere Pakete auf Knotenpunkten..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "scp fehlgeschlagen auf Host %s (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "Verbreite Synthese nach %s..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "Löse Abhängigkeiten auf %s auf..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "Host %s hat keine passende Version von urpmi (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "Verteile Dateien auf %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "Überprüfe ob Installation auf %s möglich ist..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "Führe Installation auf %s aus..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "Installiere %s auf %s..."
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "Bereite Installation auf %s vor..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -503,44 +444,63 @@ msgstr ""
 "\n"
 "Verwendung:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - Diese Hilfe-Botschaft anzeigen.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - Automatische Auswahl bei mehren Möglichkeiten.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - verifiziere, ob die Entfernung korrekt verlaufen wird.\n"
+msgstr ""
+"  --test         - verifiziere, ob die Entfernung korrekt verlaufen wird.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - Erzwinge Aufruf, sogar wenn einige Pakete nicht "
 "existieren.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 " --parallel     - verteilter urpmi Aufruf auf allen teilnehmenden\n"
 "                  Maschinen.\n"
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - neupacken vor dem Löschen\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - benutze anderes Wurzelverzeichnis zur RPM Entfernung.\n"
+msgstr ""
+"  --root         - benutze anderes Wurzelverzeichnis zur RPM Entfernung.\n"
 
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - benutze anderes Wurzelverzeichnis zur RPM Installation.\n"
+
+#: ../urpme:52
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - Paket-Skripte nicht ausführen.\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
@@ -548,75 +508,81 @@ msgstr ""
 "  --use-distrib  - Konfiguriere urpme von einem distrib Baum, nützlich\n"
 "                  um einen chroot mit --root Option zu (de)installieren.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - Versuche Synthese-Datei zu nutzen.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - versuche HD-Listen-Datei zu nutzen.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - ausführlicher Modus.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - ausführlicher Modus.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - wähle alle Pakete, die dem Ausdruck gleichen.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Nur der Systemadministrator darf Pakete entfernen"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "unbekanntes Paket"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "unbekannte Pakete "
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "unbekanntes Paket"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Die folgenden Pakete enthalten „%s“: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "Das Entfernen des Pakets %s macht Ihr System unbrauchbar"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Nichts zu entfernen"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Überprüfe das Entfernen folgender Pakete"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
-msgid "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+msgid ""
+"To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "Um die Abhängigkeiten zu erfüllen, werden die folgenden %d Pakete entfernt (%"
 "d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (j/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "Entfernen des Pakets %d?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Entfernen schlug fehl"
 
@@ -638,214 +604,265 @@ msgstr ""
 "Verwendung: urpmf [Optionen] Muster-Ausdruck\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - Ausgabe der Versionsnummer dieses Tools.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - Verwende ein besondere Umgebung (Etwa zur\n"
 "                   Erstellung von Fehlerberichten).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - Benutze keine durch Kommata getrennte Medienliste.\n"
+msgstr ""
+"  --excludemedia - Benutze keine durch Kommata getrennte Medienliste.\n"
 
 #: ../urpmf:39
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 "  --literal, -l  - passe die Schablone nicht an, sondern benutze es als "
 "string\n"
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - Benutze nur durch Kommata getrennte Medienliste.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - sortiere Medien gemäß der Substrings getrennt durch "
 "Kommata.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - Verwende die angegebene Synthese-Datei anstelle\n"
 "                   der urpmi-DB.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - keine identischen Zeilen ausgeben.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - ausführlicher Modus.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - ignoriere Fallunterscheidungen in jedem Muster.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - ignoriere Fallunterscheidungen in jedem Muster "
 "(standart).\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - ändert den Feldtrenner (Voreinstellung ':').\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "Musterausdrücke:\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - jeder Text wird als regulärer Ausdruck geparst, bis -l "
 "benutzt wird.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - beziehe Perl Code direkt als perl -e ein.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binärer UND operator.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o              - binärer ODER Operator.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unäres NICHT.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - linke und rechte Klammern.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "Liste der Markierungen:\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - angeben eines printf-ähnlichen Ausgabeformats\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   Beispiel: '%%name:%%files'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - Architektur\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    -  Build host.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - build Zeit\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - Konfigurationsdateien\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - Steht in Konflikt mit.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - Paketbeschreibung\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - Distribution\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - Epoche\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - Dateiname des Pakets\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - Liste der Dateien, die in dem Paket enthalten sind\n"
+msgstr ""
+"  --files        - Liste der Dateien, die in dem Paket enthalten sind\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - Gruppe\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - Paketname\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - Veraltet.\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     -  Packer.\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - Stellt zur Verfügung\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - Benötigt\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - Größe\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - Quell RPM Name.\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - Zusammenfassung\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - Hersteller\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - das Mediium, in welchem das Paket gefunden wurde\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - Ausgabe von Version, Release und Architektur mit dem "
 "Namen.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Fehlerhaftes Format: Sie können nur ein mehrfach Zweig anhängen"
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "nutze spezielle Umgebung für %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -853,11 +870,12 @@ msgstr ""
 "Anmerkung: Weil kein durchsuchtes Medium HD-Listen benutzt, war urpmf nicht "
 "in der Lage Resultate zu liefern\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Sie können --name zum Suchen von Paketname nutzen.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -874,13 +892,16 @@ msgstr ""
 "\n"
 "Verwendung:\n"
 
-#: ../urpmi:92
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+#: ../urpmi:88
+#, c-format
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - verwende nur die gegebenen Medien um nach der "
 "angeforderten Paketen zu suchen\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
@@ -888,13 +909,33 @@ msgstr ""
 "  --auto         - nicht-interaktiver Modus, vorgegebene Antworten werden "
 "bei Fragen angenommen.\n"
 
-#: ../urpmi:96 ../urpmq:54
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:92 ../urpmq:54
+#, c-format
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - Automatische Paketauswahl zur Aktualisierung des "
 "Systems.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - Automatische Paketauswahl zur Aktualisierung des "
+"Systems.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deaktiviere MD5SUM Dateiüberprüfung.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - erzwinge Update auf gpg Schlüssel.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -902,11 +943,13 @@ msgstr ""
 "  --no-uninstall - niemals fragen bei Paketdeinstallation, Installation "
 "abbrechen.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - installiere keine Pakete (nur herunterladen).\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -915,7 +958,7 @@ msgstr ""
 "angefragte\n"
 "                   Pakete ab, die zu einer Deinstallation führen.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -926,32 +969,38 @@ msgstr ""
 "                   Pakete installiert oder upgegraded werden,\n"
 "                   Voreinstellung ist %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - kleine Länge der Vorgänge, Voreinstellung ist %d.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - unscharfe Suche erzwingen.\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s      - nächstes Paket ist ein Source Paket.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - installiere nur Quellpakete (keine Binärpakete).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - leert zu Begeinn den RPM-Cache.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - belasse unverwendete RPMs im Cache.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -959,7 +1008,8 @@ msgstr ""
 "  --allow-nodeps - Erlaube Anwenderbefragung zur Paketinstallation\n"
 "                   ohne Abhängigkeitskontrolle.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -967,11 +1017,14 @@ msgstr ""
 "  --allow-force  - Erlaube Anwenderbefragung zur Paketinstallation\n"
 "                   ohne Abhängigkeits- und Integritätskontrolle.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - benutze anderes Wurzelverzeichnis zur RPM Installation.\n"
+msgstr ""
+"  --root         - benutze anderes Wurzelverzeichnis zur RPM Installation.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -979,41 +1032,52 @@ msgstr ""
 "  --use-distrib  - konfiguriere urpmi von einem distrib Baum, nützlich\n"
 "                   zum Installieren eines chroot mit --root Option.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - Benutze wget um entfernte Dateien zu laden.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - Benutze curl um entfernte Dateien zu laden.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - Benutze curl um entfernte Dateien zu laden.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
-msgstr "  --curl-options - zusätzliche Optionen, die an curl weitergeleitet werden\n"
+msgstr ""
+"  --curl-options - zusätzliche Optionen, die an curl weitergeleitet werden\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
-msgstr "  --rsync-options- zusätzliche Optionen, die an rsync weitergeleitet werden\n"
+msgstr ""
+"  --rsync-options- zusätzliche Optionen, die an rsync weitergeleitet werden\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
-msgstr "  --wget-options - zusätzliche Optionen, die an wget weitergeleitet werden\n"
+msgstr ""
+"  --wget-options - zusätzliche Optionen, die an wget weitergeleitet werden\n"
 
 #: ../urpmi:127
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
-msgstr "  --curl-options - zusätzliche Optionen, die an curl weitergeleitet werden\n"
+msgstr ""
+"  --curl-options - zusätzliche Optionen, die an curl weitergeleitet werden\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - schränke die Dowloadgeschwindigkeit ein.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1022,7 +1086,8 @@ msgstr ""
 "fort\n"
 "                   (--no-resume deaktiviert es, Vorgabe ist deaktiviert).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1030,7 +1095,8 @@ msgstr ""
 "  --proxy        - Verwende einen HTTP Proxy, als Standard-Portnummer\n"
 "                   wird 1080 angenommen (Format: <ProxyRechner[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1040,6 +1106,7 @@ msgstr ""
 "                   (Format: <Benutzerkennzeichen:Passwort>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1048,6 +1115,7 @@ msgstr ""
 "                   Argument angegebenen Ordner.\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1057,46 +1125,49 @@ msgstr ""
 "                   Voreingestellt: Kontrolle der Signaturen).\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
-msgstr "  --test         - Versuch, ob die Installation korrekt verlaufen wird.\n"
+msgstr ""
+"  --test         - Versuch, ob die Installation korrekt verlaufen wird.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - schließe durch Kommata getrennte Pfade aus.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - Schließe Dokumentationsdateien aus.\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --ignoresize   - nicht vor Installation den Festplattenplatz prüfen.\n"
+msgstr ""
+"  --ignoresize   - nicht vor Installation den Festplattenplatz prüfen.\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - ermöglicht das installieren von RPMs für andere "
 "Achitekturen\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - Paket-Skripte nicht ausführen\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - deaktiviere MD5SUM Dateiüberprüfung.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - erzwinge Update auf gpg Schlüssel.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
-msgstr "  --skip         - Pakete deren Installation übersprungen werden soll\n"
+msgstr ""
+"  --skip         - Pakete deren Installation übersprungen werden soll\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1105,44 +1176,56 @@ msgstr ""
 "Möglichkeiten vor\n"
 "                   als  die Vorgabe.\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - Die RPM-Datenbank nicht sperren.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
-msgstr "  --strict-arch  - Updaten Pakete, welche die selbe Architektur sind.\n"
+msgstr ""
+"  --strict-arch  - Updaten Pakete, welche die selbe Architektur sind.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - Wähle alle Treffer in der Kommandozeile.\n"
 "\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - Erlaube Suche in „Stellt zur Verfügung“ nach einem "
 "Paket.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - nicht in „Stellt zur Verfügung“ nach dem Paket suchen.\n"
+msgstr ""
+"  -P             - nicht in „Stellt zur Verfügung“ nach dem Paket suchen.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - stiller Modus.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  Namen oder RPM-Dateien von der Kommandozeile werden installiert.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Fehler: Es ist nicht möglich --auto-select weiter mit der Paketliste zu verwenden.\n"
+msgstr ""
+"Fehler: Es ist nicht möglich --auto-select weiter mit der Paketliste zu "
+"verwenden.\n"
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
@@ -1150,13 +1233,14 @@ msgstr ""
 "Fehler: Um ein Fehlermeldung zu erstellen bitte die Kommandozeile verwenden\n"
 "mit --bug.\n"
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 "Sie können keine binären RPM-Dateien installieren, wenn --install-src "
 "genutzt wird"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1165,21 +1249,22 @@ msgstr ""
 "Verzeichnis [%s] existiert bereits, bitte nutzen Sie ein anderes Verzeichnis "
 "für Fehlerberichte oder löschen Sie dieses"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Konnte das Verzeichnis [%s] für die Fehlerberichte nicht anlegen"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Kopieren fehlgeschlagen"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "Das angegebene Verzeichnis %s existiert nicht"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1188,52 +1273,59 @@ msgstr ""
 "Fehler: %s scheint nur lesbar gemountet zu sein.\n"
 "Benutzen Sie --allow-force um eine Operation zu erzwingen."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "Aktualisiere Medien...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s %s (zu aktualisieren)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (zu aktualisieren)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s %s (zu installieren)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (zu installieren)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ihre Wahl? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Das folgende Paket kann nicht installiert werden, wegen der Abhänigkeit\n"
+"da sie älter sind als die Installierten:\n"
+"%s"
+msgstr[1] ""
 "Das folgende Paket kann nicht installiert werden, wegen der Abhänigkeit\n"
 "da sie älter sind als die Installierten:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1241,59 +1333,86 @@ msgstr ""
 "\n"
 "Wollen Sie trotzdem fortfahren?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Einige der gewünschten Pakete können nicht installiert werden:\n"
+"%s"
+msgstr[1] ""
 "Einige der gewünschten Pakete können nicht installiert werden:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Die Installation kann nicht fortgesetzt werden, da folgende\n"
+"Pakete entfernt werden müssen, um die Aktualisierungen \n"
+"durchführen zu können:\n"
+"%s\n"
+msgstr[1] ""
 "Die Installation kann nicht fortgesetzt werden, da folgende\n"
 "Pakete entfernt werden müssen, um die Aktualisierungen \n"
 "durchführen zu können:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Die folgenden Pakete müssen entfernt werden, um die Aktualisierungen \n"
+"durchführen zu können:\n"
+"%s"
+msgstr[1] ""
 "Die folgenden Pakete müssen entfernt werden, um die Aktualisierungen \n"
 "durchführen zu können:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(nur ein Test, das Entfernen wird nicht wirklich durchgeführt)"
 
-#: ../urpmi:572 ../urpmi:584
-msgid "To satisfy dependencies, the following packages are going to be installed"
-msgstr "Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert"
-
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Um die Abhängigkeiten zu erfüllen, wird das folgende Paket installiert"
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert"
+msgstr[1] ""
+"Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert"
 
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d Pakete, %d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1303,88 +1422,106 @@ msgstr ""
 "können:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(nur ein Test, es wird keine wirkliche Installation durchgeführt)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "Fortfahren mit der Installation der %d Pakete? (%d MB)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "Fortfahren mit der Installation der %d Pakete? (%d MB)"
+msgstr[1] "Fortfahren mit der Installation der %d Pakete? (%d MB)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Betätigen Sie die Return-Taste, sobald Sie soweit sind ..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Folgenden Pakete haben inkorrekte Signaturen"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Folgenden Pakete haben inkorrekte Signaturen"
+msgstr[1] "Folgenden Pakete haben inkorrekte Signaturen"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Wollen Sie die Installation fortsetzen?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "Verteile %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "Installiere %s von %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "Installiere %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "Installation fehlgeschlagen:"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Soll ich eine Installation ohne Abhängigkeitstest versuchen? (j/N) "
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Soll ich eine Installation erzwingen (--force)? (j/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d Installation schlugen Fehl"
 
-#: ../urpmi:824
-msgid "Packages are up to date"
-msgstr "Pakete sind auf dem aktuellen Stand"
-
-#: ../urpmi:827
+#: ../urpmi:828
 #, c-format
-msgid "Packages %s are already installed"
-msgstr "Paket %s ist installiert"
+msgid "Installation is possible"
+msgstr "Die Installation ist möglich"
 
-#: ../urpmi:828
+#: ../urpmi:833
 #, c-format
+msgid "Packages are up to date"
+msgstr "Pakete sind auf dem aktuellen Stand"
+
+#: ../urpmi:840
+#, fuzzy, c-format
 msgid "Package %s is already installed"
-msgstr "Paket %s ist installiert"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Paket %s ist installiert"
+msgstr[1] "Paket %s ist installiert"
+
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Paket %s ist installiert"
+msgstr[1] "Paket %s ist installiert"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "starte urpmi neu"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1407,26 +1544,34 @@ msgstr ""
 "und [Optionen] aus\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - Erstellen eines Aktualisierungsmediums.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - Versuche Synthese-Datei zu finden und zu nutzen.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
+msgstr "  --probe-synthesis - Versuche Synthese-Datei zu nutzen.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - versuche HD-Listen-Datei zu finden und zu benutzen.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
+msgstr "  --probe-hdlist - versuche HD-Listen-Datei zu nutzen.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - versuche keine Synthese-Datei oder\n"
 "                   HD-Liste zu finden.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1434,17 +1579,19 @@ msgstr ""
 "  --distrib      - automatisch alle Medien von einem Installations-Medium\n"
 "                   erzeugen.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - mit --distrib, fragt bei jedem Medium nach einer "
 "Bestätigung\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - mit --distrib. add jedes aufgeführte Medium.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1454,7 +1601,8 @@ msgstr ""
 "Vorgabe ist\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1462,48 +1610,71 @@ msgstr ""
 "  --virtual      - erstelle virtuelle Medien, welche immer aktuell sind,\n"
 "                   nur das file:// Protokoll ist erlaubt.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deaktiviere MD5SUM Dateiüberprüfung.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
-msgstr "  --nopubkey     - den Pubkey vom hinzugefügten Medium nicht importieren\n"
+msgstr ""
+"  --nopubkey     - den Pubkey vom hinzugefügten Medium nicht importieren\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - Medien zur Konfiguration hinzufügen ohne sie zu "
 "aktualisieren.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - Löschen des Header-Verzeichnisses.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - Erzwinge das Erstellen einer HD-Liste.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - stiller Modus.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - ausführlicher Modus.\n"
+
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "Ich kann das Medium „%s“ nicht aktualisieren.\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Nur der Systemadministrator darf Medien hinzufügen"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Wird die Konfigurationsdatei erzeugen [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Kann Konfigurationsdatei [%s] nicht erzeugen"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "nicht erforderlich, <relativer Pfad zur HD-Liste> anzugeben mit --distrib"
+msgstr ""
+"nicht erforderlich, <relativer Pfad zur HD-Liste> anzugeben mit --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1512,16 +1683,17 @@ msgstr ""
 "\n"
 "Medium wirklich hinzufügen '%s'"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<relativer Pfad zur HD-Liste> fehlt.\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "`with' fehlt für Netzwerk Medien.\n"
+#: ../urpmi.addmedia:169
+#, fuzzy, c-format
+msgid "Can't use %s with remote medium"
+msgstr "Es ist nicht möglich %s ohne %s zu verwenden"
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "Ich kann das Medium „%s“ nicht anlegen.\n"
@@ -1544,28 +1716,37 @@ msgstr ""
 "Verwendung:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - beginnt jetzt mit dem Neupacken\n"
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - belasse unverwendete RPMs im Cache.\n"
 
-#: ../urpmi.recover:36
-msgid "  --list         - list transactions since provided date/duration argument\n"
-msgstr "  --list         - führt alles Transaktionen seit dem Datum/Argument auf\n"
-
 #: ../urpmi.recover:37
-msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-all     - listet alle Transaktionen in der rpmdb auf (lang).\n"
+#, c-format
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
+msgstr ""
+"  --list         - führt alles Transaktionen seit dem Datum/Argument auf\n"
 
 #: ../urpmi.recover:38
+#, c-format
+msgid "  --list-all     - list all transactions in rpmdb (long)\n"
+msgstr ""
+"  --list-all     - listet alle Transaktionen in der rpmdb auf (lang).\n"
+
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr ""
 "  --list-safe    - listet die Transaktionen seit dem letzten "
 "Wiederherstellungspunkt auf.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
@@ -1573,126 +1754,129 @@ msgstr ""
 "  --rollback     - Wiederholt bis zum angegebenen Datum\n"
 "                   oder Wiederholt die angegebene Anzahl an Transaktionen\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - abschalten des Neupackens\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "Fehlerhaftes Datum oder Laufzeit [%s]\n"
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr "Neu zu packendes Verzeichnis nicht definiert\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "Kann nicht in das neuzupackende Verzeichnis [%s] schreiben\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "Aufräumen des RPM-Zwischenspeichers [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "%d Datei verschoben\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "Falsches Kommandozeilen Argument [%s]\n"
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 "Es ist nicht möglich festzulegen --checkpoint und --rollback zur selben Zeit "
 "zu verwenden\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 "Es ist nicht möglich festzulegen --checkpoint und --list zur selben Zeit zu "
 "verwenden\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 "Es ist nicht möglich festzulegen --rollback und --list zur selben Zeit zu "
 "verwenden\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "Es ist nicht möglich --disable mit einer anderen Option zu kombinieren"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "Keine Transaktion seit %s gefunden\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "Superuser Rechte sind dafür nötig"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Schreiben des RPM macro file [%s]...\n"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr "Kein Wiederherstellungspunk gefunden\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "Wiederholen bis %s...\n"
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr "Deaktiviere das neu Packen\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "Verwendung: urpmi.removemedia [-a] <Name> ...\n"
 "Wobei <Name> das zu entfernende Medium ist.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - Alle Medien auswählen.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - fuzzy match on media names.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"Unbekannte Optionen „%s“\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Nur der Systemadministrator darf Medien entfernen"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "Es gibt nichts zu entfernen (verwenden Sie „urpmi.addmedia“, \n"
 "um neue Medien hinzuzufügen)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1702,6 +1886,7 @@ msgstr ""
 "(eins aus %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1710,32 +1895,50 @@ msgstr ""
 "Wobei <Name> das zu aktualisierende Medium ist.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - erzwinge Update auf gpg Schlüssel.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
-msgstr "  --ignore       - nicht aktualisieren, markiere die Medien als ignoriert.\n"
+msgstr ""
+"  --ignore       - nicht aktualisieren, markiere die Medien als ignoriert.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
-msgstr "  --no-ignore    - nicht aktualisieren, markiere die Medien als aktiv.\n"
+msgstr ""
+"  --no-ignore    - nicht aktualisieren, markiere die Medien als aktiv.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - Wählt alle nicht entfernbaren Medien.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - Erzwinge das Erstellen einer HD-Liste.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Nur der Systemadministrator darf Medien aktualisieren"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "Es gibt nichts zu aktualisieren (verwenden Sie „urpmi.addmedia“, \n"
 "um neue Medien hinzuzufügen)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1744,21 +1947,21 @@ msgstr ""
 "Was soll aktualisiert werden?\n"
 "(eins aus %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "„%s“"
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "Aktiviere das Medium %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignoriere Medium %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "Aktiviere das Medium %s"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1777,6 +1980,7 @@ msgstr ""
 "Verwendung:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1785,54 +1989,67 @@ msgstr ""
 "angeforderten Paketen zu suchen (oder upzudaten).\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - unscharfe Suche erzwingen (identisch zu „-y“).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list          - Alle verfügbaren Pakete auflisten.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media    - Alle verfügbaren Medien auflisten.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - Führe aktuelle Medien und ihre URL auf.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes    - Alle  für „--parallel“ verfügbaren Knoten\n"
 "                    auflisten.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases  - Alle verfügbaren Aliase auflisten.\n"
 
 #: ../urpmq:63
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+#, c-format
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - verwerfe die Konfiguration in der Form eines urpmi."
 "addmedia Argumentes.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - es folgt ein Quellpaket (identisch zu „-s“).\n"
 
 #: ../urpmq:65
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - Gib alle Quellpakete vor dem Runterladen an (nur root).\n"
 ".\n"
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - erlaubt die Abfrage von RPMs für     andere "
 "Architekturen\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1840,61 +2057,79 @@ msgstr ""
 "  --use-distrib  - konfiguriere urpmi von einem distrib Baum.\n"
 "                   Das erlaubt eine Distribution zu befragen.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - Gebe Changelog aus.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary       - Zusammenfassung ausgeben.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - komplette Ausgabe von zu entfernenden Paketen.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - Erweitere Anfrage auf Paket-Abhängigkeiten.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - Ausgabe der Gruppe mit dem Namen.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - Ausgabe von nützlichen Informationen in lesbarer Form.\n"
+msgstr ""
+"  -i             - Ausgabe von nützlichen Informationen in lesbarer Form.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - Dateien des Paketes auflisten.\n"
 
-#: ../urpmq:90
-msgid "  -P             - do not search in provides to find package (default).\n"
-msgstr "  -P             - keine Suche in provides um Pakete zu finden (default).\n"
+#: ../urpmq:93
+#, c-format
+msgid ""
+"  -P             - do not search in provides to find package (default).\n"
+msgstr ""
+"  -P             - keine Suche in provides um Pakete zu finden (default).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - Suche in provides um Pakete zu finden.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - Ausgabe von Version und Release mit dem Namen.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - umgekehrte Suche nach Paketabhängigkeiten.\n"
 
-#: ../urpmq:94
-msgid "  -RR            - extended reverse search (includes virtual packages).\n"
+#: ../urpmq:97
+#, c-format
+msgid ""
+"  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR            - erweiterte umgekehrte Suche (beinhaltet virtuelle "
 "Pakete).\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - es folgt ein Quellpaket (identisch zu „--src“).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
@@ -1902,36 +2137,124 @@ msgstr ""
 "  -u             - Entferne Paket wenn bereits eine aktuellere Version "
 "installiert ist.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - unscharfe Suche erzwingen (identisch zu „--fuzzy“).\n"
+msgstr ""
+"  -y             - unscharfe Suche erzwingen (identisch zu „--fuzzy“).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - wie -y, aber erzwingt eine großschreibungsunabhängige "
 "Schreibweise.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  Namen oder rpm-Dateien, die auf der Kommandozeile angegeben wurden werden "
 "abgefragt.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes kann nur mit --parallel benutzt werden"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "überspringe Medium %s: keine HD-Liste"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Keine Dateiliste gefunden\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Kein Changelog gefunden\n"
 
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr ""
+#~ "mput fehlgeschlagen, vielleicht ist ein Knotenpunkt nicht erreichbar"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr "Knotenpunkt %s hat eine alte urpme Version, bitte aktualisieren"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr ""
+#~ "rshp fehlgeschlagen, vielleicht ist ein Knotenpunkt nicht erreichbar"
+
+#~ msgid "on node %s"
+#~ msgstr "auf Knotenpunkt %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Verbreite Synthese auf Knotenpunkten..."
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "Löse Abhängigkeiten auf Knotenpunkten auf..."
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Verteile Synthese an Knotenpunkte..."
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Überprüfe ob Installation auf Knotenpunkten möglich..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Die Installation schlug auf Knotenpunkt %s fehl"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Installiere Pakete auf Knotenpunkten..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "scp fehlgeschlagen auf Host %s (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "Verbreite Synthese nach %s..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "Löse Abhängigkeiten auf %s auf..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "Host %s hat keine passende Version von urpmi (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Verteile Dateien auf %s..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "Überprüfe ob Installation auf %s möglich ist..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Führe Installation auf %s aus..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "Installiere %s auf %s..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Bereite Installation auf %s vor..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "Um die Abhängigkeiten zu erfüllen, wird das folgende Paket installiert"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr ""
+#~ "  --probe-synthesis - Versuche Synthese-Datei zu finden und zu nutzen.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr ""
+#~ "  --probe-hdlist - versuche HD-Listen-Datei zu finden und zu benutzen.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "`with' fehlt für Netzwerk Medien.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Unbekannte Optionen „%s“\n"
diff --git a/po/el.po b/po/el.po
index a7b7ea4b..7c51ea3e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-03-04 12:15+0200\n"
 "Last-Translator: Theophanis Mastakas <mastakas@otenet.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -23,7 +23,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "Εγκατάσταση RPM"
 
@@ -32,7 +33,8 @@ msgstr "Εγκατάσταση RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Εντάξει"
 
@@ -90,20 +92,23 @@ msgstr ""
 "\n"
 "Μπορεί να προτιμάτε απλά να το αποθηκεύσετε. Ποια είναι η επιλογή σας;"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Εγκατάσταση"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Αποθήκευση"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Ακύρωση"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Επιλογή τοποθεσίας για αποθήκευση αρχείου"
 
@@ -113,18 +118,21 @@ msgid "Unknown option %s"
 msgstr "Άγνωστη επιλογή %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Δεν ορίστηκαν πακέτα"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Παρακαλώ περιμένετε..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Πρέπει να είστε διαχειριστής"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -135,35 +143,42 @@ msgstr ""
 "%s\n"
 "Συνέχεια εγκατάστασης ;"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Εντάξει"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Προσοχή"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Εντάξει"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (προς αναβάθμιση)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (προς εγκατάσταση)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ένα εκ των παρακάτω πακέτων απαιτείται:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Ματαίωση"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -174,7 +189,7 @@ msgstr ""
 "%s\n"
 "Συνέχεια εγκατάστασης;"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -185,25 +200,27 @@ msgstr ""
 "εγκατασταθούν:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Εγκατάσταση πακέτου..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "αδυναμία λήψης των πακέτων πηγαίου κώδικα, ματαίωση"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Παρακαλώ βάλτε το μέσο με όνομα \"%s\" στη συσκευή [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Λήψη πακέτου `%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -217,8 +234,7 @@ msgstr ""
 "\n"
 "Θέλετε να συνεχίσετε την εγκατάσταση ;"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -229,35 +245,38 @@ msgstr ""
 "%s\n"
 "Ίσως θέλετε να αναβαθμίσετε τη βάση δεδομένων urpmi"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "αφαίρεση %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Προετοιμασία..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Εγκατάσταση πακέτου `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Η εγκατάσταση απέτυχε"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Ολοκληρώθηκε"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Η εγκατάσταση τελείωσε"
 
@@ -271,20 +290,23 @@ msgstr ""
 "όπου [επιλογές] είναι από\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - τύπωσε αυτό το μήνυμα βοήθειας.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr ""
 "   --root <path>  - χρήση της root διαδρομής που δόθηκε αντί για την /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [group]     - περιορισμένα αποτελέσματα στην ομάδα που δόθηκε.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -q             - σιωπηλή λειτουργία.\n"
 
@@ -293,209 +315,126 @@ msgstr "  -q             - σιωπηλή λειτουργία.\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    προκαθορισμένο είναι το %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Μόνο ο διαχειριστής επιτρέπεται να εγκαταστήσει πακέτα"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "αδυναμία ανοίγματος του rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "μη έγκυρο όνομα αρχείου rpm [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "ανάκτηση αρχείου rpm [%s] ..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...η ανάκτηση ολοκληρώθηκε"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... η ανάκτηση απέτυχε: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "αδυναμία πρόσβασης στο αρχείο rpm [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "αδυναμία ανάλυσης του \"%s\" στο αρχείο [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "αδυναμία δήλωσης του αρχείου rpm"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "σφάλμα κατά την δήλωση των τοπικών πακέτων"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "μη ορθή διακήρυξη proxy στην γραμμή εντολών\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Πρέπει να είστε root για να κάνετε χρήση της εντολής ! \n"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: αδυναμία ανάγνωσης αρχείου rpm \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "ΟοNn"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "ΝνYy"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "Λυπάμαι, κακή επιλογή, προσπαθήστε ξανά\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
+#: ../urpm/args.pm:426
 #, c-format
-msgid "node %s has an old version of urpme, please upgrade"
+msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr ""
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "Η εγκατάσταση απέτυχε στον κόμβο %s"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Η εγκατάσταση είναι δυνατή"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Εγκατάσταση πακέτων στους κόμβους..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
+#: ../urpm/args.pm:440
 #, c-format
-msgid "scp failed on host %s (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "εξέταση αρχείου σύνθεσης [%s]"
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "Κατανομή αρχείων στο %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:267
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Performing install on %s..."
-msgstr "Εκτέλεση εγκατάστασης σε %s..."
+msgid "Nn"
+msgstr "ΟοNn"
 
-#: ../urpm/parallel_ssh.pm:281
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "Installing %s on %s..."
-msgstr "Εγκατάσταση %s σε %s..."
+msgid "Yy"
+msgstr "ΝνYy"
 
-#: ../urpm/parallel_ssh.pm:282
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Preparing install on %s..."
-msgstr "Προετοιμάζω εγκατάσταση σε %s...."
+msgid "Sorry, bad choice, try again\n"
+msgstr "Λυπάμαι, κακή επιλογή, προσπαθήστε ξανά\n"
 
 #: ../urpme:39
 #, c-format
@@ -514,49 +453,63 @@ msgstr ""
 "\n"
 "χρήση:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - τύπωσε αυτό το μήνυμα βοήθειας.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - αυτόματη επιλογή πακέτου κατ' επιλογήν.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - επαλήθευση ότι η αφαίρεση μπορεί να επιτευχθεί σωστά.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - εξαναγκάσμός επίκλησης ακόμα και εάν μερικά πακέτα δεν "
 "υπάρχουν.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel     - διανεμημένα urpmi κατά μήκος των μηχανών με ψευδώνυμα.\n"
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --packager     - "
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - χρήση διαφορετικής διαδρομής root για την αφαίρεση rpm.\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - χρησιμοποίηση μία άλλη διαδρομή root για την εγκατάσταση "
+"του rpm.\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description   - τύπωσε την ετικέτα περιγραφής: περιγραφή.\n"
 
-#: ../urpme:52
-#, fuzzy
+#: ../urpme:53
+#, fuzzy, 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"
@@ -565,65 +518,67 @@ msgstr ""
 "                   για την (απ)εγκατάσταση ενός chroot με την --root "
 "επιλογή.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
 "                    synthesis hdlist.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr ""
 "  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
 "                    synthesis hdlist.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - αναλυτική περιγραφή.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose             - αναλυτική λειτουργία.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - επιλογή όλων των πακέτων που ταιριάζουν με την έκφραση.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Μόνο ο διαχειριστής επιτρέπεται να αφαιρέσει πακέτα"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "άγνωστο πακέτο"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "άγνωστα πακέτα"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "άγνωστο πακέτο"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Τα παρακάτω πακέτα περιέχουν %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "η αφαίρεση του πακέτου %s θα καταστρέψει το σύστημά σας"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Τίποτα προς αφαίρεση"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Έλεγχος για την αφαίρεση των παρακάτω πακέτων"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
@@ -631,17 +586,18 @@ msgstr ""
 "Για να ικανοποιηθούν οι εξαρτήσεις, τα παρακάτω πακέτα %d θα αφαιρεθούν (%d "
 "MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (ν/Ο) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "Αφαίρεση πακέτων %d ;"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (ν/Ο) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Η αφαίρεση απέτυχε"
 
@@ -663,226 +619,262 @@ msgstr ""
 "χρήση:urpmf [επιλογές] μορφή-έκφραση (urpmf [options] pattern-expression\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --έκδοση         - τύπωσε τον αριθμό έκδοσης αυτού του εργαλείου\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - χρήση συγκεκριμένου περιβάλλοντος (τυπικά μία αναφορά\n"
 "                   σφάλματος).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - μην χρήση των μέσων που δόθηκαν, διαχωρισμένα με το "
 "κόμμα.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - χρήση των μέσων που δόθηκαν, διαχωρισμένα με το κόμμα.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - ταξινόμηση μέσων σύμφωνα με τα τμήματα λεκτικών "
 "διαχωρισμένα με το κόμμα.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - χρήση του synthesis που δίδεται αντί του urpmi db.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - μην τυπώσεις πανομοιότυπες γραμμές.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - χρήση μόνο των μέσων αναβάθμισης.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose             - αναλυτική λειτουργία.\n"
 
-#: ../urpmf:46
-#, fuzzy
+#: ../urpmf:47
+#, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i            - αγνόησε διάκριση πεζών-κεφαλαίων στα σχήματα.\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i            - αγνόησε διάκριση πεζών-κεφαλαίων στα σχήματα.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - συμπεριέλαβε κώδικα perl απευθείας σαν perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - δυαδικός AND τελεστής.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -ο             - δυαδικός OR τελεστής.\n"
 
-#: ../urpmf:54
-#, fuzzy
+#: ../urpmf:55
+#, fuzzy, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !                - unary NOT.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )              - αριστερή και δεξιά παρένθεση.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "Κατάλογος ετικετών:\n"
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --gf            - "
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    παράδειγμα: '%%name:%%files'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch        - αρχιτεκτονική\n"
 
-#: ../urpmf:60
-#, fuzzy
+#: ../urpmf:61
+#, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - τύπωσε την ετικέτα του buildhost: build host.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - αρχεία ρυθμίσεων\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - ετικέτες συγκρούσεων\n"
 
-#: ../urpmf:64
-#, fuzzy
+#: ../urpmf:65
+#, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - τύπωσε την ετικέτα περιγραφής: περιγραφή.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - .\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename      - όνομα αρχείου του πακέτου\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files          - λίστα αρχείων που περιέχονται στο πακέτο.\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - ομάδα\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - όνομα πακέτου\n"
 
-#: ../urpmf:71
-#, fuzzy
+#: ../urpmf:72
+#, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - ετικέτες των εκτός χρήση"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - δημιουργός πακέτου\n"
 
-#: ../urpmf:73
-#, fuzzy
+#: ../urpmf:74
+#, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 "  --provides     - τύπωσε την ετικέτα με τις παροχές: όλες οι παροχές.\n"
 
-#: ../urpmf:74
-#, fuzzy
+#: ../urpmf:75
+#, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 "  --requires     - τύπωσε την ετικέτα με τις εξαρτήσεις: όλες οι "
 "εξαρτήσεις.\n"
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - τύπωσε την ετικέτα του μεγέθους: μέγεθος.\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - όνομα πηγαίου rpm\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary       -  περίληψη.\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - κατασκευαστής\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - το μέσο στο οποίο βρέθηκε το πακέτο\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - τύπωσε την έκδοση, κυκλοφορίας και αρχιτεκτονικής με "
 "όνομα.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "χρήση συγκεκριμένου περιβάλλοντος στο %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -890,12 +882,13 @@ msgstr ""
 "Σημείωση: αφού δεν έγινε αναζήτηση σε κανένα μέσο που χρησιμοποιεί hdlists, "
 "το urpmf δεν μπόρεσε να επιστρέψει κανένα αποτέλεσμα\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr ""
 "Μπορείτε να χρησιμοποιήσετε --name για την αναζήτηση ονομάτων πακέτων.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -912,28 +905,48 @@ msgstr ""
 "\n"
 "χρήση:\n"
 
-#: ../urpmi:92
-#, fuzzy
+#: ../urpmi:88
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - χρήση μόνο των μέσων που δόθηκαν στην αναζήτηση των "
 "ζητούμενων (ή των αναβαθμιζόμενων) πακέτων.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - αυτόματη επιλογή πακέτων για την αναβάθμιση του "
 "συστήματος.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - αυτόματη επιλογή πακέτων για την αναβάθμιση του "
+"συστήματος.\n"
+
+#: ../urpmi:94
+#, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
+
+#: ../urpmi:95
+#, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr ""
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -941,11 +954,13 @@ msgstr ""
 "  --no-uninstall - μην ρωτήσεις για να απεγκαταστήσεις ένα πακέτο, διέκοψε "
 "την εγκατάσταση.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - μη εγκατάσταση πακέτων (μόνο λήψη)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -953,7 +968,7 @@ msgstr ""
 "  --keep         - κράτα τα υπάρχοντα πακέτα εάν είναι δυνατόν, reject\n"
 "                   τα ζητούμενα πακέτα που οδηγούν σε αφαίρεση.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -961,40 +976,44 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:105
-#, fuzzy
+#: ../urpmi:104
+#, fuzzy, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr ""
 "  --src, -s       - το επόμενο πακέτο είναι ένα πακέτο πηγαίου κώδικα \n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - εγκατάσταση μόνο του πηγαίου πακέτου (όχι εκτελέσιμα).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - αφαίρεσε τα rpm από την προσωρινή μνήμη πριν από κάθε "
 "άλλο.\n"
 
-#: ../urpmi:109
-#, fuzzy
+#: ../urpmi:108
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 "  --noclean      - κράτα τα rpm που δεν χρησιμοποιήθηκαν στην προσωρινή "
 "μνήμη.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -1003,7 +1022,8 @@ msgstr ""
 "πακέτα χωρίς\n"
 "                   να ελέγχει τις εξαρτήσεις.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -1011,13 +1031,15 @@ msgstr ""
 "  --allow-force  - επέτρεψε στον χρήστη να ρωτάει για τα πακέτα χωρίς\n"
 "                   να ελέγχει τις εξαρτήσεις και την ακεραιότητα.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --root         - χρησιμοποίηση μία άλλη διαδρομή root για την εγκατάσταση "
 "του rpm.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -1026,44 +1048,51 @@ msgstr ""
 "χρήσιμο\n"
 "                   για να εγκαταστήσετε ένα  chroot με την επιλογή --root .\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - χρήση του wget για την ανάκτηση απομακρυσμένων αρχείων.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr ""
 "  --curl         - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - περιόρισε την ταχύτητα λήψης.\n"
 
 #: ../urpmi:129
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1071,26 +1100,29 @@ msgstr ""
 "\n"
 " ενεργοποιημένο"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
 #: ../urpmi:138
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1099,7 +1131,7 @@ msgstr ""
 " ενεργοποιημένο"
 
 #: ../urpmi:140
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1108,103 +1140,105 @@ msgstr ""
 "σωστά.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - εξαιρούμενες διαδρομές διαχωρισμένες με το κόμμα.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - εξαιρούμενα αρχεία τεκμηρίωσης.\n"
 
 #: ../urpmi:143
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --no-uninstall - μην ρωτήσεις για να απεγκαταστήσεις ένα πακέτο, διέκοψε "
 "την εγκατάσταση.\n"
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --url          - τύπωσε την ετικέτα των συνδέσμων url: url.\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --description   - τύπωσε την ετικέτα περιγραφής: περιγραφή.\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr ""
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr ""
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - πακέτα τα οποίο η εγκατάσταση θα προσπεράσει\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
 
-#: ../urpmi:152
-#, fuzzy
+#: ../urpmi:150
+#, fuzzy, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr ""
 "  --noclean      - κράτα τα rpm που δεν χρησιμοποιήθηκαν στην προσωρινή "
 "μνήμη.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 "  --strict-arch  - αναβάθμισε μόνο τα πακέτα με την ίδια αρχιτεκτονική.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - επιλογή όλων των μέσων που ταιριάζουν στην γραμμή "
 "εντολών.\n"
 
-#: ../urpmi:155
-#, fuzzy
+#: ../urpmi:153
+#, fuzzy, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -f             - αναγκαστική δημιουργία αρχείων hdlist.\n"
 
-#: ../urpmi:156
-#, fuzzy
+#: ../urpmi:154
+#, fuzzy, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -f             - αναγκαστική δημιουργία αρχείων hdlist.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - σιωπηλή λειτουργία.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  ονόματα ή αρχεία rpm που δόθηκαν στην γραμμή εντολών θα εγκατασταθούν.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 "Δεν μπορείτε να εγκαταστήσετε δυαδικά αρχεία rpm  όταν χρησιμοποιείτε --"
 "install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1213,70 +1247,75 @@ msgstr ""
 "Ο κατάλογος [%s] υπάρχει ήδη, παρακαλώ χρησιμοποιήστε ένα διαφορετικό "
 "κατάλογο για να αναφορά σφάλματος ή διαγράψτε το"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "αδυναμία δημιουργίας καταλόγου [%s] για την αναφορά σφάλματος"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Η αντιγραφή απέτυχε"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
 "Use --allow-force to force operation."
 msgstr ""
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (προς αναβάθμιση)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (προς αναβάθμιση)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (προς εγκατάσταση)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (προς εγκατάσταση)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ποια είναι η επιλογή σας; (1-%d) "
 
-#: ../urpmi:481
+#: ../urpmi:482
 #, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1284,62 +1323,84 @@ msgstr ""
 "\n"
 "Να συνεχίσω την εγκατάσταση;"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (Ν/ο) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Ορισμένα πακέτα που ζητήθηκαν δεν μπορούν να εγκατασταθούν:\n"
+"%s"
+msgstr[1] ""
 "Ορισμένα πακέτα που ζητήθηκαν δεν μπορούν να εγκατασταθούν:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Η εγκατάσταση δεν μπορεί να συνεχιστεί διότι τα παρακάτω πακέτα πρέπει να "
+"αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
+"%s\n"
+msgstr[1] ""
 "Η εγκατάσταση δεν μπορεί να συνεχιστεί διότι τα παρακάτω πακέτα πρέπει να "
 "αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
+"%s"
+msgstr[1] ""
 "Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"Για να ικανοποιηθούν οι εξαρτήσεις, τα ακόλουθα πακέτα πρόκειται να "
+"εγκατασταθούν"
+msgstr[1] ""
 "Για να ικανοποιηθούν οι εξαρτήσεις, τα ακόλουθα πακέτα πρόκειται να "
 "εγκατασταθούν"
 
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr ""
-"Για να ικανοποιηθούν οι εξαρτήσεις, το παρακάτω πακέτο πρόκειται να "
-"εγκατεστηθεί"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1349,91 +1410,106 @@ msgstr ""
 "εξαρτήσεις:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Πατήστε enter όταν τελειώσετε..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Τα παρακάτω πακέτα περιέχουν κακές υπογραφές"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Τα παρακάτω πακέτα περιέχουν κακές υπογραφές"
+msgstr[1] "Τα παρακάτω πακέτα περιέχουν κακές υπογραφές"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Θέλετε να συνεχίσετε την εγκατάσταση ;"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "κατανομή %s:"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "εγκατάσταση %s από %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "εγκατάσταση %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Η εγκατάσταση απέτυχε"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Προσπάθεια για εγκατάσταση χωρίς τον έλεγχο των εξαρτήσεων; (y/N) "
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Προσπάθεια για πιο δυνατή εγκατάσταση (--force); (y/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "%d αποτυχία διεργασιών εγκατάστασης"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "Η εγκατάσταση είναι δυνατή"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
+msgstr[1] "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
+msgstr[1] "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "Επανεκκίνηση urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1458,115 +1534,145 @@ msgstr ""
 "όπου [επιλογές] είναι από\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - δημιουργία μέσου αναβάθμισης.\n"
 
 #: ../urpmi.addmedia:55
-#, fuzzy
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
 "                    synthesis hdlist.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr ""
+"  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
+"                    synthesis hdlist.\n"
 
 #: ../urpmi.addmedia:57
-#, fuzzy
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
 "                    synthesis hdlist.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - εμφάνιση διαθέσιμων μέσων.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
-#, fuzzy
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, fuzzy, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -v             - αναλυτική λειτουργία.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - αναγκαστική δημιουργία αρχείων hdlist.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - σιωπηλή λειτουργία.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - αναλυτική περιγραφή.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "αδυναμία αναβάθμισης του μέσου \"%s\"\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Μόνο ο διαχειριστής επιτρέπεται να προσθέσει μέσο"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Θα δημιουργηθεί το αρχείο ρυθμίσης [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Δεν μπορεί να δημιουργηθεί το αρχείο ρυθμίσης [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "η χρειάζεται να δώσετε <σχετική διαδρομή του hdlist>  με το --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "η <σχετική διαδρομή του hdlist> λείπει\n"
 
-#: ../urpmi.addmedia:167
-#, fuzzy
-msgid "`with' missing for network media\n"
-msgstr "το `with' λείπει από το ftp media\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "αδυναμία δημιουργίας του μέσου \"%s\"\n"
@@ -1589,154 +1695,156 @@ msgstr ""
 "χρήση:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 "  --noclean      - κράτα τα rpm που δεν χρησιμοποιήθηκαν στην προσωρινή "
 "μνήμη.\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-media   - εμφάνιση διαθέσιμων μέσων.\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-media   - εμφάνιση διαθέσιμων μέσων.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --name         - τύπωσε μόνο τα ονόματα των πακέτων.\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "το πακέτο %s δεν βρέθηκε."
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "%d αρχεία αφαιρέθηκαν\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "Πρέπει να είστε υπερχρήστης για να  το πράξετε αυτό"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "ανάκτηση αρχείου rpm [%s] ..."
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "Δεν βρέθηκε αρχείο λίστας (filelist)\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "χρήση: urpmi.removemedia [-a] <όνομα> ...\n"
 "όπου <όνομα> είναι ένα μέσο προς διαγραφή.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - επιλογή όλων των μέσων.\n"
 
-#: ../urpmi.removemedia:57
-#, fuzzy
+#: ../urpmi.removemedia:43
+#, fuzzy, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -q             - σιωπηλή λειτουργία.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"άγνωστες επιλογές '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Μόνο ο διαχειριστής επιτρέπεται να αφαιρέσει μέσο"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "τίποτα για διαγραφή (χρησιμοποιήστε urpmi.addmedia για προσθήκη μέσου)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1746,6 +1854,7 @@ msgstr ""
 "(ένα εκ των %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1754,32 +1863,47 @@ msgstr ""
 "όπου <όνομα> είναι ένα μέσο προς αναβάθμιση.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - χρήση μόνο των μέσων αναβάθμισης\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
+
 #: ../urpmi.update:44
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --update       - χρήση μόνο των μέσων αναβάθμισης\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - επιλογή όλων των μη αφαιρούμενων μέσων.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - αναγκαστική δημιουργία αρχείων hdlist.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Μόνο ο διαχειριστής επιτρέπεται να αναβαθμίσει μέσο"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "τίποτα για αναβάθμιση (χρησιμοποιήστε urpmi.addmedia για προσθήκη μέσου)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1788,21 +1912,21 @@ msgstr ""
 "η επιλογή για αναβάθμιση λείπει\n"
 "(ένα εκ των %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "ενεργοποίηση μέσου %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "Αγνόηση μέσου %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "ενεργοποίηση μέσου %s"
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1821,6 +1945,7 @@ msgstr ""
 "χρήση:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1829,129 +1954,139 @@ msgstr ""
 "ζητούμενων (ή των αναβαθμιζόμενων) πακέτων.\n"
 
 #: ../urpmq:55
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - εμφάνιση διαθέσιμων πακέτων.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - εμφάνιση διαθέσιμων μέσων.\n"
 
 #: ../urpmq:60
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - εμφάνιση διαθέσιμων μέσων.\n"
 
 #: ../urpmq:61
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-media   - εμφάνιση διαθέσιμων μέσων.\n"
 
 #: ../urpmq:62
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-media   - εμφάνιση διαθέσιμων μέσων.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - το επόμενο πακέτο είναι ένα πακέτο πηγαίου κώδικα (ίδιο "
 "με το -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --url          - τύπωσε την ετικέτα των συνδέσμων url: url.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:81
-#, fuzzy
+#: ../urpmq:83
+#, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --all           - τύπωσε όλα τις ετικέτες.\n"
 
-#: ../urpmq:82
-#, fuzzy
+#: ../urpmq:84
+#, fuzzy, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary       - τύπωσε την ετικέτα περίληψης: περίληψη.\n"
 
-#: ../urpmq:84
-#, fuzzy
+#: ../urpmq:87
+#, fuzzy, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "                    γραμμή εντολών αλλά χωρίς όνομα πακέτου)."
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - εκτεταμένο ερώτημα στις εξαρτήσεις των πακέτων.\n"
 
-#: ../urpmq:87
-#, fuzzy
+#: ../urpmq:90
+#, fuzzy, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -q             - σιωπηλή λειτουργία.\n"
 
-#: ../urpmq:88
-#, fuzzy
+#: ../urpmq:91
+#, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -f             - αναγκαστική δημιουργία αρχείων hdlist.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - λίστα αρχείων στο πακέτο.\n"
 
-#: ../urpmq:90
-#, fuzzy
+#: ../urpmq:93
+#, fuzzy, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -s             - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --"
 "src).\n"
 
-#: ../urpmq:91
-#, fuzzy
+#: ../urpmq:94
+#, fuzzy, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  --X            - χρήση διεπαφής X.\n"
 
-#: ../urpmq:92
-#, fuzzy
+#: ../urpmq:95
+#, fuzzy, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -v             - αναλυτική λειτουργία.\n"
 
-#: ../urpmq:93
-#, fuzzy
+#: ../urpmq:96
+#, fuzzy, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -a             - επιλογή όλων των μέσων.\n"
 
-#: ../urpmq:94
-#, fuzzy
+#: ../urpmq:97
+#, fuzzy, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -a             - επιλογή όλων των μέσων.\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --"
 "src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
@@ -1959,40 +2094,88 @@ msgstr ""
 "  -u             - αφαίρεση πακέτου εάν μια πιο πρόσφατη έκδοση είναι ήδη "
 "εγκατεστημένη.\n"
 
-#: ../urpmq:98
-#, fuzzy
+#: ../urpmq:100
+#, fuzzy, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 "  -s             - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --"
 "src).\n"
 
-#: ../urpmq:99
-#, fuzzy
+#: ../urpmq:101
+#, fuzzy, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  --list         - εμφάνιση διαθέσιμων πακέτων.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:176
-#, fuzzy
+#: ../urpmq:177
+#, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, fuzzy, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "αποφυγή μέσου %s: δεν υπάρχει hdlist\n"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Δεν βρέθηκε αρχείο λίστας (filelist)\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Η εγκατάσταση απέτυχε στον κόμβο %s"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Εγκατάσταση πακέτων στους κόμβους..."
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "εξέταση αρχείου σύνθεσης [%s]"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Κατανομή αρχείων στο %s..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Εκτέλεση εγκατάστασης σε %s..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "Εγκατάσταση %s σε %s..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Προετοιμάζω εγκατάσταση σε %s...."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "Για να ικανοποιηθούν οι εξαρτήσεις, το παρακάτω πακέτο πρόκειται να "
+#~ "εγκατεστηθεί"
+
+#, fuzzy
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr ""
+#~ "  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
+#~ "                    synthesis hdlist.\n"
+
+#, fuzzy
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "το `with' λείπει από το ftp media\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "άγνωστες επιλογές '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "καθορίστηκε άγνωστο πρωτόκολλο για το %s"
 
diff --git a/po/eo.po b/po/eo.po
index 99e8229b..7a2932c8 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2005-01-13 10:05+0100\n"
 "Last-Translator: Grégoire COLBERT <gcolbert2004@noos.fr>\n"
 "Language-Team: Esperanto <mandrak-eo@yahoogroups.com>\n"
@@ -22,7 +22,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "RPM instalado"
 
@@ -31,7 +32,8 @@ msgstr "RPM instalado"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Jes"
 
@@ -86,20 +88,23 @@ msgstr ""
 "\n"
 "Eble vi preferas konservi ĝin kiel dosiero. Kion vi decidas?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Instalu"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Konservu"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Nuligu"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Elektu dosieraron por konservi tiun dosieron"
 
@@ -109,18 +114,21 @@ msgid "Unknown option %s"
 msgstr "Nekonataj opcio %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Neniu pakaĵo indikita"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Bonvole atendu..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Devas esti sistemestro"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -131,35 +139,42 @@ msgstr ""
 "%s\n"
 "Ĉu mi daŭrigu?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Jes"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Averto"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Jes"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (ĝisdatigi)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (instali)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Unu el la sekvantaj pakaĵoj estas bezonata:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "Ĉ_esigu"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -170,7 +185,7 @@ msgstr ""
 "%s\n"
 "Ĉu mi daŭrigu?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -181,25 +196,27 @@ msgstr ""
 "esti instalataj:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Instalado de pakaĵo..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Ne povas preni fontajn pakaĵojn, mi ĉesiĝas."
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Bonvole enŝovu la medion nomata \"%s\" en aparaton [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Mi elŝutas pakaĵon '%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -213,8 +230,7 @@ msgstr ""
 "\n"
 "Ĉu vi deziras tamen daŭrigi la instaladon ?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -225,35 +241,38 @@ msgstr ""
 "%s\n"
 "Eble vi ĝisdatigu vian urpmi-datenbazon"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "foriganta %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Mi preparas..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Instalado malsukcesis"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Finata"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "La pakaĵo(j) estas jam instalita(j)"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Instalo finita"
 
@@ -267,19 +286,22 @@ msgstr ""
 "kie [opcioj] estas en\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - presu tiun ĉi help-mesaĝon.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "  --root <path>  - uzu la donitan vojprefikson anstataŭ /.\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "  -g [group]     - limigu rezultojn al la donita grupo.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - printu grupojn ankaŭ kun nomo.\n"
 
@@ -288,210 +310,126 @@ msgstr "  -g             - printu grupojn ankaŭ kun nomo.\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    defaŭlte al %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Nur superuzulo rajtas instali pakaĵojn"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "ne povis malfermi rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nevalida rpm-a dosiernomo [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "mi ekstraktas rpm-dosieron [%s] ..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "... ekstraktado farita"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...ekstraktado malsukcesis: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne povis atingi rpm-an dosieron [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ne povis analizi \"%s\" en dosiero [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "ne povas registri rpm-dosieron"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "eraro dum registri lokajn pakaĵojn"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "malĝusta deklaro de prokuro en la komanda linio\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Vi devas esti \"root\" por uzi ĉi tiun ordonon ! \n"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "Nn"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "YyJj"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "Bedaŭrinde, nevalida elekto, reprovu\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
+#: ../urpm/args.pm:426
 #, c-format
-msgid "on node %s"
-msgstr ""
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
+msgid "Can't use %s with %s"
 msgstr ""
 
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Instalado malsukcesis"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Instalado eblas"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
+#: ../urpm/args.pm:440
 #, c-format
-msgid "scp failed on host %s (%d)"
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "mi kontrolas la sintezo-dosieron [%s]"
-
-#: ../urpm/parallel_ssh.pm:183
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "Nn"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "distribuanta %s"
+msgid "Yy"
+msgstr "YyJj"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "Instalado de pakaĵo..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "instalas %s el %s"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "Instalado de pakaĵo..."
+msgid "Sorry, bad choice, try again\n"
+msgstr "Bedaŭrinde, nevalida elekto, reprovu\n"
 
 #: ../urpme:39
 #, fuzzy, c-format
@@ -510,124 +448,138 @@ msgstr ""
 "\n"
 "uzado:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - presu tiun ĉi help-mesaĝon.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - automate elektu pakaĵon en elektoj.\n"
 
 #: ../urpme:46
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - kontrolu ĉu la instalado povas esti ĝuste arĥivota.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - trudu envokon eĉ se iuj pakaĵoj ne ekzistas.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - distribuita urpmi tra maŝinoj de kromnomo.\n"
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --packager     - printu etiked-pakilon: packager.\n"
 
 #: ../urpme:50
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description  - printu etikedan priskribon: description.\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
 msgstr ""
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - provu trovi kaj uzi sintezan dosieron.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - provu trovi kaj uzi hd-listan dosieron.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - babilema modo.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - babilema modo.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - elektu ĉiujn pakaĵojn kongruajn kun la esprimo.\n"
 
-#: ../urpme:74
-#, fuzzy
+#: ../urpme:75
+#, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Nur superuzulo rajtas forpreni pakaĵojn"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "nekonata pakaĵo"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "nekonataj pakaĵoj"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "nekonata pakaĵo"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "forigi pakaĵon %s detruos vian sistemon"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Nenio forigenda"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Mi kontrolas por forigi la sekvantajn pakaĵojn"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "Por plenumi dependaĵojn, la %d sekvantaj pakaĵoj estas forigotaj (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (J/n) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "mi forigas la pakaĵon %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (J/n) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Forigado malsukcesis"
 
@@ -649,231 +601,254 @@ msgstr ""
 "uzado:\n"
 
 #: ../urpmf:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - presu tiun ĉi help-mesaĝon.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - uzu specifan medion (tipe estas cim-raporto).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - ne uzu la donitan datenportilon, disigitan per komo.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - uzu nur la donitajn datenportilojn, disigitajn per komo.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - vicigu la datenportilojn laŭ subĉenoj disigitaj per "
 "komo.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - ne printu identajn liniojn.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - uzu nur ĝisdatigajn datenportilojn.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - babilema modo.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - ignoru ĉiufoje usklecon.\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - ignoru ĉiufoje usklecon.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - anigu perl-kodon rekte kiel perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binara KAJ-operatoro.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binara AŬ-operatoro.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unuloka NE.\n"
 
-#: ../urpmf:55
-#, fuzzy
+#: ../urpmf:56
+#, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - dekstra parentezo por fermi grup-esprimon.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - uzu X-interfacon.\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    defaŭlte al %s.\n"
 
-#: ../urpmf:59
-#, fuzzy
+#: ../urpmf:60
+#, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - presu url-on de etikedo: url.\n"
 
-#: ../urpmf:60
-#, fuzzy
+#: ../urpmf:61
+#, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - printu etikedon buildhost: build host.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Agordo de Konzolo"
 
-#: ../urpmf:63
-#, fuzzy
+#: ../urpmf:64
+#, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - printu etikedajn konfliktojn: ĉiuj konfliktoj.\n"
 
-#: ../urpmf:64
-#, fuzzy
+#: ../urpmf:65
+#, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - printu etikedan priskribon: description.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - printu etikedon epoĥo: epoch.\n"
 
-#: ../urpmf:67
-#, fuzzy
+#: ../urpmf:68
+#, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name           - printu nur la nomojn de la pakaĵoj.\n"
 
-#: ../urpmf:68
-#, fuzzy
+#: ../urpmf:69
+#, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - listigu dosierojn en la pakaĵo.\n"
 
-#: ../urpmf:69
-#, fuzzy
+#: ../urpmf:70
+#, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - printu etikedo-grupon: group.\n"
 
-#: ../urpmf:70
-#, fuzzy
+#: ../urpmf:71
+#, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name           - printu nur la nomojn de la pakaĵoj.\n"
 
-#: ../urpmf:71
-#, fuzzy
+#: ../urpmf:72
+#, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
 
-#: ../urpmf:72
-#, fuzzy
+#: ../urpmf:73
+#, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - printu etiked-pakilon: packager.\n"
 
-#: ../urpmf:73
-#, fuzzy
+#: ../urpmf:74
+#, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - presu etikedan provizon: ĉiuj provizoj.\n"
 
-#: ../urpmf:74
-#, fuzzy
+#: ../urpmf:75
+#, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - printu etikedan postulojn: ĉiujn postulojn.\n"
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - printu grandecon de etikedo: size.\n"
 
-#: ../urpmf:76
-#, fuzzy
+#: ../urpmf:77
+#, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - printu etikedon sourcerpm: source rpm.\n"
 
-#: ../urpmf:77
-#, fuzzy
+#: ../urpmf:78
+#, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --group         - printu etikedan resumon: summary.\n"
 
-#: ../urpmf:78
-#, fuzzy
+#: ../urpmf:79
+#, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - presu url-on de etikedo: url.\n"
 
-#: ../urpmf:79
-#, fuzzy
+#: ../urpmf:80
+#, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - babilema modo.\n"
 
-#: ../urpmf:80
-#, fuzzy
+#: ../urpmf:81
+#, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - listigu dosierojn en la pakaĵo.\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - printu version, eldonon kaj arkitekturon kun nomo.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "uzante specifan medion sur %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -881,11 +856,12 @@ msgstr ""
 "Notu: ĉar neniu serĉita datenportilo uzas hdlist-dosierojn, urpmf ne povis "
 "doni rezulton\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Eblas ke vi volas uzi --name por serĉi pakaĵ-nomojn.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -902,39 +878,59 @@ msgstr ""
 "\n"
 "uzado:\n"
 
-#: ../urpmi:92
-#, fuzzy
+#: ../urpmi:88
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - uzu nur la donitajn datenportilojn por serĉi menditaj (aŭ "
 "ĝisdatigitaj) pakaĵoj.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - aŭtomate elektas pakaĵojn por ĝisdatigi la sistemon.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - aŭtomate elektas pakaĵojn por ĝisdatigi la sistemon.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - malebligas la kontrolon de dosieroj per MD5SUM.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - devigu la ĝisdatigon de la GPG ĉifroŝlosilon.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 "  --no-uninstall - neniam petu malinstali pakaĵon, ĉesigu la instaladon.\n"
 
-#: ../urpmi:98
-#, fuzzy
+#: ../urpmi:97
+#, fuzzy, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --install-src  - instalu nur font-pakaĵojn (ne binarajn).\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -943,7 +939,7 @@ msgstr ""
 "postulatajn\n"
 "                   pakaĵojn kiuj kondukas al forigo.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -954,36 +950,39 @@ msgstr ""
 "                   estas instalotaj aŭ ĝisdatigotaj,\n"
 "                   defaŭlta estas %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - eta transakcio-longo, defaŭlta estas %d.\n"
 
-#: ../urpmi:105
-#, fuzzy
+#: ../urpmi:104
+#, fuzzy, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - trudu serĉadon de dubindaĵoj (same kiel -y).\n"
 
-#: ../urpmi:106
-#, fuzzy
+#: ../urpmi:105
+#, fuzzy, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src          - venonta pakaĵo estas font-pakaĵo (same kiel -s).\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - instalu nur font-pakaĵojn (ne binarajn).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - forigu rpm el la kaŝejo antaŭ ol fari ion ajn alian.\n"
 
-#: ../urpmi:109
-#, fuzzy
+#: ../urpmi:108
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - konservu rpm ne uzatan en kaŝejo.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -991,7 +990,8 @@ msgstr ""
 "  --allow-nodeps - permesu peti la uzulon instali pakaĵojn sen\n"
 "                   kontrolado de dependaĵoj.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -999,51 +999,61 @@ msgstr ""
 "  --allow-force  - permesu peti uzulon instali pakaĵojn sen\n"
 "                   dependaĵ-kontrolo kaj integreco.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --root         - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - uzu wget por ekstrakti forajn dosierojn.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - uzu curl por ekstrakti forajn dosierojn.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - uzu curl por ekstrakti forajn dosierojn.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limigu la deŝut-rapidon.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1051,7 +1061,8 @@ msgstr ""
 "  --resume       - pluigu elŝutado de nekomplete elŝutataj dosieroj\n"
 "                   (--no-resume elŝaltu ĝin, defaŭlta estas elŝaltita).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1061,7 +1072,8 @@ msgstr ""
 "                   1080 defaŭlte (la formato estas <prokura gastiganto[:"
 "pordo]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1070,6 +1082,7 @@ msgstr ""
 "                   aŭtentigon (formato estas <uzulo:pasvorto>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1078,7 +1091,7 @@ msgstr ""
 "                   next arg.\n"
 
 #: ../urpmi:138
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1087,7 +1100,7 @@ msgstr ""
 "                   (--no-verify-rpm elŝaltu ĝin, defaŭlta estas enŝaltita).\n"
 
 #: ../urpmi:140
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1095,42 +1108,38 @@ msgstr ""
 "  --test         - kontrolu ĉu la instalado povas esti ĝuste arĥivota.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eksigu padon disigitan de komo.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - eksigu dokumentajn dosierojn.\n"
 
 #: ../urpmi:143
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --no-uninstall - neniam petu malinstali pakaĵon, ĉesigu la instaladon.\n"
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --url          - presu url-on de etikedo: url.\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --description  - printu etikedan priskribon: description.\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - malebligas la kontrolon de dosieroj per MD5SUM.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - devigu la ĝisdatigon de la GPG ĉifroŝlosilon.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - pakaĵoj kiuj ne devas esti instalataj.\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1139,53 +1148,60 @@ msgstr ""
 "elektojn\n"
 "                   ol en la defaŭlta moduso.\n"
 
-#: ../urpmi:152
-#, fuzzy
+#: ../urpmi:150
+#, fuzzy, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --noclean      - konservu rpm ne uzatan en kaŝejo.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - ĝisdatigu nur pakaĵoj por la sama arkitekturo.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - elektu ĉiujn kongruojn en la komanda linio.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - permesu serĉadon en \"disponigas\" por trovi la pakaĵon.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - ne serĉu en provides por trovi pakaĵon.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - silenta modo.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  nomoj aŭ rpm-dosieroj tapitaj en la komanda linio instaliĝos.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
-#, fuzzy
+#: ../urpmi:220
+#, fuzzy, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Kio fareblas per binaraj rpm-dosieroj se uzante --install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1194,21 +1210,22 @@ msgstr ""
 "Dosieraro [%s] jam ekzistas, bonvole elektu alian dosieraron por la cim-"
 "raporto, aŭ forigi ĝin"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Ne povas krei dosierujon [%s] por cim-raporto"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Kopiado malsukcesis"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1217,117 +1234,146 @@ msgstr ""
 "Eraro: %s ŝajnas esti nur legebla.\n"
 "Uzu --allow-force por provi skribadon."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (ĝisdatigi)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (ĝisdatigi)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (instali)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (instali)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Kiu estas via elekto? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"La sekvantaj pakaĵoj ne povas esti instalataj ĉar ili dependas de aliaj "
+"pakaĵoj\n"
+"kiuj estas pli malnovaj ol tiuj kiuj estas jam instalataj:\n"
+"%s"
+msgstr[1] ""
 "La sekvantaj pakaĵoj ne povas esti instalataj ĉar ili dependas de aliaj "
 "pakaĵoj\n"
 "kiuj estas pli malnovaj ol tiuj kiuj estas jam instalataj:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Ĉu mi devus daŭri malgraŭe?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Iuj postulataj pakaĵoj ne instaleblas:\n"
+"%s"
+msgstr[1] ""
 "Iuj postulataj pakaĵoj ne instaleblas:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"La instalado ne daŭrigeblas ĉar la sekvantaj pakaĵoj\n"
+"forigotas por ke aliaj estu ĝisdatigotaj:\n"
+"%s\n"
+msgstr[1] ""
 "La instalado ne daŭrigeblas ĉar la sekvantaj pakaĵoj\n"
 "forigotas por ke aliaj estu ĝisdatigotaj:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"La sekvantaj pakaĵoj estas forigotaj por ke aliaj estu ĝisdatigotaj:\n"
+"%s"
+msgstr[1] ""
 "La sekvantaj pakaĵoj estas forigotaj por ke aliaj estu ĝisdatigotaj:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"Por plenumi la dependaĵojn, la %d sekvanta(j) pakaĵo(j) devas ankaŭ\n"
+"esti instalataj:\n"
+"%s\n"
+msgstr[1] ""
 "Por plenumi la dependaĵojn, la %d sekvanta(j) pakaĵo(j) devas ankaŭ\n"
 "esti instalataj:\n"
 "%s\n"
 
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr ""
-"Por plenumi dependaĵojn, la sekvanta pakaĵo estos ankaŭ instalita (%d MB)"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1336,91 +1382,106 @@ msgstr ""
 "Vi devas esti root por instali la sekvantajn dependaĵojn:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Premu la enigklavon kiam vi pretas..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Nuligu"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "La sekvantaj pakaĵoj havas malĝustajn signaturojn"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "La sekvantaj pakaĵoj havas malĝustajn signaturojn"
+msgstr[1] "La sekvantaj pakaĵoj havas malĝustajn signaturojn"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ĉu vi deziras daŭrigi la instaladon ?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "distribuanta %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "instalas %s el %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "instalas %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalado malsukcesis"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Provu instaladon sen kontroli dependaĵojn? (j/N) "
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Provu instaladon eĉ pli forte (--force)? (j/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "La instal-transakcio %d malsukcesis"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalado eblas"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "La pakaĵo(j) estas jam instalita(j)"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "La pakaĵo(j) estas jam instalita(j)"
+msgstr[1] "La pakaĵo(j) estas jam instalita(j)"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "La pakaĵo(j) estas jam instalita(j)"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "La pakaĵo(j) estas jam instalita(j)"
+msgstr[1] "La pakaĵo(j) estas jam instalita(j)"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "restartas urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1444,26 +1505,34 @@ msgstr ""
 "kaj [opcioj] estas de\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - kreu ĝisdatigan datenportilon.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - provu trovi kaj uzi sintezan dosieron.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - provu trovi kaj uzi hd-listan dosieron.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - ne provu trovi ian sintezon aŭ\n"
 "                   hdlist-dosieron.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1471,16 +1540,17 @@ msgstr ""
 "  --distrib      - kreas aŭtomate ĉiujn datenportilojn de instala\n"
 "                   datenportilo.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - listigu haveblajn datenportilojn.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1490,7 +1560,8 @@ msgstr ""
 "defaŭlta estas\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1498,62 +1569,84 @@ msgstr ""
 "  --virtual      - kreu virtualan datenportikojn ĉiam ĝisdatajn,\n"
 "                   nur file:// protokolo estas permesita.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - malebligas la kontrolon de dosieroj per MD5SUM.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - purigu la dosieron de kap-kaŝejo.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - trudu generadon de hdlist-dosieroj.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - silenta modo.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - babilema modo.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "ne povis ĝisdatigi medion \"%s\"\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Nur superuzulo rajtas aldoni datenportilon"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Mi kreos konfiguran dosieron [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Ne povas krei konfiguran dosieron [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "ne bezonas doni <relative path of hdlist> per --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<relativa dosieronomo de hd-listo> mankas\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "`with' mankas por reta datenportilo\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "ne povis krei medion \"%s\"\n"
@@ -1576,150 +1669,153 @@ msgstr ""
 "uzado:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - konservu rpm ne uzatan en kaŝejo.\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-url     - listu haveblajn datenportilojn kaj ĝiajn URL-ojn.\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-url     - listu haveblajn datenportilojn kaj ĝiajn URL-ojn.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --name           - printu nur la nomojn de la pakaĵoj.\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "pakaĵo %s ne estis trovata."
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "mi ekstraktas rpm-dosieron [%s] ..."
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "Neniu \"filelist\" trovita\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "uzado: urpmi.removemedia [-a] <nomo> ...\n"
 "kie <nomo> estas la nomo de la forigota datenportilo.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - elektu ĉiujn datenportilojn.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - proksimuma serĉo en la nomoj de medioj.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nekonataj opcioj '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Nur superuzulo rajtas forpreni pakaĵojn"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "nenio por forpreni (uzu urpmi.addmedia por aldoni medion)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1729,6 +1825,7 @@ msgstr ""
 "(unu el %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1737,31 +1834,47 @@ msgstr ""
 "kie <nomo> estas nomo de ĝisdatigota datenportilo.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - ĝisdatigu nur ĝisdatigajn datenportilojn.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - devigu la ĝisdatigon de la GPG ĉifroŝlosilon.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr ""
 "  --ignore       - ne ĝisdatigu sed marku la medion kiel preterlasita.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - ne ĝisdatigu sed marku la medion kiel ebligita.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - elektu ĉiujn nemoveblajn datenportilojn.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - trudu generadon de hdlist-dosieroj.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Nur superuzulo rajtas ĝisdatigi pakaĵojn"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nenio por ĝisdatigi (uzu urpmi.addmedia por aldoni medion)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1770,21 +1883,21 @@ msgstr ""
 "la enskribaĵo por ĝisgatigi mankas\n"
 "(unu el %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "ebligante datenportilon \"%s\""
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "preterlasante datenportilon \"%s\":"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "ebligante datenportilon \"%s\""
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1803,6 +1916,7 @@ msgstr ""
 "uzado:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1811,152 +1925,230 @@ msgstr ""
 "ĝisdatigitaj) pakaĵoj.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - trudu serĉadon de dubindaĵoj (same kiel -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - listigu haveblajn pakaĵojn.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - listigu haveblajn datenportilojn.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - listu haveblajn datenportilojn kaj ĝiajn URL-ojn.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - listigas haveblajn nodojn kiam vi uzas --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - listigu haveblajn paralelajn kromnomojn.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - afiŝu la konfigurado kiel urpmi.addmedia argumento.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - venonta pakaĵo estas font-pakaĵo (same kiel -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - donu ĉiujn font-pakaĵojn antaŭ ol deŝuti (nur root).\n"
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --url          - presu url-on de etikedo: url.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - printu la ĵurnalon de la ŝanĝoj.\n"
 
-#: ../urpmq:82
-#, fuzzy
+#: ../urpmq:84
+#, fuzzy, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --group         - printu etikedan resumon: summary.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - kompleta eligo kun forigota pakaĵo.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - etendu la informmendon al pakaĵ-dependaĵoj.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - printu grupojn ankaŭ kun nomo.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - presu uzeblan informon en homlega formo.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - listigu dosierojn en la pakaĵo.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - ne serĉu en \"provides\" por trovi pakaĵon (defaŭlte).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - serĉu en \"provides\" por trovi la pakaĵon.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - presu version kaj ankaŭ eldonon kun nomo.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - retroiru serĉadon al tio kion postulas la pakaĵo.\n"
 
-#: ../urpmq:94
-#, fuzzy
+#: ../urpmq:97
+#, fuzzy, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -R             - retroiru serĉadon al tio kion postulas la pakaĵo.\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - sekvanta pakaĵo estas font-pakaĵo (same kiel --src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "  -u             - forigu pakaĵon se pli freŝa versio estas jaminstalita.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - trudu serĉadon de dubindaĵoj (same kiel --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - same kiel -y, sed uskleco-blinda.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  nomoj aŭ rpm-dosieroj donitaj en komand-linio estas informmendataj.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes uzeblas nur kun --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, fuzzy, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "preterlasas medion %s: neniu hd-listo\n"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Neniu \"filelist\" trovita\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Neniu \"changelog\" trovita\n"
 
+#, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Instalado malsukcesis"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "mi kontrolas la sintezo-dosieron [%s]"
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "distribuanta %s"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "Instalado de pakaĵo..."
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "instalas %s el %s"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Instalado de pakaĵo..."
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "Por plenumi dependaĵojn, la sekvanta pakaĵo estos ankaŭ instalita (%d MB)"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - provu trovi kaj uzi sintezan dosieron.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - provu trovi kaj uzi hd-listan dosieron.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "`with' mankas por reta datenportilo\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "nekonataj opcioj '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "nekonata protokolo difinita por %s"
 
diff --git a/po/es.po b/po/es.po
index 53c690de..e231f9ba 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2005-04-29 13:26+0200\n"
 "Last-Translator: José Manuel Pérez <jmprodu@hotmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -28,7 +28,8 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "Instalación de RPMs"
 
@@ -37,7 +38,8 @@ msgstr "Instalación de RPMs"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
@@ -94,20 +96,23 @@ msgstr ""
 "\n"
 "Puede que prefiera sólo guardarlo. ¿Cuál es su elección?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Instalar"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Elija ubicación para guardar archivo"
 
@@ -117,18 +122,21 @@ msgid "Unknown option %s"
 msgstr "Opción desconocida «%s»"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Ningún paquete especificado"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Por favor, espere..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Debe ser root"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -139,35 +147,42 @@ msgstr ""
 "%s\n"
 "¿Continuar a pesar de todo?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Aceptar"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Aceptar"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (para actualizar)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (para instalar)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Elección de paquetes"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Uno de los paquetes siguientes es necesario:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Abortar"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -178,7 +193,7 @@ msgstr ""
 "%s\n"
 "¿Continuar a pesar de todo?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -188,25 +203,27 @@ msgstr ""
 "Para satisfacer las dependencias, se instalarán los %d paquetes siguientes:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Instalación de paquete..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "no se pueden obtener los paquetes fuente, abortando"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Por favor, inserte el soporte denominado «%s» en el dispositivo [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Descargando paquete `%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -219,8 +236,7 @@ msgstr ""
 "\n"
 "¿Desea continuar con la instalación?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -231,35 +247,38 @@ msgstr ""
 "%s\n"
 "Puede querer actualizar su base de datos de urpmi"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "quitando %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Preparando..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalando paquete `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Falló la instalación"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Hecho"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "ya está todo instalado"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Finalizó la instalación"
 
@@ -273,19 +292,22 @@ msgstr ""
 "donde [opciones] son\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - imprime este mensaje de ayuda.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <camino> - usar el camino dado como raíz, en vez de «/»\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [grupo]     - restringe los resultados al grupo dado.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - imprimir los grupos junto con los nombres.\n"
 
@@ -294,210 +316,127 @@ msgstr "  -g             - imprimir los grupos junto con los nombres.\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    lo predeterminado es %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Sólo el superusuario está autorizado a instalar paquetes"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Lanzando urpmi en modo restringido..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "no se puede abrir rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nombre de archivo rpm no válido [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "obteniendo archivo rpm [%s] ..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...recuperación hecha"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...falló la recuperación: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "no se puede acceder al archivo rpm [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "no se pudo interpretar el archivo spec %s [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "no se puede registrar el archivo rpm"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Arquitectura incompatible para el rpm [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "error registrando paquetes locales"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Esta operación está prohibida en modo restringido"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "declaración incorrecta del proxy en la línea de comandos\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Necesita ser root para usar --use-distrib"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: no se puede leer el archivo rpm «%s»\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, c-format
+msgid "Can't use %s with %s"
+msgstr ""
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "Demasiados argumentos\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "Nn"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "SsYy"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Disculpe, elección incorrecta, reinténtelo\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr ""
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Falló la instalación"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Es posible la instalación"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "Instalando paquete `%s' (%s/%s)..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "examinando el archivo de síntesis [%s]"
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "distribuyendo %s"
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "Instalación de paquete..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "instalando %s desde %s"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "Instalación de paquete..."
-
 #: ../urpme:39
 #, fuzzy, c-format
 msgid ""
@@ -515,49 +454,61 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - imprime este mensaje de ayuda.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - seleccionar un paquete en las elecciones "
 "automáticamente.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - verificar si se puede llevar a cabo correctamante la "
 "desinstalación.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - fuerza invocación aunque no existan algunos paquetes.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi distribuido entre máquinas de alias.\n"
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --packager     - imprime etiq. packager: quien lo empaquetó.\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - usar otra raíz para la desinstalación de rpm.\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - usar otra raíz para la instalación de rpm.\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description   - imprime etiqueta de descripción: description.\n"
 
-#: ../urpme:52
-#, fuzzy
+#: ../urpme:53
+#, fuzzy, 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"
@@ -566,62 +517,64 @@ msgstr ""
 "distribución,\n"
 "                   útil para (des)instalar un chroot con la opción --root.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - intentar y encontrar archivo synthesis.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - intentar encontrar y usar archivo hdlist.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modo informativo.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - modo informativo.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - selecciona todas los paquetes que coincidan con la "
 "expresión.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Sólo el superusuario está autorizado a quitar paquetes"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "paquete desconocido "
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "paquetes desconocidos "
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "paquete desconocido "
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Los siguientes paquetes contienen %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "quitar el paquete %s dañará su sistema"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Nada que quitar"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Verificando para quitar los paquetes siguientes"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
@@ -629,17 +582,18 @@ msgstr ""
 "Para satisfacer las dependencias, se quitarán los %d paquetes siguientes (%d "
 "MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "quitando paquete %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Falló la desinstalación"
 
@@ -661,242 +615,264 @@ msgstr ""
 "uso:\n"
 
 #: ../urpmf:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - imprime este mensaje de ayuda.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - usar entorno específico (típicamente para reportar "
 "bugs).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - no usar soportes dados, separados por coma.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media         - usar sólo soportes dados, separados por comas.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - clasificar soportes de acuerdo a subcadenas separadas por "
 "coma.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - usar síntesis provista en lugar de base de datos de "
 "urpmi.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - no imprime líneas idénticas.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - usa sólo soporte de actualización.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modo informativo.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - ignora distinción entre mayús. y minús. en todos los "
 "patrones.\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - ignora distinción entre mayús. y minús. en todos los "
 "patrones.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - incluye código Perl directamente como perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operador binario Y.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operador O binario.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - NO unario.\n"
 
-#: ../urpmf:55
-#, fuzzy
+#: ../urpmf:56
+#, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 "  )              - paréntesis derecho para cerrar grupo de expresiones.\n"
 
-#: ../urpmf:56
-#, fuzzy
+#: ../urpmf:57
+#, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Lista de datos a restaurar:\n"
 "\n"
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - usar la interfaz X.\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    lo predeterminado es %s.\n"
 
-#: ../urpmf:59
-#, fuzzy
+#: ../urpmf:60
+#, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - imprime etiq. url: url.\n"
 
-#: ../urpmf:60
-#, fuzzy
+#: ../urpmf:61
+#, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr ""
 "  --buildhost    - imprime etiq. buildhost: máquina en la que se construyó.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Módulo de configuración de Konsole"
 
-#: ../urpmf:63
-#, fuzzy
+#: ../urpmf:64
+#, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - imprime etiq. conflicts: todos los conflictos.\n"
 
-#: ../urpmf:64
-#, fuzzy
+#: ../urpmf:65
+#, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - imprime etiqueta de descripción: description.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - imprime etiqueta de época: epoch.\n"
 
-#: ../urpmf:67
-#, fuzzy
+#: ../urpmf:68
+#, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - mostrar sólo los nombres de los paquetes.\n"
 
-#: ../urpmf:68
-#, fuzzy
+#: ../urpmf:69
+#, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - lista los archivos en el paquete.\n"
 
-#: ../urpmf:69
-#, fuzzy
+#: ../urpmf:70
+#, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - imprime etiqueta de grupo: group.\n"
 
-#: ../urpmf:70
-#, fuzzy
+#: ../urpmf:71
+#, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - mostrar sólo los nombres de los paquetes.\n"
 
-#: ../urpmf:71
-#, fuzzy
+#: ../urpmf:72
+#, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - imprime etiq. obsoletes: todo lo obsoleto.\n"
 
-#: ../urpmf:72
-#, fuzzy
+#: ../urpmf:73
+#, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - imprime etiq. packager: quien lo empaquetó.\n"
 
-#: ../urpmf:73
-#, fuzzy
+#: ../urpmf:74
+#, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - imprime etiq. provides: todo que proporciona.\n"
 
-#: ../urpmf:74
-#, fuzzy
+#: ../urpmf:75
+#, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - imprime etiq. requires: todo que precisa.\n"
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - imprime etiqueta de tamaño: size.\n"
 
-#: ../urpmf:76
-#, fuzzy
+#: ../urpmf:77
+#, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - imprime etiq. sourcerpm: rpm fuente.\n"
 
-#: ../urpmf:77
-#, fuzzy
+#: ../urpmf:78
+#, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary, -S  - imprimir el descriptivo corto (summary).\n"
 
-#: ../urpmf:78
-#, fuzzy
+#: ../urpmf:79
+#, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - imprime etiq. url: url.\n"
 
-#: ../urpmf:79
-#, fuzzy
+#: ../urpmf:80
+#, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - modo informativo.\n"
 
-#: ../urpmf:80
-#, fuzzy
+#: ../urpmf:81
+#, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - lista los archivos en el paquete.\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - imprime versión, release y arquitectura con nombre.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "uasando un entorno específico en %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -904,11 +880,12 @@ msgstr ""
 "Nota: debido a que ningún soporte usa hdlists, urpmf no pudo retornar "
 "resultado alguno\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Puede querer utilizar --name para buscar nombres de paquetes.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -925,28 +902,48 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmi:92
-#, fuzzy
+#: ../urpmi:88
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - usar sólo soportes dados para la búsqueda de los paquetes "
 "pedidos (o actualizados).\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - seleccionar automáticamente paquetes para actualizar "
 "sistema.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - seleccionar automáticamente paquetes para actualizar "
+"sistema.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deshabilitar la prueba MD5SUM sobre el archivo.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - forzar actualización de clave gpg.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -954,11 +951,13 @@ msgstr ""
 "  --no-uninstall - nunca preguntar si desinstalar un paquete, cancelar la "
 "instalación.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - no instalar paquetes (sólo descargar)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -967,7 +966,7 @@ msgstr ""
 "pedidos\n"
 "                   de paquetes que lleven a quitarlos.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -978,35 +977,39 @@ msgstr ""
 "                   o instalar más paquetes dados,\n"
 "                   %d es el predeterminado.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 "  --split-length - tamaño de transacción pequeña, predeterminado es %d.\n"
 
-#: ../urpmi:105
-#, fuzzy
+#: ../urpmi:104
+#, fuzzy, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - forzar búsqueda difusa (lo mismo que -y).\n"
 
-#: ../urpmi:106
-#, fuzzy
+#: ../urpmi:105
+#, fuzzy, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src          - sig. paquete es paquete fuente (igual que -s).\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - instalar sólo paquete de fuentes (ningún binario)\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - quitar rpm del cache antes que nada.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - no eliminar los rpms del cache.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -1014,7 +1017,8 @@ msgstr ""
 "  --allow-nodeps - permitir preguntar al usuario para instalar paquetes\n"
 "                   sin verificar las dependencias.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -1022,11 +1026,13 @@ msgstr ""
 "  --allow-force  - permitir preguntar al usuario para instalar paquetes sin\n"
 "                   verificar las dependencias ni la integridad.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - usar otra raíz para la instalación de rpm.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -1035,40 +1041,48 @@ msgstr ""
 "distribución,\n"
 "                   útil para instalar un chroot con la opción --root.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - usa wget para recuperar archivos remotos.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - usa curl para recuperar archivos remotos.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - usa curl para recuperar archivos remotos.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limitar la velocidad de descarga.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1077,7 +1091,8 @@ msgstr ""
 "parcialmente\n"
 "                   (--no-resume lo deshabilita, que es lo predeterminado).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1085,7 +1100,8 @@ msgstr ""
 "  --proxy        - usar proxy HTTP especificado, se asume que el puerto es\n"
 "                   1080 por defecto (formato <hostproxy[:puerto]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1094,6 +1110,7 @@ msgstr ""
 "                   autenticación del proxy (formato <usuario:contraseña>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1102,7 +1119,7 @@ msgstr ""
 "                   por el argumento siguiente.\n"
 
 #: ../urpmi:138
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1111,7 +1128,7 @@ msgstr ""
 "                   (--no-verify-rpm lo deshabilita, habilitado predet.).\n"
 
 #: ../urpmi:140
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1120,43 +1137,39 @@ msgstr ""
 "problemas.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath   - ruta de exclusión separada por coma.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - excluir archivos de documentación.\n"
 
 #: ../urpmi:143
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --no-uninstall - nunca preguntar si desinstalar un paquete, cancelar la "
 "instalación.\n"
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --url          - imprime etiq. url: url.\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --description   - imprime etiqueta de descripción: description.\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - deshabilitar la prueba MD5SUM sobre el archivo.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - forzar actualización de clave gpg.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - paquetes que no deberían instalarse\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1164,56 +1177,63 @@ msgstr ""
 "  --more-choices - cuando se encuentran varios paquetes, proponer más\n"
 "                   opciones que las predeterminadas.\n"
 
-#: ../urpmi:152
-#, fuzzy
+#: ../urpmi:150
+#, fuzzy, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --noclean      - no eliminar los rpms del cache.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 "  --strict-arch  - actualiza sólo paquetes con la misma arquitectura.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - selecciona todas coincidencias en línea de comando.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - permite buscar en «provides» para encontrar paquete.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -p             - no buscar en «provides» para encontrar paquete.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - modo silencioso.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  se instalan los nombres o archivos rpm dados en línea de comandos.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
-#, fuzzy
+#: ../urpmi:220
+#, fuzzy, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 "Lo que se puede hacer con archivos rpm binarios utilizando --install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1222,21 +1242,22 @@ msgstr ""
 "El directorio [%s] ya existe, por favor use otro directorio para reportar "
 "errores o bórrelo"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "No se puede crear el directorio [%s] para reporte de bugs"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Falló la copia"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1245,115 +1266,142 @@ msgstr ""
 "Error: %s parece estar montado como sólo lectura.\n"
 "Use --allow-force para forzar la operación"
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (para actualizar)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (para actualizar)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (para instalar)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (para instalar)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "¿Qué elige? (1-%d)"
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Los siguientes paquetes no pueden instalarse porque dependen de paquetes\n"
+"más antiguos que los ya instalados:\n"
+"%s"
+msgstr[1] ""
 "Los siguientes paquetes no pueden instalarse porque dependen de paquetes\n"
 "más antiguos que los ya instalados:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "¿Seguir adelante?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"No se puede instalar algún paquete pedido:\n"
+"%s"
+msgstr[1] ""
 "No se puede instalar algún paquete pedido:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"La instalación no puede continuar porque se tienen quitar los paquetes\n"
+"siguientes para poder actualizar otros:\n"
+"%s\n"
+msgstr[1] ""
 "La instalación no puede continuar porque se tienen quitar los paquetes\n"
 "siguientes para poder actualizar otros:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
+"%s"
+msgstr[1] ""
 "Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"Para satisfacer las dependencias, se instalarán los %d paquetes siguientes:\n"
+"%s\n"
+msgstr[1] ""
 "Para satisfacer las dependencias, se instalarán los %d paquetes siguientes:\n"
 "%s\n"
 
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr ""
-"Para satisfacer las dependencias, se instalará el paquete siguiente (%d MB)"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1362,91 +1410,106 @@ msgstr ""
 "Necesita ser root para instalar las dependencias siguientes:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Presione «Intro» cuando esté listo..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Los siguientes paquetes contienen firmas no válidas"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Los siguientes paquetes contienen firmas no válidas"
+msgstr[1] "Los siguientes paquetes contienen firmas no válidas"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "¿Desea continuar con la instalación?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "distribuyendo %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "instalando %s desde %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "instalando %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Falló la instalación"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "¿Intentar de instalar sin verificar las dependencias? (s/N) "
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "¿Intentar con más fuerza la instalación (--force)? (s/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "fallaron %d transacciones de instalación"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "Es posible la instalación"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "ya está todo instalado"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "ya está todo instalado"
+msgstr[1] "ya está todo instalado"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "ya está todo instalado"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "ya está todo instalado"
+msgstr[1] "ya está todo instalado"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "reiniciando urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1470,25 +1533,33 @@ msgstr ""
 "y [opciones] es uno o varios de\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - crea sólo soporte de actualización.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - intentar y encontrar archivo synthesis.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - intentar encontrar y usar archivo hdlist.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
 msgstr ""
-"  --no-probe     - no intentar encontrar archivos synthesis o hdlist.\n"
 
 #: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
+msgstr ""
+"  --no-probe     - no intentar encontrar archivos synthesis o hdlist.\n"
+
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1496,16 +1567,17 @@ msgstr ""
 "  --distrib      - crear automáticamente todos los soportes desde un\n"
 "                   soporte de instalación.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - lista los soportes disponibles.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1514,7 +1586,8 @@ msgstr ""
 "  --from         - usar url especificada para la lista de réplicas, la\n"
 "                   predeterminada es %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1522,63 +1595,85 @@ msgstr ""
 "  --virtual      - crear soporte virtual que siempre está actualizado,\n"
 "                   sólo se permite protocolo file://.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deshabilitar la prueba MD5SUM sobre el archivo.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - no importar la clave pública del soporte añadido\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - añadir el soporte en config, pero no actualizarlo.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - limpia dir. encabezados de cache.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - fuerza generación de archivos hdlist.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modo silencioso.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modo informativo.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "no se puede actualizar soporte «%s»\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Sólo el superusuario está autorizado a añadir soportes"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Creará el archivo de configuración [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "No se puede crear el archivo de configuración [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "no es necesario dar <ruta relativa de hdlist> con --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "falta <ruta relativa de hdlist>\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "falta «with» para soporte de red\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "no se puede crear soporte «%s»\n"
@@ -1601,150 +1696,153 @@ msgstr ""
 "uso:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - no eliminar los rpms del cache.\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-url     - lista los soportes disponibles junto con sus URL.\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-url     - lista los soportes disponibles junto con sus URL.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --name         - mostrar sólo los nombres de los paquetes.\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "no se encontró el paquete %s."
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "obteniendo archivo rpm [%s] ..."
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "No se encontró filelist\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "uso: urpmi.removemedia [-a] <nombre> ...\n"
 "donde <nombre> es nombre del soporte a borrar.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - selecciona todos los soportes.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - coincidencia 'fuzzy' en nombres de soportes.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opciones desconocidas «%s»\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Sólo el superusuario está autorizado a quitar soportes"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "nada para quitar (use urpmi.addmedia para agregar un soporte)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1754,6 +1852,7 @@ msgstr ""
 "(una de %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1762,30 +1861,46 @@ msgstr ""
 "donde <nombre> es nombre de soporte para actualizar.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - actualizar sólo el soporte de actualización.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - forzar actualización de clave gpg.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - no actualizar, marcar el soporte como ignorado.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - no actualizar, marcar el soporte como activado.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selecciona todos los soportes no extraíbles.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - fuerza generación de archivos hdlist.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Sólo el superusuario está autorizado a actualizar soportes"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nada para actualizar (use urpmi.addmedia para agregar un soporte)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1794,21 +1909,21 @@ msgstr ""
 "falta la entrada a actualizar\n"
 "(una de %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "«%s»"
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "activando el soporte %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "Ignorando soporte %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "activando el soporte %s"
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1827,6 +1942,7 @@ msgstr ""
 "uso:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1835,31 +1951,38 @@ msgstr ""
 "pedidos (o actualizados).\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - forzar búsqueda difusa (lo mismo que -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - lista los paquetes disponibles.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - lista los soportes disponibles.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - lista los soportes disponibles junto con sus URL.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - lista los nodos disponibles cuando se usa --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - lista los alias paralelo disponibles.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
@@ -1867,10 +1990,12 @@ msgstr ""
 "addmedia.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - sig. paquete es paquete fuente (igual que -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
@@ -1878,11 +2003,12 @@ msgstr ""
 "root).\n"
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --url          - imprime etiq. url: url.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1891,67 +2017,81 @@ msgstr ""
 "distribución.\n"
 "                   Esto permite consultar una distro.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - imprimir el registro de cambios.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - imprimir el descriptivo corto (summary).\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - completar salida con paquete(s) a quitar.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - extiende consulta a las dependencias del paquete.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - imprimir los grupos junto con los nombres.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - imprimir información útil en formato legible para las "
 "personas.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - lista los archivos en el paquete.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - no busca en «provides» para encontrar paquete "
 "(predeterminado).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - busca en provides para encontrar paquete.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - imprimir versión y revisión junto con el nombre.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - búsqueda inversa de lo que necesita el paquete.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR            - búsqueda inversa extendida (incluye los paquetes "
 "virtuales).\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s          - sig. paquete es paquete fuente (igual que --src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
@@ -1959,38 +2099,95 @@ msgstr ""
 "  -u             - quitar paquete si ya está instalada una versión más "
 "reciente.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - forzar búsqueda difusa (lo mismo que --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - como -y, pero fuerza la no distinción entre mayúsculas y "
 "minúsculas.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  los nombres o archivos rpm dados en línea de comandos se consultan.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes sólo se puede utilizar con --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "omitiendo soporte %s: sin hdlist"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "No se encontró filelist\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "No se encontró changelog\n"
 
+#, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Falló la instalación"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Instalando paquete `%s' (%s/%s)..."
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "examinando el archivo de síntesis [%s]"
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "distribuyendo %s"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "Instalación de paquete..."
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "instalando %s desde %s"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Instalación de paquete..."
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "Para satisfacer las dependencias, se instalará el paquete siguiente (%d "
+#~ "MB)"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - intentar y encontrar archivo synthesis.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - intentar encontrar y usar archivo hdlist.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "falta «with» para soporte de red\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "opciones desconocidas «%s»\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "protocolo desconocido definido para %s"
 
diff --git a/po/et.po b/po/et.po
index f8678a52..a6630c61 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-12-04 01:04+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "RPM-i paigaldamine"
 
@@ -25,7 +26,8 @@ msgstr "RPM-i paigaldamine"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Viga: faili %s ei leitud, toiming katkestatakse"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Olgu"
 
@@ -80,20 +82,23 @@ msgstr ""
 "\n"
 "Võib-olla soovite siiski seda lihtsalt salvestada? Mida ette võtta?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Paigalda"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Loobu"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Valige faili salvestamise koht"
 
@@ -103,18 +108,21 @@ msgid "Unknown option %s"
 msgstr "Tundmatu võti %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Pakette pole valitud"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Palun oodake..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Vajalikud on administraatori õigused"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -125,35 +133,42 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Olgu"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Olgu"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (uuendus)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (paigaldus)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Paketivalik"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Vajalik on üks järgnevatest pakettidest:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Katkesta"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -164,7 +179,7 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -174,25 +189,27 @@ msgstr ""
 "Sõltuvuste lahendamiseks paigaldatakse järgmised %d paketti:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Paketi paigaldamine..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "pakette ei õnnestunud hankida, katkestatakse"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Palun asetage andmekandja nimega \"%s\" seadmesse [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Paketi '%s' allalaadimine..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -205,8 +222,7 @@ msgstr ""
 "\n"
 "Kas jätkata paigaldamisega?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -217,35 +233,38 @@ msgstr ""
 "%s\n"
 "Te võiksite ehk uuendada urpmi andmebaasi"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "%s eemaldamine"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Valmistumine..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Paketi '%s' paigaldamine (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Tehtud"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Kõik on juba paigaldatud"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Paigaldus lõpetatud"
 
@@ -259,19 +278,23 @@ msgstr ""
 "kus [võtmed] on\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - näitab seda abiteadet.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr ""
 "   --root <asukoht>  - asukoha / asemel kasutatakse määratud juurkataloogi.\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [grupp]     - piirab tulemused määratud grupiga.\n"
 
 #: ../rpm-find-leaves:19
+#, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - näitab RPM-i täielikku nime (NVRA).\n"
 
@@ -280,209 +303,127 @@ msgstr "   -f             - näitab RPM-i täielikku nime (NVRA).\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    vaikimisi on %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Pakette võib paigaldada ainult administraator"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Urpmi käivitamine piiratud režiimis..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb avamine ebaõnnestus"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr "puhvris leiti %d RPM-päist, eemaldatakse %d iganenud päist"
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "vigane RPM-faili nimi [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-faili [%s] tõmbamine..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...tõmbamine tehtud"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...tõmbamine ebaõnnestus: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ligipääs RPM-failile [%s] ebaõnnestus"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "spetsifikatsioonifaili %s parsimine ebaõnnestus [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "RPM-faili registreerimine ebaõnnestus"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Sobimatu arhitektuur RPM-ile [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "viga kohalike pakettide registreerimisel"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "See operatsioon on piiratud režiimis keelatud"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "käsureal on määratud vigane puhverserver\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-kataloogi ei ole olemas"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Võtme --use-distrib kasutamiseks peate olema administraator"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPM-faili \"%s\" lugemine ebaõnnestus\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s kasutamine on võimalik ainult koos %s-ga"
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, fuzzy, c-format
+msgid "Can't use %s with %s"
+msgstr "%s kasutamine on võimalik ainult koos %s-ga"
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "Liiga palju argumente\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "EeNn"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Vabandust, selline valik ei ole lubatud. Proovige uuesti\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "mput ebaõnnestus, võib-olla pole sõlm kättesaadav"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "sõlmes %s on urpme vana versioon, palun uuendage"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "rshp ebaõnnestus, võib-olla pole sõlm kättesaadav"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "sõlmes %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Sünteesifaili levitamine sõlmedes"
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "Sõltuvuste lahendamine sõlmedes..."
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Failide jagamine sõlmedesse..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Paigaldamise võimalikkuse kontroll sõlmedes..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "Paigaldamine ebaõnnestus sõlmes %s"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Paigaldamine on võimalik"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Pakettide paigaldamine sõlmedes..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "scp ebaõnnestus masinas %s (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "Sünteesifaili levitamine masinasse %s..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "Sõltuvuste lahendamine masinas %s..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "masinas %s puudub urpmi korralik versioon (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "Failide jagamine masinasse %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "Paigaldamise võimalikkuse kontroll masinas %s..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "Paigaldamine masinas %s..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "%s paigaldamine masinas %s..."
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "Paigaldamiseks valmistumine masinas %s..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -500,47 +441,62 @@ msgstr ""
 "\n"
 "kasutamine:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - näitab seda abiteadet.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - valib automaatselt ühe paketi, kui võimalusi on mitu.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - kontrollitakse, kas eemaldamine on korrektselt võimalik.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - käivitatakse ka siis, kui mõnda nõutud paketti ei ole "
 "olemas.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel     - jagatud urpmi käivitamine üle mitme aliasega määratud "
 "masina.\n"
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - pakendab failid uuesti enne kustutamist.\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - muu baasi kasutamine RPM-ide eemaldamisel.\n"
 
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - muu baasi kasutamine RPM-ide paigaldamisel.\n"
+
+#: ../urpme:52
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - pakettide skripte ei käivitata.\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
@@ -549,74 +505,79 @@ msgstr ""
 "                   kasulik chroot paigaldamiseks/eemaldamiseks võtmega --"
 "root.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "    --probe-synthesis - kasutatakse sünteesifaili.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "    --probe-hdlist - kasutatakse hdlist-faili.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - selgitav režiim.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - selgitav režiim.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Tarkvara võib eemaldada ainult administraator"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "tundmatu pakett"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "tundmatud paketid"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "tundmatu pakett"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "%s sisaldub järgmistes pakettides: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketi %s eemaldamine halvab Teie süsteemi"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Pole midagi eemaldada"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Kontrollitakse, kas on võimalik eemaldada järgmised paketid"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "Sõltuvuste lahendamiseks tuleb eemaldada järgmised %d paketti (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (j/E) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "Kas eemaldada %d paketti?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (j/E) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Eemaldamine ebaõnnestus"
 
@@ -638,216 +599,263 @@ msgstr ""
 "kasutamine:\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - näitab programmi versiooni.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - kasutatakse spetsiifilist keskkonda (tavaliselt\n"
 "                   vearaportideks).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia        - ei kasutata määratud andmekandjaid (eraldajaks "
 "koma).\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 "  --literal, -l  - mustrina tõlgendamise asemel kasutatakse argumenti "
 "täpselt esitatud kujul.\n"
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - kasutatakse ainult määratud andmekandjaid (eraldajaks "
 "koma).\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - sorteerib andmekandjad alamstringide põhjal (eraldajaks "
 "koma).\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - kasutatakse sünteesi urpmi andmebaasi asemel.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - ei näidata ühesuguseid ridu.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - kasutatakse ainult uuendus-andmekandjat.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - selgitav režiim.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - tõstutundetu igas olukorras.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - tõstu arvestamine mustrites (vaikimisi).\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - väljade eraldaja muutmine (vaikimisi ':').\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mustriavaldised:\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - suvalist teksti parsitakse regulaaravaldisena, kui ei "
 "kasutata võtit -l.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - kaasab otseselt perli koodi kui perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binaaroperaator AND.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binaaroperaator OR.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unaaroperaator NOT.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - parem- ja vasakpoolne sulg.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "Siltide nimekiri:\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - printf laadis vormindatud väljund\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   näide: '%%name:%%files'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arhitektuur\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - valmistajamasin\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - valmistamisaeg\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - konfiguratsioonifailid\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - konfliktide sildid\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - paketi kirjeldus\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distributsioon\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - epohh\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - paketi failinimi\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - paketi failide nimekiri\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grupp\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - paketi nimi\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - iganenute sildid\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - paketi valmistaja\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - pakutavate sildid\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - nõutavate sildid\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - paigalduse suurus\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - lähtekoodi RPM-i nimi\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - kokkuvõte\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - tootja\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - paketti sisaldav andmekandja\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - näitab koos nimega versiooni, väljalaset ja "
 "arhitektuuri.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Vigane vorming: kasutada tohib ainult üht mitme väärtusega silti"
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "spetsiifilise keskkonna kasutamine %s -l\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -855,11 +863,12 @@ msgstr ""
 "Märkus: kuna ükski otsitud andmekandja ei kasutanud hdlisti, ei suutnud "
 "urpmf mingit tulemust anda\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Paketi otsimiseks nime järgi tasuks pruukida võtit --name.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -876,14 +885,16 @@ msgstr ""
 "\n"
 "kasutamine:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - soovitud pakettide otsinguks kasutatakse ainult määratud "
 "andmekandjaid.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
@@ -891,12 +902,29 @@ msgstr ""
 "  --auto         - mitteinteraktiivne režiim, eeldatakse kõigile küsimustele "
 "vaikimisi pakutavaid vastuseid.\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - valib automaatselt paketid süsteemi uuendamiseks.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr "  --auto-select  - valib automaatselt paketid süsteemi uuendamiseks.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - keelatakse faili MD5SUM kontroll.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - sunnib uuendama gpg võtit.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -904,11 +932,13 @@ msgstr ""
 "  --no-uninstall - kunagi ei paluta paketti eemaldada, paigaldusest "
 "loobuda.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - pakette ei paigaldata (ainult tõmmatakse).\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -916,7 +946,7 @@ msgstr ""
 "  --keep         - säilitab võimalusel olemasolevad paketid, lükkab tagasi\n"
 "                   soovitud paketid, mis toovad kaasa eemaldamise.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -927,33 +957,39 @@ msgstr ""
 "                   uuendatakse enam kui määratud arv pakette,\n"
 "                   vaikimisi on see %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - väikese tehingu pikkus, vaikimisi %d.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - lubab ebatäpset otsingut.\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s      - järgmine pakett on lähtetekstipakett.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - paigaldab ainult lähtetekstipaketi (mitte binaarpaketi).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - eemaldab enne muud tegevust RPM-i puhvrist.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - säilitab puhvris mittekasutatud RPM-id.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -961,7 +997,8 @@ msgstr ""
 "  --allow-nodeps - lubab kasutajal paigaldamise\n"
 "                   pakettide sõltuvusi kontrollimata.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -969,11 +1006,13 @@ msgstr ""
 "  --allow-force  - lubab kasutajal paigaldada pakette ilma\n"
 "                   sõltuvusi ja sobivust kontrollimata.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - muu baasi kasutamine RPM-ide paigaldamisel.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -981,39 +1020,48 @@ msgstr ""
 "  --use-distrib  - seadistab urpmi lennult distributsioonipuu põhjal,\n"
 "                   kasulik chroot paigaldamiseks võtmega --root.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - wget kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - curl'i kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla     - prozilla kasutamine kaugfailide tõmbamiseks.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - curl'i lisavõtmed\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- rsync'i lisavõtmed\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - wget'i lisavõtmed\n"
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - prozilla lisavõtmed\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - piirab allalaadimiskiirust.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1021,7 +1069,8 @@ msgstr ""
 "  --resume       - taasalustab osaliselt alla tõmmatud failide tõmbamist\n"
 "                   (--no-resume tühistab selle, vaikimisi on väljas).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1030,7 +1079,8 @@ msgstr ""
 "eeldatavalt\n"
 "                   vaikimisi 1080 (vorming on <puhverserver[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1039,6 +1089,7 @@ msgstr ""
 "                   autentimiseks (vorming: <kasutajanimi:parool>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1047,6 +1098,7 @@ msgstr ""
 "                   järgnevas argumendis.\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1055,6 +1107,7 @@ msgstr ""
 "                   (--no-verify-rpm tühistab selle, vaikimisi on sees).\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1062,40 +1115,39 @@ msgstr ""
 "  --test         - kontrollitakse, kas paigaldus on korrektselt võimalik.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eirab asukohta (või asukohti, eraldajaks koma).\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - jätab välja dokumentatsioonifailid.\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - kettaruumi ei kontrollita enne paigaldamist.\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - lubab paigaldada sobimatule arhitektuurile mõeldud RPM-"
 "e.\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - pakettide skripte ei käivitata.\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - keelatakse faili MD5SUM kontroll.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - sunnib uuendama gpg võtit.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - paigaldamisel vahele jäetavad paketid.\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1103,40 +1155,48 @@ msgstr ""
 "  --more-choices - mitme paketi leidmisel pakutakse lisaks vaikevalikule\n"
 "                   ka teisi valikuid.\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - RPM-ide andmebaasi ei lukustata.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - uuendatakse ainult senise arhitektuuriga pakette.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - valib kõik käsureaga sobivad.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - lubab pakette otsida pakutavate seas.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - ei luba pakettide otsimist pakutavate seas.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - vaikne režiim.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  paigaldatakse käsureal antud nimed või RPM-failid.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "Viga: võtit --auto-select ei saa kasutada koos pakettide loendiga.\n"
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
@@ -1144,11 +1204,12 @@ msgstr ""
 "Viga: vearaporti loomiseks kasutage koos võtmega --bug\n"
 "tavalisi käsureaargumente.\n"
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Binaarseid RPM-faile ei saa paigaldada võtme --install-src kasutamisel"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1157,21 +1218,22 @@ msgstr ""
 "Kataloog [%s] on juba olemas, palun kasutage vearaportideks muud kataloogi "
 "või kustutage see"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Kataloogi [%s] loomine vearaportideks ebaõnnestus"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Kopeerimine ebaõnnestus"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "Keskkonna kataloogi %s ei ole olemas"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1180,52 +1242,59 @@ msgstr ""
 "Viga: %s paistab olevat haagitud ainult loetavana.\n"
 "Kasutage operatsiooni pealesundimiseks võtit --allow-force."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "Andmekandja uuendamine...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uuendus)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uuendus)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (paigaldus)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (paigaldus)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Millise valite? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Järgmisi pakette ei saa paigaldada, sest nad sõltuvad pakettidest, mis on "
+"vanemad kui paigaldatud paketid:\n"
+"%s"
+msgstr[1] ""
 "Järgmisi pakette ei saa paigaldada, sest nad sõltuvad pakettidest, mis on "
 "vanemad kui paigaldatud paketid:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1233,58 +1302,80 @@ msgstr ""
 "\n"
 "Kas siiski paigaldamist jätkata?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (J/e) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Mõnda soovitud paketti ei õnnestu paigaldada:\n"
+"%s"
+msgstr[1] ""
 "Mõnda soovitud paketti ei õnnestu paigaldada:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Paigaldamist ei saa jätkata, sest teiste uuendamiseks tuleb eemaldada\n"
+"järgmised paketid:\n"
+"%s\n"
+msgstr[1] ""
 "Paigaldamist ei saa jätkata, sest teiste uuendamiseks tuleb eemaldada\n"
 "järgmised paketid:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
+"%s"
+msgstr[1] ""
 "Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(ainult test, tegelikult midagi ei eemaldata)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid"
+msgstr[1] "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid"
 
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d pakett(i), %d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1293,88 +1384,106 @@ msgstr ""
 "Järgmiste sõltuvuste paigaldamiseks peate olema administraator:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(ainult test, tegelikult midagi ei paigaldata)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "Kas paigaldada %d paketti? (%d MB)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "Kas paigaldada %d paketti? (%d MB)"
+msgstr[1] "Kas paigaldada %d paketti? (%d MB)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Vajutage Enter, kui see on tehtud..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Järgmistel pakettidel on vigane signatuur"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Järgmistel pakettidel on vigane signatuur"
+msgstr[1] "Järgmistel pakettidel on vigane signatuur"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Kas jätkata paigaldusega?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "%s jaotamine"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s paigaldamine andmekandjalt %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "%s paigaldamine"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "Paigaldamine ebaõnnestus:"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata? (j/E)"
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Kas proovida paigaldust veel jõulisemalt (--force)? (j/E) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d paigaldamistehingut ebaõnnestus"
 
-#: ../urpmi:824
-msgid "Packages are up to date"
-msgstr "Pole ühtegi paketti uuendada"
-
-#: ../urpmi:827
+#: ../urpmi:828
 #, c-format
-msgid "Packages %s are already installed"
-msgstr "Paketid %s on juba paigaldatud"
+msgid "Installation is possible"
+msgstr "Paigaldamine on võimalik"
 
-#: ../urpmi:828
+#: ../urpmi:833
 #, c-format
+msgid "Packages are up to date"
+msgstr "Pole ühtegi paketti uuendada"
+
+#: ../urpmi:840
+#, fuzzy, c-format
 msgid "Package %s is already installed"
-msgstr "Pakett %s on juba paigaldatud"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Pakett %s on juba paigaldatud"
+msgstr[1] "Pakett %s on juba paigaldatud"
 
-#: ../urpmi:847
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Paketid %s on juba paigaldatud"
+msgstr[1] "Paketid %s on juba paigaldatud"
+
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "urpmi taaskäivitamine"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1397,45 +1506,55 @@ msgstr ""
 "ja [võti] on üks järgmistest\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - loob uuendatava andmekandja.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis             - püütakse kasutada sünteesifaili.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
+msgstr "    --probe-synthesis - kasutatakse sünteesifaili.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - püütakse kasutada hdlist-faili.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
+msgstr "    --probe-hdlist - kasutatakse hdlist-faili.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - ei püüta kasutada sünteesi-\n"
 "                   või hdlist-faili.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 "  --distrib      - loob automaatselt kõik andmekandjad paigalduskohalt.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - koos võtmega --distrib küsib kinnitust iga andmekandja "
 "puhul\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 "  --all-media    - koos võtmega --distrib lisab kõik loetletud "
 "andmekandjad.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1444,7 +1563,8 @@ msgstr ""
 "  --from         - kasutab määratud URL-i peeglite loendi jaoks, vaikimisi\n"
 "                   on see %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1452,49 +1572,70 @@ msgstr ""
 "  --virtual      - loob virtuaalse andmekandja, mis on alati värske,\n"
 "                   lubatud on ainult protokoll file://.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - keelatakse faili MD5SUM kontroll.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - lisatud andmekandja avalikku võtit ei impordita\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - andmekandja lisatakse seadistustefaili, aga seda ei "
 "uuendata.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - puhastab päistepuhvri kataloogi.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - sunnib genereerima hdlist-faile.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - vaikne režiim.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - selgitav režiim.\n"
+
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "andmekandja \"%s\" uuendamine ebaõnnestus\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Andmekandjaid võib lisada ainult administraator"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Luuakse seadistustefail [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Seadistustefaili [%s] loomine ebaõnnestus"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 "võtme --distrib puhul puudub vajadus anda <suhteline tee hdlist juurde>"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1503,16 +1644,17 @@ msgstr ""
 "\n"
 "Kas soovite lisada andmekandja '%s'?"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "Puudub <suhteline tee hdlist juurde>\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "võrguandmekandjal peab olema määratud `with'\n"
+#: ../urpmi.addmedia:169
+#, fuzzy, c-format
+msgid "Can't use %s with remote medium"
+msgstr "%s kasutamine on võimalik ainult koos %s-ga"
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
@@ -1535,32 +1677,38 @@ msgstr ""
 "kasutamine:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - määrab taaspakendamise alguspunkti\n"
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 "  --noclean      - taaspakendamise kataloogi kontrollpunktis ei puhastata\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - tehingute nimekiri alates määratud kuupäevast/"
 "ajavahemikus\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr ""
 "  --list-all     - kõigi RPM-ide andmebaasis olevate tehingute nimekiri "
 "(pikk)\n"
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-safe    - kõigi tehingute nimekiri alates kontrollpunktist\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
@@ -1568,118 +1716,121 @@ msgstr ""
 "  --rollback     - taastamine konkreetse kuupäeva järgi\n"
 "                   või määratud tehingute arvu järgi\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - taaspakendamine keelatakse\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "Vigane kuupäev või kestvus [%s]\n"
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr "Taaspakendamiskataloog pole määratud\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "Kirjutamine taaspakendamiskataloogi ebaõnnestus [%s]\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "Taaspakendamiskataloogi puhastamine [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "%d faili eemaldatud\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "Vigased käsureaargumendid [%s]\n"
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr "Korraga ei saa kasutada võtit --checkpoint ja --rollback\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr "Korraga ei saa kasutada võtit --checkpoint ja --list\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "Korraga ei saa kasutada võtit --rollback ja --list\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "Võtit --disable ei saa kasutada koos teiste võtmetega"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "Ei leitud ühtegi tehingut alates %s\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "Selleks peavad olema administraatori õigused"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "RPM-i makrofaili kirjutamine [%s]...\n"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr "Taastamiskuupäeva ei leitud\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "Taastamine seisuga %s...\n"
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr "Taaspakendamise keelamine\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "kasutamine: urpmi.removemedia [-a] <nimi> ...\n"
 "kus <nimi> on eemaldatava andmekandja nimi.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - valib kõik andmekandjad.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - andmekandjate ligilähedane sobivus.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"tundmatu võti '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Andmekandjaid võib eemaldada ainult administraator"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "ei ole midagi eemaldada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1689,6 +1840,7 @@ msgstr ""
 "(võimalikud: %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1697,32 +1849,48 @@ msgstr ""
 "kus <nimi> on uuendatava andmekandja nimi.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - uuendab ainult uuendus-andmekandjat.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - sunnib uuendama gpg võtit.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - uuendamist ette ei võeta, andmekandjat eiratakse.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 "  --no-ignore    - uuendamist ette ei võeta, andmekandjat siiski "
 "arvestatakse.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - valib kõik mitte-eemaldatavad andmekandjad.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - sunnib genereerima hdlist-faile.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Andmekandjaid võib uuendada ainult administraator"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ei ole midagi uuendada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1731,21 +1899,21 @@ msgstr ""
 "puudub uuendatava kirje nimi\n"
 "(võimalikud: %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "andmekandja %s arvestamine"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "andmekandja %s ignoreerimine"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "andmekandja %s arvestamine"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1764,6 +1932,7 @@ msgstr ""
 "kasutamine:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1772,43 +1941,52 @@ msgstr ""
 "kasutatakse ainult määratud andmekandjaid.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - lubab ebatäpset otsingut (sama, mis -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - näitab saadaolevaid pakette.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - näitab saadaolevaid andmekandjaid.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - näitab saadaolevaid andmekandjaid URL-idega.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - näitab saadaolevaid sõlmi, kui kasutatakse võtit --"
 "parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - näitab saadaolevaid aliaseid.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - seadistusest tehakse tõmmis kujul urpmi.addmedia võti.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - järgmine pakett on lähtetekstipakett (sama, mis -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
@@ -1816,10 +1994,12 @@ msgstr ""
 "(ainult administraator).\n"
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - lubab sobimatu arhitektuuriga RPM-ide päringuid.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1827,102 +2007,200 @@ msgstr ""
 "  --use-distrib  - seadistab urpmi lennult distributsioonipuu põhjal.\n"
 "                   Võimaldab esitada päringu distributsiooni kohta.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - näitab muutuste logi.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - näitab kokkuvõtet.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - täielik väljund eemaldatavate pakettidega.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - laiendab päringut paketi sõltuvustele.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - näitab koos nimega ka gruppi.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - näitab kasulikku infot ka inimesele arusaadaval kujul.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - näitab faile paketis.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - ei luba pakettide otsimist pakutavate seas (vaikimisi).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - lubab pakette otsida pakutavate seas.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - näitab koos nimega ka versiooni ja väljalaset.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - kohandab otsingu sellele, mida pakett nõuab.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR            - laiendatud kohandatud otsing (kaasa arvatud virtuaalsed "
 "paketid).\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - järgmine pakett on lähtetekstipakett (sama, mis --src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "  -u             - eemaldab paketi, kui uuem versioon on juba paigaldatud.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - lubab ebatäpset otsingut (sama, mis --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - nagu -y, aga sunnib sobivusi leidma tõstutundetult.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  päringu esitamine käsureal antud nimede või RPM-failide kohta.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "võtit --list-nodes saab kasutada ainult koos võtmega --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "andmekandja %s jäetakse vahele: hdlist puudub"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Failinimekirja ei leitud\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Muutuste logi ei leitud\n"
 
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "mput ebaõnnestus, võib-olla pole sõlm kättesaadav"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr "sõlmes %s on urpme vana versioon, palun uuendage"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "rshp ebaõnnestus, võib-olla pole sõlm kättesaadav"
+
+#~ msgid "on node %s"
+#~ msgstr "sõlmes %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Sünteesifaili levitamine sõlmedes"
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "Sõltuvuste lahendamine sõlmedes..."
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Failide jagamine sõlmedesse..."
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Paigaldamise võimalikkuse kontroll sõlmedes..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Paigaldamine ebaõnnestus sõlmes %s"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Pakettide paigaldamine sõlmedes..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "scp ebaõnnestus masinas %s (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "Sünteesifaili levitamine masinasse %s..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "Sõltuvuste lahendamine masinas %s..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "masinas %s puudub urpmi korralik versioon (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Failide jagamine masinasse %s..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "Paigaldamise võimalikkuse kontroll masinas %s..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Paigaldamine masinas %s..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "%s paigaldamine masinas %s..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Paigaldamiseks valmistumine masinas %s..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr ""
+#~ "  --probe-synthesis             - püütakse kasutada sünteesifaili.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - püütakse kasutada hdlist-faili.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "võrguandmekandjal peab olema määratud `with'\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "tundmatu võti '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "tundmatu protokoll %s jaoks"
 
diff --git a/po/eu.po b/po/eu.po
index b764fd6e..1c356d56 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-05-08 23:54+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: EUSKARA <itzulpena@euskalgnu.org>\n"
@@ -19,7 +19,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "RPM instalaketa"
 
@@ -28,7 +29,8 @@ msgstr "RPM instalaketa"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Akatsa: ezin da %s fitxategia aurkitu, eragiketa galaraziko da"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Ados"
 
@@ -83,20 +85,23 @@ msgstr ""
 "\n"
 "Baliteke gordetzea bakarrik nahi izatea. Zer egin nahi duzu?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Instalatu"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Gorde"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Utzi"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Aukeratu fitxategiko gordetzeko kokalekua"
 
@@ -106,18 +111,21 @@ msgid "Unknown option %s"
 msgstr "Aukera ezezaguna %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Ez da paketerik zehaztu"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Itxaron mesedez..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Root izan behar da"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -128,35 +136,42 @@ msgstr ""
 "%s\n"
 "Instalazioarekin jarraitu hala ere?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Ados"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Kontuz"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Ados"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (Eguneratu)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (instalatu)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Paketa aukera"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ondoko paketeetako bat behar da:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Geldiarazi"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -167,7 +182,7 @@ msgstr ""
 "%s\n"
 "Instalazioarekin jarraitu hala ere?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -177,25 +192,27 @@ msgstr ""
 "Mendekotasunak asetzeko, ondoko %d paketeak instalatuko dira:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Paketearen instalazioa..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ezin dira iturburuko paketeak lortu, abortatzen"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Sartu \"%s\" izena duen euskarria [%s] gailuan"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' paketea deskargatzen..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -208,8 +225,7 @@ msgstr ""
 "\n"
 "Instalazioarekin jarraitu nahi duzu?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -220,35 +236,38 @@ msgstr ""
 "%s\n"
 "Zure urpmi datu-basea eguneratzea komeni da"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "%s kentzen"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Prestatzen..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' paketea instalatzen (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Instalazioak huts egin du"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Eginda"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Dena dago instalatuta"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Instalazioa amaitu da"
 
@@ -262,19 +281,22 @@ msgstr ""
 "[aukerak] hemengoak dira\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - laguntza-mezu hau inprimatzen du.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <bidea>  - erabili emaniko erroa \"/\" ordez\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [taldea]     - emaitzak talde jakin batera murrizten ditu.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - taldeak ere izenarekin inprimatzen ditu.\n"
 
@@ -283,210 +305,127 @@ msgstr "  -g             - taldeak ere izenarekin inprimatzen ditu.\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    lehenetsia %s da.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Supererabiltzaileak bakarrik du paketeak instalatzeko baimena"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "urpmi modu murriztuan exekutatzen..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "ezin da rpmdb ireki"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "rpm fitxategi-izen baliogabea [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "[%s] rpm fitxategia berreskuratzen..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...berreskuratu da"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...berreskuratzeak huts egin du: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ezin izan da rpm fitxategia atzitu [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "[%s] fitxategian ezin da \"%s\" analizatu"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "ezin da rpm fitxategia erregistratu"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "rpm-rentzako arkitektura bateraezina [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "errorea pakete lokalak erregistratzean"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Eragiketa hau debekatuta dago modu murriztuan exekutatzerakoan"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "proxy-adierazpen okerra komando-lerroan\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
-#, fuzzy
+#: ../urpm/args.pm:133
+#, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "%s ingurune direktorioa ez da existitzen"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Root-a izan behar duzu --use-distrib erabiltzeko"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, c-format
+msgid "Can't use %s with %s"
+msgstr ""
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "eEnN"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "bByYsS"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Aukera okerra, saiatu berriro\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "mput-ek huts egin du, agian korapilune bat eskuraezin dago"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "%s korapiluneak urpme-ren bertsio zahar bat dauka, eguneratu mesedez"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "rshp-ek huts egin du, agian korapilune bat eskuraezin dago"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "%s korapilunean"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Sistesia korapiluneetara barreiatzen..."
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "Korapilunetan menpekotasunak ebazten..."
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Korapiluneetara fitxategiak banatzen..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Korapiluneetan instalaketa egin daitekeen egiaztatzen..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "Instalaketak huts egin du %s korapilunean"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Instalazioa posible da"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Korapiluneetan paketeak instalatzen..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "scp-ek huts egin du %s ostalarian (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "%s-ra sistesia barreiatzen..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "%s-n menpekotasunak ebazten..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "%s ostalariak ez dauka urpmi-ren bertsio egokia (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "%s-ra fitxategiak banatzen..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "%s-n instalaketa egin daitekeen egiaztatzen..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "%s-n instalaketa gauzatzen..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "%s %s-n instalatzen..."
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "%s-n instalaketa prestatzen..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -504,44 +443,57 @@ msgstr ""
 "\n"
 "erabilera:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - laguntza-mezu hau inprimatzen du.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - automatikoki pakete bat hautatzen du aukeratik.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - ezabaketa egokiro egin daitekeen egiaztatzen du.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - deitzea behartzen du, nahiz eta pakete batzuk ez egon.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi banatzen du alias-makinen artean.\n"
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - fitxategiak bir-paketatu ezabatu aurretik\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - beste root bat erabiltzen du rpm ezabaketarako.\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - beste root bat erabiltzen du rpm instalatzeko.\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - ez du scriptlet(s) paketea exekutatzen\n"
 
-#: ../urpme:52
-#, fuzzy
+#: ../urpme:53
+#, fuzzy, 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"
@@ -550,82 +502,85 @@ msgstr ""
 "                   erabilgarria chroot --root aukerarekin (des)"
 "instalatzeko.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - laburpen-fitxategia bilatzen eta erabiltzen saiatzen "
 "da.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr ""
 "  --probe-hdlist - hdlist fitxategia bilatzen eta erabiltzen saiatzen da.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modu berritsua.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - modu berritsua.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - pakete denak hautatzen ditu bat datozen adierazpenak "
 "kontuan hartuz.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Supererabiltzaileak soilik dauka paketeak ezabatzeko baimena"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "pakete ezezaguna"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "pakete ezezagunak"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pakete ezezaguna"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Ondoko paketeek %s dute: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s paketea kentzen baduzu, sistema apurtuko duzu"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Ez dago ezer kentzeko"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Ondoko paketeak kentzeko egiaztatzen"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "Mendekotasunak asetzeko, ondoko %d paketeak ezabatu egingo dira (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (b/E) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "%d paketea ezabatu?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (b/E) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Kentzean huts egin du"
 
@@ -647,217 +602,263 @@ msgstr ""
 "erabilera: urpmf [aukerak] adierazpen-patroia\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - inprimatu tresna honen bertsio zenbakia.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - ingurune espezifikoa erabiltzen du (normalean\n"
 "                   errorearen berri ematea).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - ez erabili adierazitako euskarria, komaz bereizita.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 "  --literal, -l  - ez parekatu patroi gisa, erabili argumentua hitzez hitz "
 "testu ilara gisa.\n"
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - emandako euskarria bakarrik erabiltzen du, komaz "
 "bereizita.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - euskarriak komaz bereizitako azpikateen arabera "
 "ordenatzen ditu.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - ez inprimatu lerro berdinak.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - eguneratze-euskarria bakarrik erabiltzen du.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modu berritsua.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - ez bereizi maiuskulak eta minuskulak ereduetan.\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - ez bereizi maiuskulak eta minuskulak ereduetan.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - aldatu eremu bakantzailea (lehenetsia ':').\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "Adierazpen patroiak:\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - edozein testu regexp bezala aztertzen da, -l erabiltzen "
 "denean ezik..\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - perl kodea sartzen du zuzenean perl -e gisa.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - ETA eragile bitarra.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - EDO eragile bitarra.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - EZ unarioa.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - ezker eta eskuin parentesiak.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "Etiketa zerrendak:\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - printf-antzeko irteera formatua zehazten du\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   adibidez: '%%name:%%files'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arkitektura\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - eraikuntza ostalaria\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - eraikuntza ordua\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - konfiguraketa fitxategiak\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - \"gatazka\" etiketak\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description - paketeen deskribapena\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - banaketa\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - garaia.\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - paketearen fitxategi izena\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - paketeak biltzen dituen fitxategien izen zerrenda\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - taldea\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - pakete izena\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - \"zaharkituak\" etiketak\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - paketatzailea\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - \"hornitu\" etiketak.\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - \"beharrezko\" etiketak\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - neurria instalatu ondoren\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - rpm iturburu izena.\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - laburpena\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - hornitzailea\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - paketea zeukan euskarria\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f - bertsioa, argitalpena eta fitxategia ere izenarekin inprimatzen "
 "ditu.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Formatu okerra: etiketa balio-anitz bakarra erabili dezakezu"
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s(e)n ingurune espezifikoa erabiliz\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -865,11 +866,12 @@ msgstr ""
 "Oharra: bilatutako euskarriek ez dutenez hdlists erabiltzen, urpmf-ek ezin "
 "izan du emaitzarik itzuli\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "--name erabili dezakezu pakete izenen arabera bilatzeko.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -886,14 +888,16 @@ msgstr ""
 "\n"
 "erabilera:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - soilik adierazitako euskarria erabiltzen du eskatutako "
 "paketeak bilatzeko.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
@@ -901,14 +905,33 @@ msgstr ""
 "  --auto         - modu ez-interaktiboa, galderen erantzun lehenetsiak "
 "erabili.\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select - automatikoki sistemaren bertsioa berritzeko paketeak "
 "hautatzen ditu\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select - automatikoki sistemaren bertsioa berritzeko paketeak "
+"hautatzen ditu\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - MD5SUM fitxategiaren egiaztapena desgaitzen du.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gpg gakoa eguneratzera behartzen du.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -916,11 +939,13 @@ msgstr ""
 "  --no-uninstall - inoiz ez du pakete bat desinstalatu nahi den galdetzen, "
 "instalazioa bertan behera uzten da.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - paketeak ez instalatu (jaitsi soilik)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -928,7 +953,7 @@ msgstr ""
 "  --keep         - gorde lehendik dauden paketeak ahal bada, ezetsi kentzea\n"
 "                   eragiten duten pakete-eskaerak.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -940,34 +965,39 @@ msgstr ""
 "                   baino gehiago instalatu edo bertsio-berrituko badira,\n"
 "                   lehenetsia %d da.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - transakzio txikiaren luzera, lehenetsia %d da.\n"
 
-#: ../urpmi:105
-#, fuzzy
+#: ../urpmi:104
+#, fuzzy, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - hurbilketazko bilaketa inposatzen du (-y bezala).\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s      - hurrengo paketea iturburu pakete bat da.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - iturburu-paketea bakarrik instalatzen du (binarioak ez).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - kendu rpm cachetik beste ezer baino lehen.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - ez garbitu rpm-ak katxetik.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -975,7 +1005,8 @@ msgstr ""
 "  --allow-nodeps - erabiltzaileari paketeak instalatzeko eskatzeko aukera\n"
 "ematen du, mendekotasunak egiaztatu gabe.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -983,11 +1014,13 @@ msgstr ""
 "  --allow-force  - erabiltzaileari paketeak instalatzeko eskatzeko aukera\n"
 "ematen du, mendekotasunak eta osotasuna egiaztatu gabe.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - beste root bat erabiltzen du rpm instalatzeko.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -995,42 +1028,49 @@ msgstr ""
 "  --use-distrib  - urpmi berehala konfiguratzen du distrib zuhaitzetik, \n"
 "                   erabilgarria chroot --root aukerarekin instalatzeko.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - wget erabiltzen du urruneko fitxategiak eskuratzeko.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl - curl erabiltzen du urruneko fitxategiak eskuratzeko.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl - curl erabiltzen du urruneko fitxategiak eskuratzeko.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - curl-i aukera gehiago pasatzeko\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- rsync-i aukera gehigarriak pasatzeko\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - wget-i aukera gehigarriak pasatzeko\n"
 
 #: ../urpmi:127
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --curl-options - curl-i aukera gehiago pasatzeko\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - deskarga-abiadura mugatzen du.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1039,7 +1079,8 @@ msgstr ""
 "berriro\n"
 "ekiten dio ('--no-resume'-k hori desgaitzen du; lehenetsia desgaituta da).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1048,7 +1089,8 @@ msgstr ""
 "                   1080 izan behar du lehenespenez (formatua hau da: \n"
 "<proxy-ostalaria[:ataka]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1057,6 +1099,7 @@ msgstr ""
 "erabiltzailea eta pasahitza (formatua hau da: <erabiltzailea:pasahitza>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1066,6 +1109,7 @@ msgstr ""
 "                   adierazitako direktorioan.\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1075,6 +1119,7 @@ msgstr ""
 "dago).\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1082,39 +1127,38 @@ msgstr ""
 "  --test         - instalazioa zuzen gauzatu daitekeen egiaztatzen du.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - kanpoan uzten du komaz bereizitako bide-izena.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - docs fitxategiak kanpoan uzten ditu.\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --ignoresize   - ez egiaztatu diskoan dagoen lekua instalazio aurretik.\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - bat ez datozen arkitekturetan instalatzen uzteko.\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - ez du scriptlet(s) paketea exekutatzen\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - MD5SUM fitxategiaren egiaztapena desgaitzen du.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - gpg gakoa eguneratzera behartzen du.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - instalatu behar ez liratekeen paketeak\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1122,53 +1166,62 @@ msgstr ""
 "  --more-choices - pakete ugari aurkitzen direnean, proposatu lehenetsiak\n"
 "                   baino aukera gehiago.\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - ez giltzatu rpm db.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 "  --strict-arch  - berritu soilik arkitektura berdina duten paketeak.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p     - paketeak aurkitzeko bilaketa 'provides'en egitea baimentzen du.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -p - paketeak aurkitzeko bilaketa ez du 'provides'en egiten.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - modu lasaia.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  komando-lerroan idatzitako izenak edo rpm fitxategiak instalatuko dira.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Ezin dituzu rpm fitxategi bitarrak instalatu --install-src erabilita"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1177,21 +1230,22 @@ msgstr ""
 "[%s] direktorioa badago lehendik, erabili beste direktorio bat akatsen berri "
 "emateko edo ezabatu"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Ezin da erroreen berri emateko [%s] direktorioa sortu"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Ezin izan da kopiatu"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "%s ingurune direktorioa ez da existitzen"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1200,52 +1254,59 @@ msgstr ""
 "Akatsa: %s irakurri-soilik muntatu dela dirudi.\n"
 "Erabili --allow-force eragiketa behartzeko."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "Euskarria eguneratzen...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (Eguneratu)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (Eguneratu)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (instalatu)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (instalatu)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Zein hautatzen duzu? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Ondoko paketeak ezin dira instalatu instalatuta daudenak baino zaharrago\n"
+" batzuekiko menpekotasuna dutelako:\n"
+"%s"
+msgstr[1] ""
 "Ondoko paketeak ezin dira instalatu instalatuta daudenak baino zaharrago\n"
 " batzuekiko menpekotasuna dutelako:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1253,58 +1314,80 @@ msgstr ""
 "\n"
 "Instalazioarekin jarraitu hala ere?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (B/e) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Eskatutako pakete bat ezin da instalatu:\n"
+"%s"
+msgstr[1] ""
 "Eskatutako pakete bat ezin da instalatu:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Ezin da instalazioarekin jarraitu, honako paketeak\n"
+"kendu egin behar direlako, beste batzuen bertsioa berritzeko:\n"
+"%s\n"
+msgstr[1] ""
 "Ezin da instalazioarekin jarraitu, honako paketeak\n"
 "kendu egin behar direlako, beste batzuen bertsioa berritzeko:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Pakete hauek kendu egin behar dira besteak berritzeko:\n"
+"%s"
+msgstr[1] ""
 "Pakete hauek kendu egin behar dira besteak berritzeko:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(froga soilik, ezabaketa ez da egingo)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "Mendekotasunak asetzeko, ondoko paketeak instalatuko dira:"
-
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Mendekotasunak asetzeko, ondorengo paketea instalatuko da"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] "Mendekotasunak asetzeko, ondoko paketeak instalatuko dira:"
+msgstr[1] "Mendekotasunak asetzeko, ondoko paketeak instalatuko dira:"
 
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d pakete, %d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1313,90 +1396,106 @@ msgstr ""
 "Root-a izan behar duzu ondoko mendekotasunak instalatzeko:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(froga soilik, instalazioa ez da egingo)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "%d paketeen instalazioarekin jarraitu? (%d MB)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "%d paketeen instalazioarekin jarraitu? (%d MB)"
+msgstr[1] "%d paketeen instalazioarekin jarraitu? (%d MB)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Prest zaudenean sakatu Sartu..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Ondoko pakete hauek sinadura okerra dute"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Ondoko pakete hauek sinadura okerra dute"
+msgstr[1] "Ondoko pakete hauek sinadura okerra dute"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Instalatzen jarraitu nahi duzu?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "%s banatzen"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s %s-tik instalatzen"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "%s instalatzen"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalazioak huts egin du"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Mendekotasunak egiaztatu gabe saiatu nahi duzu instalatzen? (b/E) "
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Indar handiagoz instalatzen saiatu (--force)? (b/E) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d instalazio transakzioek huts egin dute"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalazioa posible da"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Dena dago instalatuta"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Dena dago instalatuta"
+msgstr[1] "Dena dago instalatuta"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Dena dago instalatuta"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Dena dago instalatuta"
+msgstr[1] "Dena dago instalatuta"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "urpmi berrabiarazten"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1422,29 +1521,37 @@ msgstr ""
 "eta [aukerak] hemengoak diren\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - eguneratze-euskarria sortzen du.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - laburpen-fitxategia bilatzen eta erabiltzen saiatzen "
 "da.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr ""
 "  --probe-hdlist - hdlist fitxategia bilatzen eta erabiltzen saiatzen da.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - ez saiatu laburpenik edo hdlist "
 "fitxategirik                   bilatzen\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1452,16 +1559,17 @@ msgstr ""
 "  --distrib      - instalazio-euskarri batetik euskarri guztiak sortzen \n"
 "                   ditu automatikoki.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - euskarri erabilgarrien zerrenda.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1470,7 +1578,8 @@ msgstr ""
 "  --from         - ispiluen zerrendaren url espezifikoa erabiltzen du,\n"
 "                   lehenetsia %s da\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1478,63 +1587,85 @@ msgstr ""
 "  --virtual      - beti eguneratuta dauden euskarri birtualak sortzen ditu,\n"
 "                   file:// protokoloa bakarrik onartzen da.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - MD5SUM fitxategiaren egiaztapena desgaitzen du.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - ez inportatu erantsitako euskarrien gako-publikoa\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - erantsi euskarria konfig-en, baino ez eguneratu.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - garbitu goiburuen cache direktorioa.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - hdlist fitxategiak sortzera behartzen du.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modu lasaia.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modu berritsua.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "ezin da \"%s\" euskarria eguneratu\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Supererabiltzaileak soilik dauka euskarriak eransteko baimena"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Konfig fitxategia sortuko du [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Ezin da konfig fitxategia sortu [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 "ez dago <hdlist-en bide-izen erlatiboa> --distrib erabiliz eman beharrik"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlist bide-izen erlatiboa> falta da\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "sareko euskarriaren `with' falta da\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "ezin da \"%s\" euskarria sortu\n"
@@ -1557,154 +1688,157 @@ msgstr ""
 "erabilera:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - ez garbitu rpm-ak katxetik.\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr ""
 "  --list-url  - erabilgarri dauden euskarriak eta haien url-a zerrendatzen "
 "ditu.\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr ""
 "  --list-url  - erabilgarri dauden euskarriak eta haien url-a zerrendatzen "
 "ditu.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --filename     - paketearen fitxategi izena\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "ez da %s paketea aurkitu."
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "[%s] rpm fitxategia berreskuratzen..."
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "Ez da fitxategi-zerrenda aurkitu\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "Erabilera: urpmi.removemedia [-a] <izena> ...\n"
 "non <izena> kendu beharreko euskarri-izena den.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - euskarri guztiak hautatzen ditu.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - parekatze lausoa euskarri izenetan.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"aukera ezezagunak '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Supererabiltzaileak soilik dauka euskarriak ezabatzeko baimena"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "ez dago kentzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1714,6 +1848,7 @@ msgstr ""
 "(%s(e)tako bat\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1722,31 +1857,47 @@ msgstr ""
 "non <izena> eguneratu beharreko euskarri-izena den.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - eguneratze-euskarria bakarrik eguneratzen du.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gpg gakoa eguneratzera behartzen du.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - ez eguneratu, markatu euskarria baztertu gisa.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - ez eguneratu, markatu euskarria gaitu gisa.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - euskarri ez-aldagarri guztiak hautatzen ditu.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - hdlist fitxategiak sortzera behartzen du.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Supererabiltzaileak soilik dauka euskarriak eguneratzeko baimena"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "ez dago eguneratzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1755,21 +1906,21 @@ msgstr ""
 "eguneratu beharreko sarrera falta da\n"
 "(%s(e)tako bat\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "%s euskarria gaitzen"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "%s euskarria baztertzen"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "%s euskarria gaitzen"
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1788,6 +1939,7 @@ msgstr ""
 "erabilera:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1796,45 +1948,54 @@ msgstr ""
 "paketeak (edo eguneratutakoak) bilatzeko.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - hurbilketazko bilaketa inposatzen du (-y bezala).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - pakete erabilgarrien zerrenda.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - euskarri erabilgarrien zerrenda.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 "  --list-url  - erabilgarri dauden euskarriak eta haien url-a zerrendatzen "
 "ditu.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - --parallel erabiltzean erabilgarri dauden nodoen "
 "zerrenda .\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - alias paralelo erabilgarrien zerrenda.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - config urpmi.addmedia argumentu gisa iraultzen du.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - hurrengo paketea iturburu-pakete bat da (-s bezala).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
@@ -1842,11 +2003,12 @@ msgstr ""
 " (root-ek bakarrik).\n"
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --arch         - arkitektura\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1854,108 +2016,210 @@ msgstr ""
 "  --use-distrib  - urpmi berehala konfiguratzen du distrib zuhaitzetik.\n"
 "                   Horren bidez distro bati kontsulta egin diezaiokezu.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - changelog inprimatzen du.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - laburpena inprimatu.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - osatu irteera kendu behar den paketearekin.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - kontsulta paketeen mendekoetara zabaltzen du.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - taldeak ere izenarekin inprimatzen ditu.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i     - informazio erabilgarria pertsonek irakurtzeko moduan inprimatzen "
 "du.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - paketeko fitxategiak zerrendatzen ditu.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - ez bilatu 'provides'-en paketeak aurkitzeko "
 "(lehenetsia).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - bilatu 'provides'-en paketeak aurkitzeko.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 "  -r             - bertsioa eta argitalpena ere izenarekin inprimatzen "
 "ditu.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - paketeak behar duenaren alderantzizko bilaketa.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR            - alderantzizko bilaketa hedatua (alegiazko paketeak "
 "barne).\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - hurrengo paketea iturburu-pakete bat da (--src bezala).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "-u               - paketea kentzen du bertsio berriagoa instalatuta badago.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - inposatu hurbilketazko bilaketa (--fuzzy bezala).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - -y bezala, baino ez ditu hizki larri/xeheak "
 "desberdinduko.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  komando-lerroan idatzitako izenak edo rpm fitxategiak kontsultatu dira.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--nodo-zerrendak honekin bakarrik erabil daitezke: --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "saltatu %s euskarria: hdlist falta da"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Ez da fitxategi-zerrenda aurkitu\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Ez da aldaketa-erregistroa aurkitu\n"
 
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "mput-ek huts egin du, agian korapilune bat eskuraezin dago"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr ""
+#~ "%s korapiluneak urpme-ren bertsio zahar bat dauka, eguneratu mesedez"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "rshp-ek huts egin du, agian korapilune bat eskuraezin dago"
+
+#~ msgid "on node %s"
+#~ msgstr "%s korapilunean"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Sistesia korapiluneetara barreiatzen..."
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "Korapilunetan menpekotasunak ebazten..."
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Korapiluneetara fitxategiak banatzen..."
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Korapiluneetan instalaketa egin daitekeen egiaztatzen..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Instalaketak huts egin du %s korapilunean"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Korapiluneetan paketeak instalatzen..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "scp-ek huts egin du %s ostalarian (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "%s-ra sistesia barreiatzen..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "%s-n menpekotasunak ebazten..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "%s ostalariak ez dauka urpmi-ren bertsio egokia (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "%s-ra fitxategiak banatzen..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "%s-n instalaketa egin daitekeen egiaztatzen..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "%s-n instalaketa gauzatzen..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "%s %s-n instalatzen..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "%s-n instalaketa prestatzen..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "Mendekotasunak asetzeko, ondorengo paketea instalatuko da"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr ""
+#~ "  --probe-synthesis - laburpen-fitxategia bilatzen eta erabiltzen "
+#~ "saiatzen da.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr ""
+#~ "  --probe-hdlist - hdlist fitxategia bilatzen eta erabiltzen saiatzen "
+#~ "da.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "sareko euskarriaren `with' falta da\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "aukera ezezagunak '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "%s(e)rako protokolo ezezaguna definitu da"
 
diff --git a/po/fa.po b/po/fa.po
index ccd784f7..6a371afc 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2005-02-06 08:42-0500\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -19,7 +19,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "نصب RPM"
 
@@ -28,7 +29,8 @@ msgstr "نصب RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_تأیید"
 
@@ -83,20 +85,23 @@ msgstr ""
 "\n"
 "ممکن ایت ترجیح دهید فقط آن را ذخیره کنید. امنخاب شما کدام است؟"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_نصب"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_ذخیره"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_لغو"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "مکان ذخیره‌ی پرونده را انتخاب کنید"
 
@@ -108,19 +113,21 @@ msgstr ""
 "گزینه‌های ناشناخته '%s'\n"
 
 #: ../gurpmi.pm:89
-#, fuzzy
+#, fuzzy, c-format
 msgid "No packages specified"
 msgstr "هیچ بسته‌ای با نام %s"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "لطفاً صبر کنید..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "باید مدیر باشید"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -131,35 +138,42 @@ msgstr ""
 "%s\n"
 "ادامه میدهید؟"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "تایید"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "هشدار"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "تایید"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (ارتقاء دادن)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (نصب کردن)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "یکی از بسته‌های بدنبال آمده لازم است:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_ترک"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -170,7 +184,7 @@ msgstr ""
 "%s\n"
 "ادامه میدهید؟"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -180,25 +194,27 @@ msgstr ""
 "برای ارضای وابستگیها, %d بسته بدنبال آمده نصب خواهند شد:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "نصب بسته..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "نمب‌توان بسته های منبع را دریافت کرد، پایان داده می‌شود"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "لطفاً رسانه‌ی بنام \"%s\" بر دستگاه [%s] را داخل نمایید"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "بارگیری بسته `%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -211,8 +227,7 @@ msgstr ""
 "\n"
 "آیا می‌خواهید نصب را ادامه دهید؟"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -223,35 +238,38 @@ msgstr ""
 "%s\n"
 "بهتر است بانک اطلاعات urpmi را بروزسازی نمایید"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "برداشتن %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "در حال آماده کردن..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "نصب بسته `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "نصب شکست خورد"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_انجام شد"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "همه چیز قبلاً نصب شده است"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "نصب پایان یافت"
 
@@ -265,19 +283,22 @@ msgstr ""
 "[گزینه‌ها] از\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - چاپ این پیغام راهنما.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <path>  - استفاده از ریشه‌ی داده شده بجایش /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [group]     - محدودیت نتایج به گروه داده شده.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - چاپ گروه‌ها با نام.\n"
 
@@ -286,210 +307,126 @@ msgstr "  -g             - چاپ گروه‌ها با نام.\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    %s پیش‌فرض است.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "فقط کاربر برتر برای نصب بسته‌ها مجاز می‌باشد"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "نمی‌توان rpmdb را باز کرد"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "نام پرونده rpm نامعتبر [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "در حال دریافت پرونده‌ی rpm [%s] ..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...دریافت انجام گرفت"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...دریافت شکست خورد: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "نمی‌توان به پرونده rpm [%s] دسترسی یافت"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "نمی‌توان  \"%s\" را در پرونده [%s] تجزیه کرد"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "نمی‌توان پرونده rpm را بایگانی کرد"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "خطا در بایگانی کردن بسته‌های محلی"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "تعریف بد پراکسی بر خط فرمان\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "برای استفاده از این فرمان باید مدیر باشید ! \n"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: نمی‌توان پرونده rpm \"%s\" را خواند\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "NnخنoO"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "YyبfF"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "متأسفم، انتخاب بد، دوباره امتحان کنید\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
+#: ../urpm/args.pm:426
 #, c-format
-msgid "on node %s"
+msgid "Can't use %s with %s"
 msgstr ""
 
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "نصب شکست خورد"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "نصب ممکن می‌باشد"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "نصب بسته `%s' (%s/%s)..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
+#: ../urpm/args.pm:440
 #, c-format
-msgid "scp failed on host %s (%d)"
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "آزمایش پرونده ترکیب [%s]"
-
-#: ../urpm/parallel_ssh.pm:183
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "NnخنoO"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "انتشار دادن %s"
+msgid "Yy"
+msgstr "YyبfF"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "نصب بسته..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "نصب %s از %s"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "نصب بسته..."
+msgid "Sorry, bad choice, try again\n"
+msgstr "متأسفم، انتخاب بد، دوباره امتحان کنید\n"
 
 #: ../urpme:39
 #, fuzzy, c-format
@@ -507,46 +444,58 @@ msgstr ""
 "\n"
 "طرز استفاده:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - چاپ این پیغام راهنما.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - انتخاب یک بسته بطور خودکار در انتخاب‌ها.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - تصدیق کردن اینکه آیا حذف می‌تواند بدرستی انجام پذیرد.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - اجبار درخواست حتی اگر بعضی از بسته ها وجود ندارند.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi منتشر شده در بین ماشین‌های مستعار.\n"
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --packager     - چاپ برچسب بسته‌گر: packager.\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - استفاده از ریشه‌ی دیگری برای حذف نصب  rpm.\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - استفاده از ریشه‌ی دیگری برای نصب rpm.\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description  - چاپ برچسب توضیحات: توضیحات.\n"
 
-#: ../urpme:52
-#, fuzzy
+#: ../urpme:53
+#, fuzzy, 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"
@@ -554,77 +503,80 @@ msgstr ""
 "  --use-distrib  - urpmi را در هوا از درخت distrib پیکربندی می‌کند، برای\n"
 "                   نصب(برداری) یک chroot با گزینه‌ی --root مفید است.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - تلاش برای یافتن و استفاده از پرونده ترکیب.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - تلاش برای پیدا کردن و استفاده از پرونده‌ی hdlist.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - حالت لغتی.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - حالت لغتی.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - انتخاب تمام بسته‌های مطابق با عبارت.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "فقط کاربر مدیر برای برداشتن بسته‌ها مجاز است"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "بسته‌ی ناشناس"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "بسته‌های ناشناس"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "بسته‌ی ناشناس"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "بسته‌های بدنبال آمده حاوی %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "برداشتن بسته‌ی %s سیستم شما را خواهد شکست"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "هیچ چیزی برای برداشتن"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "در حال بررسی برای برداشتن بسته‌های بدنبال آمده"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "برای ارضای وابستگی‌ها، %dبسته‌های بدنبال آمده برداشته خواهند شد (%d مگابایت)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "برداشتن بسته %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "برداشتن شکست خورد"
 
@@ -645,237 +597,256 @@ msgstr ""
 "طرز استفاده:\n"
 
 #: ../urpmf:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - چاپ این پیغام راهنما.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - استفاده از محیط مشخص (معمولاً یک گزارش اشکال).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - از رسانه‌ی داده نشده استفاده نشود، جدا شده توسط ویرگول.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - فقط از رسانه‌های داده شده، جدا شده با ویرگول استفاده شود.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - ترتیب دادن رسانه‌ها بر اساس زیررشته‌ها جدا شده با ویرگول.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - استفاده از ترکیب داده شده بجای urpmi db.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - خطهای یکسان چاپ نشوند.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - فقط استفاده از رسانه‌های بروزسازی.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - حالت لغتی.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - نادیده‌گیری موارد تفاوتی در هر الگو.\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - نادیده‌گیری موارد تفاوتی در هر الگو.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - ضمیمه مستقیم رمز پرل مانند perl -e.\n"
 
-#: ../urpmf:52
-#, fuzzy
+#: ../urpmf:53
+#, fuzzy, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr ""
 "  -a             - binary AND operator, true اگر هر دو عبارت درست باشند.\n"
 
-#: ../urpmf:53
-#, fuzzy
+#: ../urpmf:54
+#, fuzzy, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr ""
 "  -o             - binary OR operator, درست است اگر یک تعریف درست باشد.\n"
 
-#: ../urpmf:54
-#, fuzzy
+#: ../urpmf:55
+#, fuzzy, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  -q             - حالت ساکت.\n"
 
-#: ../urpmf:55
-#, fuzzy
+#: ../urpmf:56
+#, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - پرانطز راست برای بستن عبارت گروه.\n"
 
-#: ../urpmf:56
-#, fuzzy
+#: ../urpmf:57
+#, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "لیست داده‌های برای ذخیره:\n"
 "\n"
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - استفاده از واسط X.\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    %s پیش‌فرض است.\n"
 
-#: ../urpmf:59
-#, fuzzy
+#: ../urpmf:60
+#, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - چاپ برچسب url: url.\n"
 
-#: ../urpmf:60
-#, fuzzy
+#: ../urpmf:61
+#, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - چاپ برچسب ساخت‌میزبان: ساختن میزبان.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "بخش تنظیم کنسول"
 
-#: ../urpmf:63
-#, fuzzy
+#: ../urpmf:64
+#, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - چاپ برچسب اختلاف‌ها: همه اختلاف‌ها.\n"
 
-#: ../urpmf:64
-#, fuzzy
+#: ../urpmf:65
+#, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - چاپ برچسب توضیحات: توضیحات.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - چاپ برچسب epoch: epoch.\n"
 
-#: ../urpmf:67
-#, fuzzy
+#: ../urpmf:68
+#, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - فقط نام‌های بسته چاپ شود.\n"
 
-#: ../urpmf:68
-#, fuzzy
+#: ../urpmf:69
+#, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - پرونده‌های در بسته را فهرست می‌کند\n"
 
-#: ../urpmf:69
-#, fuzzy
+#: ../urpmf:70
+#, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - چاپ برچسب گروه: گروه.\n"
 
-#: ../urpmf:70
-#, fuzzy
+#: ../urpmf:71
+#, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - فقط نام‌های بسته چاپ شود.\n"
 
-#: ../urpmf:71
-#, fuzzy
+#: ../urpmf:72
+#, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
 
-#: ../urpmf:72
-#, fuzzy
+#: ../urpmf:73
+#, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - چاپ برچسب بسته‌گر: packager.\n"
 
-#: ../urpmf:73
-#, fuzzy
+#: ../urpmf:74
+#, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - برچسب چاپ عرضه می‌دارد: عرضه‌ی همه.\n"
 
-#: ../urpmf:74
-#, fuzzy
+#: ../urpmf:75
+#, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - چاپ برچسب لازمه: همه لازم.\n"
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - چاپ برچسب اندازه: اندازه.\n"
 
-#: ../urpmf:76
-#, fuzzy
+#: ../urpmf:77
+#, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - چاپ برچسب sourcerpm: منبع rpm.\n"
 
-#: ../urpmf:77
-#, fuzzy
+#: ../urpmf:78
+#, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - برچسب خلاصه‌ی چاپ: خلاصه.\n"
 
-#: ../urpmf:78
-#, fuzzy
+#: ../urpmf:79
+#, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - چاپ برچسب url: url.\n"
 
-#: ../urpmf:79
-#, fuzzy
+#: ../urpmf:80
+#, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - حالت لغتی.\n"
 
-#: ../urpmf:80
-#, fuzzy
+#: ../urpmf:81
+#, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - پرونده‌های در بسته را فهرست می‌کند\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - چاپ نسخه، انتشار و ساختار با نام.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "استفاده از محیط مشخص بر %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -883,11 +854,12 @@ msgstr ""
 "توجه: چون هیچ رسانه‌ای با استفاده از hdlists جستجو نگردید، urpmf قادر نبود "
 "نتیجه‌ای را بازگرداند\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "ممکن است بخواهید از -name برای جستجوی نام‌های بسته استفاده کنید.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -903,37 +875,56 @@ msgstr ""
 "\n"
 "طرز استفاده:\n"
 
-#: ../urpmi:92
-#, fuzzy
+#: ../urpmi:88
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - فقط از رسانه داده شده برای جستجوی بسته‌های درخواست شده "
 "استفاده گردد.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - انتخاب بطور خودکار بسته‌ها برای ارتقای سیستم.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr "  --auto-select  - انتخاب بطور خودکار بسته‌ها برای ارتقای سیستم.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - بررسی MD5SUM پرونده را از کار می‌اندازد.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - اجبار بروزسازی کلید gpg.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - هرگز برای عزل یک بسته پرسش نشود، پایان نصب.\n"
 
-#: ../urpmi:98
-#, fuzzy
+#: ../urpmi:97
+#, fuzzy, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --install-src  - فقط بسته‌ی منبع نصب می‌شود (نه باینری).\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -941,7 +932,7 @@ msgstr ""
 "  --keep         - نگهداشتن بسته‌های موجود در صورت ممکن، عدم پذیرش بسته‌هایی\n"
 "                   که به برداشتن ختم می‌شود.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -952,35 +943,38 @@ msgstr ""
 "                   قرار است نصب یا ارتقا داده شوند،\n"
 "                   پیش‌فرض %d می‌باشد.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - اندازه‌های کوچک انتقال, پیش‌فرض %d می‌باشد.\n"
 
-#: ../urpmi:105
-#, fuzzy
+#: ../urpmi:104
+#, fuzzy, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - تحمیل جستجوی فازی (همانند -y).\n"
 
-#: ../urpmi:106
-#, fuzzy
+#: ../urpmi:105
+#, fuzzy, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src          - بسته‌ی بعدی یک بسته‌ی منبع (مانند -s) می‌باشد.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - فقط بسته‌ی منبع نصب می‌شود (نه باینری).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - برداشتن rpm از حافظه پنهان قبل از هر چیز دیگر.\n"
 
-#: ../urpmi:109
-#, fuzzy
+#: ../urpmi:108
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - نگهداری rpm استفاده نشده در حافظه‌ی پنهان.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -988,7 +982,8 @@ msgstr ""
 "  --allow-nodeps - اجازه‌ی پرسش از کاربر برای نصب بسته‌ها بدون بررسی\n"
 "                   وابستگی‌ها را می‌دهد.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -996,11 +991,13 @@ msgstr ""
 "  --allow-force  - اجازه‌ی پرسش از کاربر برای نصب بسته‌ها بدون\n"
 "                   بررسی وابستگی و درستی آنها.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - استفاده از ریشه‌ی دیگری برای نصب rpm.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -1008,43 +1005,51 @@ msgstr ""
 "··--use-distrib··-·urpmi·را·در·هوا·از·درخت·distrib·پیکربندی·می‌کند،·برای\n"
 "···················نصب(برداری)·یک·chroot·با·گزینه‌ی·--root·مفید·است.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - از wget برای دریافت پرونده‌های دوردست استفاده نمایید.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - از curl برای دریافت پرونده‌های دور دست استفاده شود.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr ""
 "  --curl         - از curl برای دریافت پرونده‌های دور دست استفاده شود.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - محدود کردن سرعت بارگیری.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1053,7 +1058,8 @@ msgstr ""
 "                   (--no-resume آن را از کار می‌اندازد, ازکارافتاده پیش‌فرض "
 "است).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1061,7 +1067,8 @@ msgstr ""
 "  --proxy        - استفاده از پراکسی HTTP، شماره درگاه بوسیله‌ی پیش فرض\n"
 "                   ۱۰۸۰ فرض شده است (قالب آن <proxyhost[:port]> می‌باشد).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1070,6 +1077,7 @@ msgstr ""
 "                   می‌کند (قالب آن <user:password>است).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1078,7 +1086,7 @@ msgstr ""
 "                   مبحث بعدی.\n"
 
 #: ../urpmi:138
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1087,7 +1095,7 @@ msgstr ""
 "                   (--no-verify-rpm غیر فعال شود، پیش‌فرض فعال شده است).\n"
 
 #: ../urpmi:140
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1095,41 +1103,37 @@ msgstr ""
 "  --test         - تصدیق کردن اینکه آیا نصب می‌تواند بدرستی انجام پذیرد.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - مسیر بوسیله‌ی ویرگول جدا کننده خارج شود .\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - پرونده‌های نوشتاری محسوب نشوند.\n"
 
 #: ../urpmi:143
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --no-uninstall - هرگز برای عزل یک بسته پرسش نشود، پایان نصب.\n"
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --url          - چاپ برچسب url: url.\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --description  - چاپ برچسب توضیحات: توضیحات.\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - بررسی MD5SUM پرونده را از کار می‌اندازد.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - اجبار بروزسازی کلید gpg.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - بسته‌هایی که نصب آنها باید نادیده گرفته شود\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1137,53 +1141,60 @@ msgstr ""
 "  --more-choices - هنگامی که چندین بسته یافت می‌گردد، گزینه‌های بیشتری\n"
 "                   از پیش‌فرض پیشنهاد شود.\n"
 
-#: ../urpmi:152
-#, fuzzy
+#: ../urpmi:150
+#, fuzzy, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --noclean      - نگهداری rpm استفاده نشده در حافظه‌ی پنهان.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - فقط بسته‌های با ساختار یکسان ارتقاء داده شوند.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - انتخاب همه مطابقت‌ها بر خط فرمان.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - جستجو در عرضه‌ها برای یافتن بسته را اجازه می‌دهد.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - جستجو در عرضه‌ها برای یافتن بسته نشود.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - حالت ساکت.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  نام‌ها یا پرونده‌های rpm داده شده بر خط فرمان نصب خواهند شد.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
-#, fuzzy
+#: ../urpmi:220
+#, fuzzy, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 "آنچه می‌توان با پرونده‌های باینری rpm انجام داد هنگام استفاده --install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1192,21 +1203,22 @@ msgstr ""
 "شاخه‌ی [%s] از قبل وجود دارد، لطفا از شاخه‌ی دیگری برای گزارش اشکال استفاده "
 "کنید یاآن را حذف کنید"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "نمی‌توان شاخه‌ی [%s] را برای گزارش اشکال ایجاد کرد"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "کپی کردن شکست خورد"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1215,114 +1227,142 @@ msgstr ""
 "خطا: %s بنظر میرسد بطور فقط-خوانش سوار شده است.\n"
 "از --allow-force برای اجبار عملیات استفاده گردد."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (ارتقاء دادن)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (ارتقاء دادن)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (نصب کردن)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (نصب کردن)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "انتخاب شما چه است؟ (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"بسته‌های بدنبال آمده نمی‌توانند نصب گردند برای اینکه آنها بر بسته‌های دیگر "
+"بستگی داشته که کهنه تر از بسته‌های نصب شده هستند:\n"
+"%s"
+msgstr[1] ""
 "بسته‌های بدنبال آمده نمی‌توانند نصب گردند برای اینکه آنها بر بسته‌های دیگر "
 "بستگی داشته که کهنه تر از بسته‌های نصب شده هستند:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "در هر حال ادامه می‌دهید؟"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
+"%s"
+msgstr[1] ""
 "بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"نصب نمی‌تواند ادامه یابد چرا که بسته‌های بدنبال آمده \n"
+"باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند: \n"
+"%s\n"
+msgstr[1] ""
 "نصب نمی‌تواند ادامه یابد چرا که بسته‌های بدنبال آمده \n"
 "باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند: \n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
+"%s"
+msgstr[1] ""
 "بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"برای ارضای وابستگیها, %d بسته بدنبال آمده نصب خواهند شد:\n"
+"%s\n"
+msgstr[1] ""
 "برای ارضای وابستگیها, %d بسته بدنبال آمده نصب خواهند شد:\n"
 "%s\n"
 
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1331,91 +1371,106 @@ msgstr ""
 "برای نصب وابستگی‌های بدنبال آمده شما باید مدیر سیستم باشید:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "وقتی آماده‌اید ورود را فشار دهید..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "لغو"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "بسته‌های بدنبال آمده امضاهای بد دارند"
+msgstr[1] "بسته‌های بدنبال آمده امضاهای بد دارند"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "آیا می‌خواهید نصب را ادامه دهید؟"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "انتشار دادن %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "نصب %s از %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "نصب %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "نصب شکست خورد"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "تلاش برای نصب بدون بررسی وابستگی‌ها؟ (y/N) "
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "تلاش برای نصب حتی قویتر (--force)؟ (y/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d معامله‌های نصب شکست خورد"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "نصب ممکن می‌باشد"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "همه چیز قبلاً نصب شده است"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "همه چیز قبلاً نصب شده است"
+msgstr[1] "همه چیز قبلاً نصب شده است"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "همه چیز قبلاً نصب شده است"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "همه چیز قبلاً نصب شده است"
+msgstr[1] "همه چیز قبلاً نصب شده است"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "راه‌اندازی دوباره‌ی urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1439,26 +1494,34 @@ msgstr ""
 "و [گزینه‌ها] هستند از\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - ایجاد یک رسانه بروزسازی.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - تلاش برای یافتن و استفاده از پرونده ترکیب.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - تلاش برای پیدا کردن و استفاده از پرونده‌ی hdlist.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - تلاش برای یافتن هیچ پرونده‌ی ترکیب یا\n"
 "                   hdlist نشود.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1466,16 +1529,17 @@ msgstr ""
 "  --distrib      - بطور خودکار همه‌ی رسانه‌ها را از یک رسانه‌ی نصب ایجاد\n"
 "                   می‌کند.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - لیست رسانه‌های موجود.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1484,7 +1548,8 @@ msgstr ""
 "  --from         - استفاده از url مشخص شده برای لیست آینه‌ها،پیش‌فرض\n"
 "                   %s می‌باشد\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1492,62 +1557,84 @@ msgstr ""
 "  --virtual      - ایجاد رسانه مجازی که همیشه بروز شده هستند،\n"
 "                   فقط پایان‌نامه file:// مجاز می‌باشد.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - بررسی MD5SUM پرونده را از کار می‌اندازد.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - سرآیندهای شاخه حافظه پنهان را پاک می‌کند.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - اجبار تولید پرونده‌های hdlist.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - حالت ساکت.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - حالت لغتی.\n"
+
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "نمی‌توان رسانه \"%s\" را بروزسازی کرد\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "فقط کاربر مدیر برای افزودن رسانه مجاز است"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "پرونده پیکربندی [%s] ایجاد خواهد شد"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "نمیتوان پرونده پیکربندی [%s] را ایجاد کرد"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "احتیاجی به دادن <relative path of hdlist> با --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<relative path of hdlist> وجود ندارد\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "`با' رسانه‌های شبکه که وجود ندارند\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "نمی‌توان رسانه \"%s\" را ایجاد کرد\n"
@@ -1569,151 +1656,154 @@ msgstr ""
 "طرز استفاده:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - نگهداری rpm استفاده نشده در حافظه‌ی پنهان.\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-url     - رسانه‌ی در دسترس و url آنها را فهرست می‌کند.\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-url     - رسانه‌ی در دسترس و url آنها را فهرست می‌کند.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --name         - فقط نام‌های بسته چاپ شود.\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "بسته‌ی %s پیدا نشد."
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "در حال دریافت پرونده‌ی rpm [%s] ..."
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "هیچ لیست پرونده‌ای یافت نشد\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "طرز استفاده: urpmi.removemedia [-a] <name> ...\n"
 "که <name> نام رسانه‌ی برای برداشتن می باشد.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - انتخاب تمام رسانه‌ها.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - تطابق نامعلوم در نام‌های رسانه.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"گزینه‌های ناشناخته '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "فقط کاربر مدیربرای برداشتن رسانه مجاز است"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "هیچ چیز برای برداشتن (استفاده از urpmi.addmedia برای افزودن یک رسانه)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1723,6 +1813,7 @@ msgstr ""
 "(یکی از %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1731,34 +1822,50 @@ msgstr ""
 "که <name> یک نام رسانه برای بروزسازی می‌باشد.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       -  فقط بروزسازی رسانه‌های بروزسازی.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - اجبار بروزسازی کلید gpg.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr ""
 "  --ignore       - بروزسازی نشود, رسانه با نادیده‌گیری علامت گذاری گردد.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 "  --no-ignore    - بروزسازی نگردد, رسانه مانند بکار افتاده علامت گذاری "
 "گردد.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - انتخاب همه رسانه‌های غیر قابل انتقال.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - اجبار تولید پرونده‌های hdlist.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "فقط کاربر مدیر برای بروزسازی رسانه مجاز است"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "هیچ چیز برای بروزسازی (استفاده از urpmi.addmedia برای اضافه کردن یک رسانه)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1767,21 +1874,21 @@ msgstr ""
 "ورودی برای بروزسازی وجود ندارد\n"
 "(یکی از %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "بکار انداختن رسانه‌ی %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "نادیده‌گیری رسانه‌ی %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "بکار انداختن رسانه‌ی %s"
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1799,6 +1906,7 @@ msgstr ""
 "طرز استفاده:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1807,50 +1915,60 @@ msgstr ""
 "استفاده گردد.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - تحمیل جستجوی فازی (همانند -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - لیست کردن بسته‌های موجود.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - لیست رسانه‌های موجود.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - رسانه‌ی در دسترس و url آنها را فهرست می‌کند.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - list available nodes when using --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - نام های مستعار موازی موجود را فهرست می‌کند.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - تخلیه‌ی پیکربندی به شکل آرگومان urpmi.addmedia.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - بسته‌ی بعدی یک بسته‌ی منبع (مانند -s) می‌باشد.\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - همه بسته‌های منابع را قبل از باگیری می‌دهد (فقط مدیر).\n"
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --url          - چاپ برچسب url: url.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1858,98 +1976,166 @@ msgstr ""
 "  --use-distrib  - پیکربندی urpmi در هوا از درخت distrib.\n"
 "                   این پرسش یک توزیع را اجازه می‌دهد.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - چاپ ثبت تغییرات.\n"
 
-#: ../urpmq:82
-#, fuzzy
+#: ../urpmq:84
+#, fuzzy, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary      - برچسب خلاصه‌ی چاپ: خلاصه.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - تکمیل بیرون‌ریز با بسته‌ای که برداشته می‌شود.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - پرسش گسترده برای وابستگی‌های بسته.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - چاپ گروه‌ها با نام.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - اطلاعات مفید را به زبان آدمیزاد چاپ می‌کند.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - پرونده‌های در بسته را فهرست می‌کند\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             -در عرضه‌ها برای یافتن بسته جستجو نشود (پیش‌فرض).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             -درعرضه‌ها برای یافتن بسته جستجو شود\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - چاپ نسخه و انتشار با نام.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - جستجوی معکوس برای آنچه بسته را لازم دارد.\n"
 
-#: ../urpmq:94
-#, fuzzy
+#: ../urpmq:97
+#, fuzzy, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -R             - جستجوی معکوس برای آنچه بسته را لازم دارد.\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - بسته‌ی بعدی یک بسته‌ی منبع (مانند --src) می‌باشد.\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "  -u             - برداشتن بسته اگر یک نسخه‌ی جدیدتر قبلاً نصب شده است.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - تحمیل جستجوی فازی (همانند --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - مانند -y, ولی اجبار تطابق کازه اعمال می‌شود.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "نام‌ها یا پرونده‌های داده شده بر خط فرمان مورد تردید می‌باشند.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes فقط می‌توانند با --parallel استفاده شود"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, fuzzy, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "نادیده گیری رسانه‌ی %s: هیچ hdlist\n"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "هیچ لیست پرونده‌ای یافت نشد\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "هیچ ثبت تغییری یافت نشد\n"
 
+#, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "نصب شکست خورد"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "نصب بسته `%s' (%s/%s)..."
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "آزمایش پرونده ترکیب [%s]"
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "انتشار دادن %s"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "نصب بسته..."
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "نصب %s از %s"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "نصب بسته..."
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - تلاش برای یافتن و استفاده از پرونده ترکیب.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr ""
+#~ "  --probe-hdlist - تلاش برای پیدا کردن و استفاده از پرونده‌ی hdlist.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "`با' رسانه‌های شبکه که وجود ندارند\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "گزینه‌های ناشناخته '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "پایان‌نامه‌ی ناشناس برای %s تعیین شده است"
 
diff --git a/po/fi.po b/po/fi.po
index e928f3d4..6056b570 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fi - Mandriva 2006 Release\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2005-09-13 20:47+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -22,7 +22,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "RPM asennus"
 
@@ -31,7 +32,8 @@ msgstr "RPM asennus"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
@@ -86,20 +88,23 @@ msgstr ""
 "\n"
 "Halutessasi voit myös vain tallentaa sen. Mitä haluat tehdä?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Asenna"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Peruuta"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Valitse hakemisto johon tiedosto tallennetaan"
 
@@ -111,19 +116,21 @@ msgstr ""
 "tuntemattomat valitsimet '%s'\n"
 
 #: ../gurpmi.pm:89
-#, fuzzy
+#, fuzzy, c-format
 msgid "No packages specified"
 msgstr "Komentoa ei annettu"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Odota hetki..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Pitää olla pääkäyttäjä"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -134,35 +141,42 @@ msgstr ""
 "%s\n"
 "Jatketaanko?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (päivitettävä)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (asennettava)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Pakettivalinta"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Yksi seuraavista paketeista tarvitaan:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Hylkää"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -173,7 +187,7 @@ msgstr ""
 "%s\n"
 "Jatketaanko?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -183,25 +197,27 @@ msgstr ""
 "Riippuvuuksien täyttämiseksi seuraavat %d pakettia asennetaan :\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Pakettien asennus..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "lähteen paketteja ei saada, toiminto keskeytetään"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Aseta media nimeltään \"%s\" laitteeseen [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Ladataan pakettia `%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -214,8 +230,7 @@ msgstr ""
 "\n"
 "Haluatko jatkaa asennusta?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -226,35 +241,38 @@ msgstr ""
 "%s\n"
 "Sinun kannattaisi päivittää urpmi-tietokanta"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "poistetaan %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Valmistellaan..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Asennetaan pakettia `%s' (%s / %s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Asennus epäonnistui"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Valmis"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Kaikki on jo asennettu"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Asennus on valmis"
 
@@ -268,19 +286,22 @@ msgstr ""
 "jossa [valitsimet] ovat:\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "  -h|--help        - tulosta tämä viesti\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "  --root <polku>   - käytä annettua polku / sijasta\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "  -g [group]       - rajoita tulokset annettuun ryhmään\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g               - tulosta ryhmät nimen lisäksi\n"
 
@@ -289,210 +310,126 @@ msgstr "  -g               - tulosta ryhmät nimen lisäksi\n"
 msgid "                    defaults to %s.\n"
 msgstr "                   - oletus on %s\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Vain pääkäyttäjä saa asentaa paketteja"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Suorita urpmi rajoitetussa tilassa..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "rpm-tietokantaa ei voitu avata"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "virheellinen rpm-tiedoston nimi [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "noudetaan rpm-tiedostoa [%s]..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...noudettu"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...nouto epäonnistui: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm-tiedostoa [%s] ei voitu käsitellä"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "\"%s\" ei voitu tulkita tiedostossa [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "rpm-tiedoston rekisteröinti ei onnistunut"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "virhe rekisteröitäessä paikallisia paketteja"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Tämä toiminto on kielletty kon ohjelma käytetään rajoitetussa tilassa"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "virheellinen välityspalvelinmääritys komentorivillä\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Tarvitset pääkäyttäjän oikeudet tämän komennon käyttämiseen ! \n"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: rpm-tiedostoa \"%s\" ei voida lukea\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "EeNn"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "KkYy"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "Valitan, virheellinen valinta, yritä uudelleen\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
+#: ../urpm/args.pm:426
 #, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
+msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
+#: ../urpm/args.pm:440
 #, c-format
-msgid "on node %s"
-msgstr ""
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Asennus epäonnistui"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Asennus on mahdollinen"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "Asennetaan pakettia `%s' (%s / %s)..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "tutkitaan synthesis-tiedostoa [%s]"
-
-#: ../urpm/parallel_ssh.pm:183
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "EeNn"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "levitetään %s"
+msgid "Yy"
+msgstr "KkYy"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "Pakettien asennus..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "asennetaan %s kohteesta %s"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "Pakettien asennus..."
+msgid "Sorry, bad choice, try again\n"
+msgstr "Valitan, virheellinen valinta, yritä uudelleen\n"
 
 #: ../urpme:39
 #, fuzzy, c-format
@@ -510,45 +447,57 @@ msgstr ""
 "\n"
 "käyttö:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help           - tulosta tämä viesti\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto           - valitse automaattisesti paketit tarvittaessa\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test           - varmista että poisto voidaan hoitaa oikein\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force          - pakottaa asennuksen vaikka joitakin paketteja puuttuu\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel       - urpmi-toiminnot useille alias-koneille\n"
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --packager       - tulosta merkintä paketoija: paketoija\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root           - käytä määriteltyä juurta rpm-poistolle\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root           - käytä määriteltyä juurta rpm-asennukselle\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description    - tulosta merkintä kuvaus: kuvaus\n"
 
-#: ../urpme:52
-#, fuzzy
+#: ../urpme:53
+#, fuzzy, 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"
@@ -557,76 +506,79 @@ msgstr ""
 "hyödyllinen\n"
 "                     asennettaessa chroot käyttäen --root optiota\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - yritä etsiä ja käyttää synthesis-tiedostoa\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist   - yritä löytää ja käyttää hdlist-tiedostoa\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v               - yksityiskohtainen tyyli\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose        - yksityiskohtainen tyyli\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a               - valitse kaikki lausekkeeseen täsmäävät\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Vain pääkäyttäjä saa poistaa paketteja"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "tuntematon paketti"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "tuntemattomia paketteja"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "tuntematon paketti"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Seuraavat paketit sisältävät %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketin %s poisto rikkoisi järjestelmäsi"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Ei mitään poistettavissa"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Suoritetaan tarkistusta seuraavien pakettien poistamiseksi"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "Riippuvuuksien täyttämiseksi seuraavat %d paketit poistetaan (%d Mt)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (k/E) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "poistetaan paketti %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (k/E) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Poisto epäonnistui"
 
@@ -647,244 +599,265 @@ msgstr ""
 "käyttö:\n"
 
 #: ../urpmf:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help           - tulosta tämä viesti\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env            - käytä määrättyä ympäristöä (yleensä virheraportti)\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia   - älä käytä seuraavia pilkuilla erotettuja medioita\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media          - käytä ainoastaan seuraavia pilkuilla eroteltuja "
 "medioita\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia      - lajittele mediat pilkuilla erotettujen alimerkkijonojen "
 "mukaan\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis      - käytä annettua synthesis-tiedostoa urpmi-tietokannan "
 "sijasta\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq           - älä tulosta identtisiä rivejä\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update         - käytä ainoastaan päivitysmediaa\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose        - yksityiskohtainen tyyli\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i               - älä erottele isoja ja pieniä kirjaimia hakuehdoissa\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i               - älä erottele isoja ja pieniä kirjaimia hakuehdoissa\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e               - sisällytä perl-koodia suoraan 'perl -e'\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a               - binaarinen JA-operaattori.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o               - binaarinen TAI-operaattori.\n"
 
-#: ../urpmf:54
-#, fuzzy
+#: ../urpmf:55
+#, fuzzy, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  -o               - binaarinen TAI-operaattori.\n"
 
-#: ../urpmf:55
-#, fuzzy
+#: ../urpmf:56
+#, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )                - oikea sulkumerkki lausekeryhmän sulkemiseen\n"
 
-#: ../urpmf:56
-#, fuzzy
+#: ../urpmf:57
+#, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Lista palautettavista tiedoista:\n"
 "\n"
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X              - käytä X-käyttöliittymää\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   - oletus on %s\n"
 
-#: ../urpmf:59
-#, fuzzy
+#: ../urpmf:60
+#, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url            - tulosta merkintä url: url\n"
 
-#: ../urpmf:60
-#, fuzzy
+#: ../urpmf:61
+#, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost      - tulosta merkintä käännöskone: käännöskone\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Konsolen asetukset"
 
-#: ../urpmf:63
-#, fuzzy
+#: ../urpmf:64
+#, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts      - tulosta merkintä ristiriita: kaikki ristiriidat\n"
 
-#: ../urpmf:64
-#, fuzzy
+#: ../urpmf:65
+#, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description    - tulosta merkintä kuvaus: kuvaus\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch          - tulosta merkintä aikakausi: aikakausi\n"
 
-#: ../urpmf:67
-#, fuzzy
+#: ../urpmf:68
+#, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name           - tulosta vain pakettien nimet\n"
 
-#: ../urpmf:68
-#, fuzzy
+#: ../urpmf:69
+#, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l               - listaa paketissa olevat tiedostot\n"
 
-#: ../urpmf:69
-#, fuzzy
+#: ../urpmf:70
+#, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group          - tulosta merkintä ryhmä: ryhmä\n"
 
-#: ../urpmf:70
-#, fuzzy
+#: ../urpmf:71
+#, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name           - tulosta vain pakettien nimet\n"
 
-#: ../urpmf:71
-#, fuzzy
+#: ../urpmf:72
+#, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 "  --obsoletes      - tulosta merkintä vanhentaa: kaikki vanhentaa-tiedot\n"
 
-#: ../urpmf:72
-#, fuzzy
+#: ../urpmf:73
+#, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager       - tulosta merkintä paketoija: paketoija\n"
 
-#: ../urpmf:73
-#, fuzzy
+#: ../urpmf:74
+#, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides       - tulosta merkintä tarjoaa: kaikki tarjoaa-tiedot\n"
 
-#: ../urpmf:74
-#, fuzzy
+#: ../urpmf:75
+#, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 "  --requires       - tulosta merkintä tarvitsee: kaikki tarvitsee-tiedot\n"
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size           - tulosta merkintä koko: koko\n"
 
-#: ../urpmf:76
-#, fuzzy
+#: ../urpmf:77
+#, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm      - tulosta merkintä lähdekoodi-rpm: lähdekoodi-rpm\n"
 
-#: ../urpmf:77
-#, fuzzy
+#: ../urpmf:78
+#, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary, -S    - tulosta yhteenveto.\n"
 
-#: ../urpmf:78
-#, fuzzy
+#: ../urpmf:79
+#, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url            - tulosta merkintä url: url\n"
 
-#: ../urpmf:79
-#, fuzzy
+#: ../urpmf:80
+#, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose        - yksityiskohtainen tyyli\n"
 
-#: ../urpmf:80
-#, fuzzy
+#: ../urpmf:81
+#, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l               - listaa paketissa olevat tiedostot\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f               - tulosta versio, julkaisu ja arkkitehtuuri nimen "
 "lisäksi\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "käytetään määrättyä ympäristöä kohteelle %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -892,11 +865,12 @@ msgstr ""
 "Huomio: koska yksikään etsitty media ei käytä hdlist-tiedostoja, urpmf ei "
 "voinut palauttaa yhtään tulosta.\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Saatat haluta käyttää --name etsiäksesi pakettien nimistä.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -912,37 +886,57 @@ msgstr ""
 "\n"
 "käyttö:\n"
 
-#: ../urpmi:92
-#, fuzzy
+#: ../urpmi:88
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia    - käytä ainoastaan annettuja medioita pydetyn (tai "
 "päivitetyn) paketin hakemiseen.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select    - valitse automaattisesti päivitettävät paketit\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr "  --auto-select    - valitse automaattisesti päivitettävät paketit\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum      - poista tiedostojen MD5SUM-tarkistus käytöstä\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key      - pakota gpg-avaimen päivitys\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 "  --no-uninstall   - älä koskaan kysy paketin poistosta, keskeytä asennus\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install     - älä asenna paketteja (lataa ainoastaan)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -950,7 +944,7 @@ msgstr ""
 "  --keep           - jätä olemassa olevat paketit jos mahdollista, hylkää\n"
 "                     paketit joiden asennus poistaisi muita\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -962,38 +956,42 @@ msgstr ""
 "                     pakettimäärä aiotaan asentaa tai päivittää,\n"
 "                     oletus on %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length   - pienen tapahtuman pituus, oletus on %d\n"
 
-#: ../urpmi:105
-#, fuzzy
+#: ../urpmi:104
+#, fuzzy, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy          - käytä epätarkkaa hakua (sama kuin -y)\n"
 
-#: ../urpmi:106
-#, fuzzy
+#: ../urpmi:105
+#, fuzzy, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr ""
 "  --src            - seuraava paketti on lähdekoodi-paketti (sama kuin -s)\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src    - asenna ainoastaan lähdekoodipaketit (ei binääreja)\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean          - poista rpm-paketti välimuistista ennen muita "
 "tapahtumia\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean        - älä poista rpm-paketteja välimuistista\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -1001,7 +999,8 @@ msgstr ""
 "  --allow-nodeps   - salli pakettien asennus ilman riippuvuuksien "
 "tarkistusta\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -1009,11 +1008,13 @@ msgstr ""
 "  --allow-force    - salli pakettien asennus ilman riippuvuuksien ja\n"
 "                     eheyden tarkistusta\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root           - käytä määriteltyä juurta rpm-asennukselle\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -1022,40 +1023,48 @@ msgstr ""
 "hyödyllinen\n"
 "                     asennettaessa chroot käyttäen --root optiota\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget           - käytä wget:a etätiedostojen noutoon\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl           - käytä curl:a etätiedostojen noutoon\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl           - käytä curl:a etätiedostojen noutoon\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate     - rajoita latausnopeutta\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1063,7 +1072,8 @@ msgstr ""
 "  --resume         - jatka osittain noudettujen tiedostojen noutamista\n"
 "                     (--no-resume poistaa käytöstä, vakiona ei käytössä)\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1072,7 +1082,8 @@ msgstr ""
 "on\n"
 "                     1080 (muodossa <välityspalvelin [:portti]>)\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1081,6 +1092,7 @@ msgstr ""
 "                     käyttäjä ja salasana (muodossa <käyttäjä:salasana>)\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1089,7 +1101,7 @@ msgstr ""
 "                     seuraavassa argumentissa\n"
 
 #: ../urpmi:138
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1098,51 +1110,47 @@ msgstr ""
 "                     (--no-verify-rpm poistaa käytöstä, vakiona käytössä)\n"
 
 #: ../urpmi:140
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test           - varmista että asennus voidaan hoitaa oikein\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 "  --excludepath    - jätä asentamatta seuraaviin hakemistoihin\n"
 "                     (hakemistot pilkuilla erotettuna)\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs    - jätä dokumentaatio pois\n"
 
 #: ../urpmi:143
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --no-uninstall   - älä koskaan kysy paketin poistosta, keskeytä asennus\n"
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --url            - tulosta merkintä url: url\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --description    - tulosta merkintä kuvaus: kuvaus\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum      - poista tiedostojen MD5SUM-tarkistus käytöstä\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key      - pakota gpg-avaimen päivitys\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip           - paketit joiden asennus pitäisi ohittaa\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1151,56 +1159,63 @@ msgstr ""
 "valintoja\n"
 "                     kuin vain oletus\n"
 
-#: ../urpmi:152
-#, fuzzy
+#: ../urpmi:150
+#, fuzzy, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --noclean        - älä poista rpm-paketteja välimuistista\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 "  --strict-arch    - päivitä ainoastaan saman arkitehtuuriin kuuluvia "
 "paketteja.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a               - valitse kaikki komentoriviin täsmäävät\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p               - salli etsiminen tarjoaa-tiedoista paketin löytämiseksi\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P               - älä etsi tarjoaa-tiedoista paketin löytämiseksi\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q               - hiljainen tyyli\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  komentorivillä syötetyt nimet tai rpm-tiedostot asennetaan.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
-#, fuzzy
+#: ../urpmi:220
+#, fuzzy, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 "Mitä voidaan tehdä binaari rpm -tiedostolle kun käytetään --install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1209,21 +1224,22 @@ msgstr ""
 "Hakemisto [%s] on jo olemassa. Ole hyvä ja valitse toinen hakemisto "
 "virheraportille tai poista se."
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Hakemiston [%s] luominen virheraportille ei onnistu"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Kopiointi epäonnistui"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1232,114 +1248,142 @@ msgstr ""
 "Virhe: %s näyttää olevean liitettynä ainoastan lukuoikeuksilla.\n"
 "Käytä --allow-force pakottaaksesi toiminnon."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (päivitettävä)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (päivitettävä)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (asennettava)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (asennettava)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Mikä on valintasi? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Seuraavat paketit ei voida asentaa koska ne riippuvat paketeista\n"
+"joita ovat vanhempia kuin nykyhetkellä asennetut paketit:\n"
+"%s"
+msgstr[1] ""
 "Seuraavat paketit ei voida asentaa koska ne riippuvat paketeista\n"
 "joita ovat vanhempia kuin nykyhetkellä asennetut paketit:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Jatka joka tapauksessa?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (K/e) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Joitakin haluttuja paketteja ei voida asentaa:\n"
+"%s"
+msgstr[1] ""
 "Joitakin haluttuja paketteja ei voida asentaa:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Asennusta ei voida jatkaa koska seuraavat paketit on poistettava\n"
+"jotta toiset voidaan päivittää:\n"
+"%s\n"
+msgstr[1] ""
 "Asennusta ei voida jatkaa koska seuraavat paketit on poistettava\n"
 "jotta toiset voidaan päivittää:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Seuraavat paketit on poistettava jotta toiset voidaan päivittää:\n"
+"%s"
+msgstr[1] ""
 "Seuraavat paketit on poistettava jotta toiset voidaan päivittää:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"Riippuvuuksien täyttämiseksi seuraavat %d pakettia asennetaan :\n"
+"%s\n"
+msgstr[1] ""
 "Riippuvuuksien täyttämiseksi seuraavat %d pakettia asennetaan :\n"
 "%s\n"
 
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Riippuvuuksien täyttämiseksi seuraava paketti asennetaan (%d Mt)"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1348,91 +1392,106 @@ msgstr ""
 "Sinun pitää olla pääkäyttäjänä asentaaksesi seuraavat riippuvuudet:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Paina Enter kun olet valmis..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Seuraavissa paketeissa on virheelliset allekirjoitukset"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Seuraavissa paketeissa on virheelliset allekirjoitukset"
+msgstr[1] "Seuraavissa paketeissa on virheelliset allekirjoitukset"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Haluatko jatkaa asennusta?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "levitetään %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "asennetaan %s kohteesta %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "asennetaan %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Asennus epäonnistui"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Yritetään asentaa ilman riippuvuuksia? (k/E) "
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Yritetään asentaa pakolla (--force)? (k/E) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d asennustoimintoa epäonnistui"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "Asennus on mahdollinen"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Kaikki on jo asennettu"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Kaikki on jo asennettu"
+msgstr[1] "Kaikki on jo asennettu"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Kaikki on jo asennettu"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Kaikki on jo asennettu"
+msgstr[1] "Kaikki on jo asennettu"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "uudelleenkäynnistetään urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1457,40 +1516,49 @@ msgstr ""
 "ja [valitsimet] ovat\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update         - luo päivitysmedia\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - yritä etsiä ja käyttää synthesis-tiedostoa\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist   - yritä löytää ja käyttää hdlist-tiedostoa\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe       - älä yritä etsiä synthesis- tai hdlist-tiedostoa\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
 
 #: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
+msgstr "  --no-probe       - älä yritä etsiä synthesis- tai hdlist-tiedostoa\n"
+
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 "  --distrib        - luo automaattisesti kaikki mediat asennusmedioista\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media     - listaa käytettävissä olevat mediat\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1500,7 +1568,8 @@ msgstr ""
 "on\n"
 "                     %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1508,65 +1577,87 @@ msgstr ""
 "  --virtual        - luo virtuaalinen media, joka on aina ajantasalla,\n"
 "                     vain protokolla file:// on mahdollinen\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum      - poista tiedostojen MD5SUM-tarkistus käytöstä\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey       - älä tuo pubkey lisätystä mediasta\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw            - lisää mediaa asetuksissa, mutta älä päivitä sitä.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c               - puhdista otsikkotietojen välimuistihakemisto\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f               - pakota hdlist-tiedostojen luominen\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q               - hiljainen tyyli\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v               - yksityiskohtainen tyyli\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "mediaa \"%s\" ei voida päivittää\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Vain pääkäyttäjä saa asentaa paketteja"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Luodaan asetustiedosto [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Asetustiedosto [%s] ei voida luoda."
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 "kohtaa <hdlist-tiedoston suhteellinen polku> ei tarvita --distrib -"
 "parametrin kanssa"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlist-tiedoston suhteellinen polku> puuttuu\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "verkkomedian kohta `with' puuttuu\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "mediaa \"%s\" ei voida luoda\n"
@@ -1588,152 +1679,155 @@ msgstr ""
 "käyttö:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean        - älä poista rpm-paketteja välimuistista\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr ""
 "  --list-url       - listaa käytettävissä olevat mediat ja niiden polut\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr ""
 "  --list-url       - listaa käytettävissä olevat mediat ja niiden polut\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --name           - tulosta vain pakettien nimet\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "pakettia %s ei löytynyt."
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "noudetaan rpm-tiedostoa [%s]..."
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "tiedostolistaa ei löytynyt\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "käyttö: urpmi.removemedia [-a] <nimi> ...\n"
 "jossa <nimi> on poistettavan median nimi.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a               - valitse kaikki mediat\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y               - täsmää epätarkasti medioiden nimiin\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"tuntemattomat valitsimet '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Vain pääkäyttäjä saa poistaa median"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "ei mitään poistettavaa (käytä urpmi.addmedia lisätäksesi median)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1743,6 +1837,7 @@ msgstr ""
 "(jokin seuraavista: %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1751,30 +1846,46 @@ msgstr ""
 "jossa <nimi> on päivitettävän median nimi.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update         - päivitä ainoastaan päivitysmedia\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key      - pakota gpg-avaimen päivitys\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore         - älä päivitä, merkitse media pois käytöstä.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore      - älä päivitä, merkitse media käyttössä.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a               - valitse kaikki ei-siirrettävät mediat\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f               - pakota hdlist-tiedostojen luominen\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Vain pääkäyttäjä saa päivittää mediat"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ei mitään päivitettävää (käytä urpmi.addmedia lisätäksesi median)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1783,21 +1894,21 @@ msgstr ""
 "Päivitettävä kohta puuttuu\n"
 "(jokin seuraavista: %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "otetaan käyttöön media %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "Hylätään media %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "otetaan käyttöön media %s"
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1815,6 +1926,7 @@ msgstr ""
 "käyttö:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1823,43 +1935,52 @@ msgstr ""
 "päivitetyn) paketin hakemiseen.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy          - käytä epätarkkaa hakua (sama kuin -y)\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list           - listaa käytettävissä olevat paketit\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media     - listaa käytettävissä olevat mediat\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 "  --list-url       - listaa käytettävissä olevat mediat ja niiden polut\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes     - listaa käytettävissä olevat noodit --parallel kanssa\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases   - listaa käytettävissä olevat rinnakkais-aliakset\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config    - tulosta asetukset urpmi.addmedia parametrien muodossa\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src            - seuraava paketti on lähdekoodi-paketti (sama kuin -s)\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
@@ -1867,11 +1988,12 @@ msgstr ""
 "                     (ainoastaan pääkäyttäjänä)\n"
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --url            - tulosta merkintä url: url\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1879,108 +2001,177 @@ msgstr ""
 "  --use-distrib    - aseta urpmi automaattisesti jakelun puusta.\n"
 "                     Tämä sallii etsimisen jakelusta.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog      - tulosta muutosloki\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S    - tulosta yhteenveto.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c               - täydellinen tuloste poistettavasta paketista\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 "  -d               - laajenna haku sisältämään pakettien riippuvuudet\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g               - tulosta ryhmät nimen lisäksi\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i               - tulosta hyödyllistä tietoa ihmisen luettavassa "
 "muodossa\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l               - listaa paketissa olevat tiedostot\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P               - älä etsi tarjoaa-tiedoista paketin löytämiseksi "
 "(oletus)\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr ""
 "  -p               - sallii etsimisen tarjoaa-tiedoista paketin "
 "löytämiseksi\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r               - tulosta versio ja julkaisu nimen lisäksi\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 "  -R               - käänteinen etsiminen vaatii-tiedoista paketeissa\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR              - laajenna käänteinen etsiminen (sisällytä "
 "virituaalipaketit)\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s               - seuraava paketti on lähdekoodi-paketti (sama kuin --"
 "src)\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "  -u               - poista paketti jos uudempi versio on jo asennettu\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y               - käytä epätarkkaa hakua (sama kuin --fuzzy)\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y               - kuten -y mutta ei käytä kirjainkokoriippuvuutta\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  komentorivillä syötetyt nimet tai rpm-tiedostot etsitään.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes voi ainoastaan käyttää --parallel kanssa"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "ohitetaan media %s: ei hdlist-tiedostoa"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "tiedostolistaa ei löytynyt\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "muutoslokia ei löytynyt\n"
 
+#, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Asennus epäonnistui"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Asennetaan pakettia `%s' (%s / %s)..."
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "tutkitaan synthesis-tiedostoa [%s]"
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "levitetään %s"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "Pakettien asennus..."
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "asennetaan %s kohteesta %s"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Pakettien asennus..."
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "Riippuvuuksien täyttämiseksi seuraava paketti asennetaan (%d Mt)"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - yritä etsiä ja käyttää synthesis-tiedostoa\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist   - yritä löytää ja käyttää hdlist-tiedostoa\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "verkkomedian kohta `with' puuttuu\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "tuntemattomat valitsimet '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "tuntematon protokolla määrätty kohteelle %s"
 
diff --git a/po/fr.po b/po/fr.po
index 7fa220bd..64610a46 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2007-01-09 13:44+0100\n"
 "Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
 "Language-Team: Français <cooker-i18n@mandrivalinux.org>\n"
@@ -34,7 +34,8 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2;plural=(n>1);\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "Installation du RPM"
 
@@ -43,7 +44,8 @@ msgstr "Installation du RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Erreur : fichier %s introuvable, annulation de l'opération"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
@@ -101,20 +103,23 @@ msgstr ""
 "\n"
 "Peut-être préférez-vous simplement l'enregistrer. Quel est votre choix ?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Installer"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Sauver"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Annuler"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Choisissez un emplacement pour enregistrer le fichier."
 
@@ -124,18 +129,21 @@ msgid "Unknown option %s"
 msgstr "Option « %s » inconnue"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Pas de paquetage spécifié"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Veuillez patienter ..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Vous devez être administrateur"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -146,35 +154,42 @@ msgstr ""
 "%s\n"
 "Continuer quand même l'installation ?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Attention"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (à mettre à jour)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (à installer)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Choix d'un paquetage"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Un des paquetages suivants est nécessaire :"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Abandonner"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -186,7 +201,7 @@ msgstr ""
 "%s\n"
 "Continuer quand même l'installation ?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -197,25 +212,27 @@ msgstr ""
 "installés :\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Installation du paquetage ..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "impossible de récupérer les paquetages de sources, abandon"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Veuillez insérer le média nommé « %s » dans le périphérique [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Téléchargement du paquetage %s ..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -228,8 +245,7 @@ msgstr ""
 "\n"
 "Voulez-vous continuer l'installation ?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -240,35 +256,38 @@ msgstr ""
 "%s\n"
 "Vous devriez mettre à jour votre base de données urpmi."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "désinstallation de %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Préparation ..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installation du paquetage « %s » (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "L'installation a échoué"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Fini"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Tous les paquetages sont déjà installés"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "L'installation est terminée"
 
@@ -282,20 +301,24 @@ msgstr ""
 "où les [options] sont parmi\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - afficher ce message d'aide.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr ""
 "   --root <chemin>  - utiliser l'emplacement spécifié comme racine à la "
 "place de « / »\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [groupe]    - restreindre les résultats au groupe spécifié.\n"
 
 #: ../rpm-find-leaves:19
+#, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - afficher le nom complet du paquetage (NVRA)\n"
 
@@ -304,212 +327,129 @@ msgstr "   -f             - afficher le nom complet du paquetage (NVRA)\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    valeur par défaut %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Seul l'administrateur système (root) peut installer des paquetages"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Exécution d'urpmi en mode restreint..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "impossible d'ouvrir la base de donnée rpm"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 "il y a %d entêtes de paquetages dans le cache, suppression de %d entêtes "
 "obsolètes"
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "le nom du fichier rpm est invalide [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "récupération des fichiers rpm [%s]..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "... récupération effectuée"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... échec de la récupération : %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "impossible d'accéder au fichier rpm [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "impossible d'analyser le fichier spec %s [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "impossible de référencer le fichier rpm"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Architecture incompatible pour le paquetage [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "erreur lors de l'inscription des paquetages locaux"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Cette opération est interdite en mode restreint"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "Mauvaise déclaration de serveur mandataire en ligne de commande\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr "le répertoire chroot n'existe pas"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Vous devez être root pour utiliser l'option --use-distrib"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq : impossible de lire le fichier rpm « %s »\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Impossible d'utiliser %s sans %s"
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, fuzzy, c-format
+msgid "Can't use %s with %s"
+msgstr "Impossible d'utiliser %s sans %s"
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "Trop d'arguments\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "Nn"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "OoYy"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Désolé, mauvais choix, veuillez réessayer\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "échec de mput, le noeud est peut-être inaccessible"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-"le noeud %s dispose d'une ancienne version d'urpme, veuillez le mettre à jour"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "échec de rshp, le noeud est peut-être inaccessible"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "sur le noeud %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Propagation du fichier synthesis vers les noeuds..."
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "Résolution des dépendances sur les noeuds..."
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Distribution des fichiers vers les noeuds..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Vérification si l'installation est possible sur les noeuds..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "L'installation a échoué sur le noeud %s"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "L'installation est possible"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Installation des paquetages sur les noeuds..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "échec de scp sur la machine %s (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "Propagation du fichier synthesis vers le noeud %s..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "Résolution des dépendances sur le noeud %s..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "l'hôte %s ne dispose pas de la bonne version de urpmi (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "Distribution des fichiers vers %s ..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "Vérification si l'installation est possible sur le noeud %s ..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "Installation du paquetage sur %s ..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "Installation de %s sur %s ..."
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "Préparation de l'installation sur %s..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -527,24 +467,28 @@ msgstr ""
 "\n"
 "usage : \n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - afficher ce message d'aide\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - sélectionner automatiquement un paquetage parmi les "
 "choix\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - vérifier si la désinstallation peut être achevée "
 "correctement.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
@@ -552,26 +496,38 @@ msgstr ""
 "n'existent\n"
 "                   pas.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel     - urpmi distribué sur plusieurs machines de l'alias.\n"
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Réempaqueter les fichiers avant effacement\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - utiliser un autre répertoire racine pour la "
 "désinstallation.\n"
 
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - utiliser un autre répertoire racine pour l'installation.\n"
+
+#: ../urpme:52
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - ne pas exécuter les scripts de désinstallation.\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
@@ -580,60 +536,64 @@ msgstr ""
 "                   distribution, utile pour (dés)installer un chroot avec\n"
 "                   l'option --root.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - utiliser un fichier de synthèse.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - utiliser un fichier hdlist.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - mode verbeux.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - mode verbeux.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - sélectionner tous les paquetages correspondants à\n"
 "                   l'expression.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Seul l'administrateur système (root) peut enlever des paquetages"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "paquetage inconnu"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "paquetages inconnus"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "paquetage inconnu"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Les paquetages suivants contiennent %s : %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "La désinstallation du paquetage %s rendra votre système instable"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Rien à désinstaller"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Vérification pour la désinstallation des paquetages suivants"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
@@ -641,17 +601,18 @@ msgstr ""
 "Pour satisfaire les dépendances, les %d paquetages suivants vont être "
 "désinstallés (%d Mo)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (o/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "Supprimer %d paquetages ?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (o/N) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Échec de la désinstallation"
 
@@ -673,22 +634,26 @@ msgstr ""
 "usage : urpmf [options] expression\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - afficher la version de cet utilitaire\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - utiliser un environment spécifique (en général\n"
 "                   un rapport d'anomalie).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - ne pas utiliser les médias spécifiés (séparés\n"
 "                   par des virgules).\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
@@ -697,200 +662,243 @@ msgstr ""
 
 # Les espaces supplémentaires sur la seconde ligne
 # sont volontaires
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - utiliser seulement les médias listés (séparés par des\n"
 "                   virgules).\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - trier les médias selon des sous-chaînes (séparées\n"
 "                   par des virgules).\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - utiliser le fichier de synthèse donné plutôt que la base\n"
 "                   de données urpmi.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - ne pas afficher les lignes identiques.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - n'utiliser que les médias de mise à jour.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - mode verbeux.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - ignorer la distinction majuscules/minuscules.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - respecter la distinction majuscules/minuscules.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 "  -F<str>        - remplacer le séparateur par <str> (par défaut ':').\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "Motifs de substitution :\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  texte          - texte traité en expression régulière, sauf si option -l.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - inclure du code perl directement.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - opérateur binaire ET.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - opérateur binaire OU.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - NON unaire.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - parenthèses droite et gauche.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "Liste des champs de recherche :\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - spécifie un format d'affichage de type printf\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   exemple : '%%name:%%files'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - chercher dans le champ architecture\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - chercher dans le champ « BuildHost »\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - chercher dans le champ « BuildTime »\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr ""
 "  --conffiles    - chercher dans la liste des fichiers de configuration\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - chercher dans le champ « conflicts »\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - chercher dans les descriptions de paquetages\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - chercher dans le champ « distribution »\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - chercher dans le champ « epoch »\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - chercher dans le nom de fichier du paquetage\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr ""
 "  --files        - chercher dans la liste des fichiers d'un paquetage\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - chercher dans le champ « Group »\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - chercher dans le nom du paquetage\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - chercher dans le champ « obsoletes »\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - chercher dans le nom du créateur du paquetage\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - chercher dans le champ « provides »\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - chercher dans la liste des dépendances\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - chercher dans le champ taille après installation\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - chercher dans le nom du paquetage source\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - chercher dans le résumé\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - chercher dans le champ « Url »\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - chercher dans le nom du fournisseur\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr ""
 "  -m             - chercher dans le média où le paquetage a été trouvé\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - afficher la version, la release et l'architecture\n"
 "                   du paquetage avec le nom.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 "Format incorrect : vous ne pouvez utiliser qu'une seule option multi-valeur"
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "avec environnement spécifique sur %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -898,11 +906,12 @@ msgstr ""
 "Note : comme aucun des médias spécifiés n'utilise de hdlist, urpmf n'a pu "
 "retourner de résultat\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Vous pouvez utiliser --name pour rechercher le nom d'un paquetage.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -919,14 +928,16 @@ msgstr ""
 "\n"
 "usage :\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - utiliser seulement le média spécifié pour rechercher\n"
 "                   (ou mettre à jour) les paquetages\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
@@ -934,13 +945,32 @@ msgstr ""
 "  --auto         - mode non intéractif, utilisation des paramètres par "
 "défaut.\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - sélection automatique des paquetages à mettre à jour.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - sélection automatique des paquetages à mettre à jour.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
+"  --no-md5sum    - Supprime la vérification de la somme de contrôle MD5.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - force la mise à jour de la clef gpg.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -948,13 +978,15 @@ msgstr ""
 "  --no-uninstall - ne jamais demander de désinstallation, plutôt annuler\n"
 "                   l'installation.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 "  --no-install   - ne pas installer les paquetages (les télécharger "
 "seulement)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -964,7 +996,7 @@ msgstr ""
 "                   paquetages demandés qui nécessitent des "
 "désinstallations.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -976,35 +1008,41 @@ msgstr ""
 "                   de paquetages doivent être installés ou mis à jour.\n"
 "                   (%d par défaut).\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - longueur minimale de transaction (%d par défaut).\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - imposer la recherche floue.\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s      - le prochain paquetage est un paquetage de sources\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - n'installer que les paquetages de sources (pas les\n"
 "                   binaires).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - enlever tous les rpm du cache avant toute opération.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - ne supprime aucun paquetage du cache.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -1012,7 +1050,8 @@ msgstr ""
 "  --allow-nodeps - autoriser l'installation des paquetages sans\n"
 "                   vérifier les dépendances.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -1020,12 +1059,14 @@ msgstr ""
 "  --allow-force  - autoriser l'installation des paquetages sans vérifier\n"
 "                   ni les dépendances ni l'intégrité.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --root         - utiliser un autre répertoire racine pour l'installation.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -1034,42 +1075,51 @@ msgstr ""
 "                   distribution; utile pour (dés)installer un chroot avec\n"
 "                   l'option --root.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - utiliser wget pour récupérer les fichiers distants.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - utiliser curl pour récupérer les fichiers distants.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr ""
 "  --prozilla     - utiliser prozilla pour récupérer les fichiers distants.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - options supplémentaires à passer à curl\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- options supplémentaires à passer à rsync\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - options supplémentaires à passer à wget\n"
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - options supplémentaires à passer à prozilla\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limiter la vitesse de téléchargement.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1077,7 +1127,8 @@ msgstr ""
 "  --resume       - reprendre le transfert des fichiers incomplets\n"
 "                   (--no-resume le désactive, il est désactivé par défaut).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1086,7 +1137,8 @@ msgstr ""
 "                   étant 1080 à défaut d'indication (format <proxy[:port]"
 ">).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1096,6 +1148,7 @@ msgstr ""
 "motdepasse>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1104,6 +1157,7 @@ msgstr ""
 "                   indiqué en second argument.\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1112,6 +1166,7 @@ msgstr ""
 "                   (--no-verify-rpm le désactive, activé par défaut).\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1120,20 +1175,24 @@ msgstr ""
 "correctement.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 "  --excludepath  - exclure les chemins indiqués, séparés par des virgules.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - exclure les fichiers de documentation.\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --ignoresize   - ne pas vérifier la place disque avant installation.\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - autoriser l'installation de paquetages prévus pour "
@@ -1141,23 +1200,17 @@ msgstr ""
 "                   architectures.\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - ne pas exécuter les scripts d'installation\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr ""
-"  --no-md5sum    - Supprime la vérification de la somme de contrôle MD5.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - force la mise à jour de la clef gpg.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - paquetages dont l'installation doit être ignorée\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1166,50 +1219,58 @@ msgstr ""
 "plus\n"
 "                   de choix que par défaut.\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - ne pas verrouiller la base rpm.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 "  --strict-arch  - mettre à jour uniquement les paquetages avec la même\n"
 "                   architecture.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - sélectionner toutes les correspondances de la ligne de\n"
 "                   commande.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - cherche dans les apports pour trouver le paquetage.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - ne pas chercher dans les apports pour trouver un "
 "paquetage.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - mode silencieux.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  les noms ou les fichiers rpm donnés en ligne de commande seront "
 "installés.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 "Erreur : options --auto-select et la liste de paquetages incompatibles.\n"
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
@@ -1217,12 +1278,13 @@ msgstr ""
 "Erreur : pour générer un rapport d'anomalie, précisez les arguments de la\n"
 "ligne de commande accompagnés de --bug.\n"
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 "Installation de paquetages binaires impossible avec l'option --install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1231,21 +1293,22 @@ msgstr ""
 "Le répertoire [%s] existe déjà, merci d'en utiliser un autre pour le rapport "
 "d'anomalie, ou de l'effacer."
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Impossible de créer le répertoire [%s] pour le rapport d'anomalie"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "La copie a échoué"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "Le répertoire d'environnement %s n'existe pas"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1254,52 +1317,59 @@ msgstr ""
 "Erreur : %s semble être monté en lecture seule.\n"
 "Utilisez --allow-force afin de forcer l'opération."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "Mise à jour des médias...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s : %s (à mettre à jour)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (à mettre à jour)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s :%s (à installer)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (à installer)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Que choisissez-vous ? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Les paquetages suivants ne peuvent pas être installés, car ils dépendent\n"
+"de paquetages qui sont plus anciens que les versions installées :\n"
+"%s"
+msgstr[1] ""
 "Les paquetages suivants ne peuvent pas être installés, car ils dépendent\n"
 "de paquetages qui sont plus anciens que les versions installées :\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1307,60 +1377,84 @@ msgstr ""
 "\n"
 "Désirez-vous tout de même continuer ?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (O/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Certains paquetages demandés ne peuvent pas être installés :\n"
+"%s"
+msgstr[1] ""
 "Certains paquetages demandés ne peuvent pas être installés :\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"La mise à jour ne peut pas continuer car les paquetages suivants\n"
+"doivent être désinstallés :\n"
+"%s\n"
+msgstr[1] ""
 "La mise à jour ne peut pas continuer car les paquetages suivants\n"
 "doivent être désinstallés :\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Afin de poursuivre la mise à jour, les paquetages suivants doivent être "
+"désinstallés :\n"
+"%s"
+msgstr[1] ""
 "Afin de poursuivre la mise à jour, les paquetages suivants doivent être "
 "désinstallés :\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(test uniquement, la suppression ne sera pas effectuée)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"Pour satisfaire les dépendances, les paquetages suivants vont être installés"
+msgstr[1] ""
 "Pour satisfaire les dépendances, les paquetages suivants vont être installés"
 
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Pour satisfaire les dépendances, le paquetage suivant va être installé"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d paquetages, %d Mo)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1369,88 +1463,106 @@ msgstr ""
 "Vous devez être root pour installer les dépendances suivantes :\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(test uniquement, l'installation ne sera pas effectuée)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "Procéder à l'installation des %d paquetages ? (%d Mo)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "Procéder à l'installation des %d paquetages ? (%d Mo)"
+msgstr[1] "Procéder à l'installation des %d paquetages ? (%d Mo)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Appuyez sur la touche Entrée quand vous êtes prêt..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Les paquetages suivants ont des signatures non valides"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Les paquetages suivants ont des signatures non valides"
+msgstr[1] "Les paquetages suivants ont des signatures non valides"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Voulez-vous continuer l'installation ?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "distribution de %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "installation de %s depuis %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "installation de %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "L'installation a échoué :"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Essayer d'installer sans vérifier les dépendances ? (o/N) "
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transactions d'installation ont échoué"
 
-#: ../urpmi:824
-msgid "Packages are up to date"
-msgstr "Les paquetages sont à jour"
-
-#: ../urpmi:827
+#: ../urpmi:828
 #, c-format
-msgid "Packages %s are already installed"
-msgstr "Les paquetages %s sont déjà installés"
+msgid "Installation is possible"
+msgstr "L'installation est possible"
 
-#: ../urpmi:828
+#: ../urpmi:833
 #, c-format
+msgid "Packages are up to date"
+msgstr "Les paquetages sont à jour"
+
+#: ../urpmi:840
+#, fuzzy, c-format
 msgid "Package %s is already installed"
-msgstr "Le paquetage %s est déjà installé"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Le paquetage %s est déjà installé"
+msgstr[1] "Le paquetage %s est déjà installé"
+
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Les paquetages %s sont déjà installés"
+msgstr[1] "Les paquetages %s sont déjà installés"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "Redémarrage de urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1473,29 +1585,34 @@ msgstr ""
 "et [options] parmi\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - créer un média de mise à jour.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  --probe-synthesis - essayer de trouver et d'utiliser un fichier de "
-"synthèse.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
+msgstr "  --probe-synthesis - utiliser un fichier de synthèse.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr ""
-"  --probe-hdlist - essayer de trouver et d'utiliser un fichier hdlist.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
+msgstr "  --probe-hdlist - utiliser un fichier hdlist.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - ne pas essayer de trouver un fichier hdlist\n"
 "                   ou de synthèse.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1503,16 +1620,18 @@ msgstr ""
 "  --distrib      - créer automatiquement tous les médias à partir\n"
 "                   d'un média d'installation.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - with --distrib, demande confirmation pour chaque média\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - with --distrib, ajoute tous les médias listés\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1522,7 +1641,8 @@ msgstr ""
 "défaut\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1530,49 +1650,71 @@ msgstr ""
 "  --virtual      - créer un média virtuel qui est toujours à jour,\n"
 "                   seul le protocole « file:// » est autorisé.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
+"  --no-md5sum    - Supprime la vérification de la somme de contrôle MD5.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 "  --nopubkey     - ne pas importer la clé publique des nouveaux médias\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - ajoute le média dans la configuration, mais sans le "
 "mettre à jour.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - purger le répertoire cache des en-têtes.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - forcer la génération des fichiers hdlist.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mode silencieux.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - mode verbeux.\n"
+
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "impossible de mettre à jour le média « %s »\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Seul l'administrateur système (root) peut ajouter un média"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Va créer le fichier de configuration [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Ne peut créer le fichier de configuration [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "inutile de spécifier  le <chemin relatif de hdlist> avec --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1581,16 +1723,17 @@ msgstr ""
 "\n"
 "Voulez-vous ajouter le média '%s'"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<chemin relatif de hdlist> manquant\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "directive « with » manquante pour les médias en réseau\n"
+#: ../urpmi.addmedia:169
+#, fuzzy, c-format
+msgid "Can't use %s with remote medium"
+msgstr "Impossible d'utiliser %s sans %s"
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "impossible de créer le média « %s »\n"
@@ -1613,16 +1756,19 @@ msgstr ""
 "usage : \n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - initialiser maintenant le point de référence\n"
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 "  --noclean      - ne pas vider le répertoire de regénération lors de\n"
 "                   l'initialisation du point de référence\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
@@ -1630,18 +1776,21 @@ msgstr ""
 "durée\n"
 "                   précisée\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-all     - lister toutes les transactions de la base RPM.\n"
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr ""
 "  --list-safe    - lister les transactions effectuées depuis le dernier "
 "point\n"
 "                   de référence\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
@@ -1649,118 +1798,121 @@ msgstr ""
 "  --rollback     - revenir à l'état correspondant à la date spécifiée,\n"
 "                   ou revenir en arrière du nombre de transactions précisé\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - désactive la regénération\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "Date ou durée invalide [%s]\n"
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr "Répertoire cache des paquetages non défini\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "Ecriture impossible dans le répertoire cache des paquetages [%s]\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "Vidage du répertoire cache des paquetages [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "%d fichiers effacés\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "Arguments de ligne de commande erronés [%s]\n"
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr "Vous ne pouvez pas utiliser --checkpoint et --rollback en même temps\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr "Vous ne pouvez pas utiliser --checkpoint et --list en même temps\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "Vous ne pouvez pas utiliser --rollback et --list en même temps\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "Vous ne pouvez pas utiliser --disable en même que d'autres options"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "Pas de transaction trouvée depuis %s\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "Vous devez être administrateur pour faire cela"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Ecriture du fichier de macros rpm [%s]...\n"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr "Aucune date de retour en arrière spécifiée\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "Retour en arrière jusqu'à %s...\n"
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr "Désactivation de la regénération\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "Utilisation : urpmi.removemedia [-a] <nom>...\n"
 "où <nom> est le nom du média à retirer.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - sélectionner tous les médias\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - imposer la recherche floue sur les noms de média.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"options inconnues « %s »\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Seul l'administrateur système (root) peut enlever un média"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "rien à retirer (utiliser urpmi.addmedia pour ajouter un média)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1770,6 +1922,7 @@ msgstr ""
 " (l'une parmi %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1778,32 +1931,48 @@ msgstr ""
 "où <nom> est un nom de média à mettre à jour.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - ne rafraîchir que les médias de mise à jour.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - force la mise à jour de la clef gpg.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr ""
 "  --ignore       - sans mettre à jour, marquer le média en tant qu'ignoré.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 "  --no-ignore    - sans mettre à jour, marquer le média en tant qu'actif.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - sélectionner tous les médias non amovibles\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - forcer la génération des fichiers hdlist.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Seul l'administrateur système (root) peut mettre à jour un média"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "rien à mettre à jour (utiliser urpmi.addmedia pour ajouter un média)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1812,21 +1981,21 @@ msgstr ""
 "l'entrée à mettre à jour est manquante\n"
 "(un parmi %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "« %s »"
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "activation du média %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "média %s ignoré"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "activation du média %s"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1845,6 +2014,7 @@ msgstr ""
 "usage :\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1853,32 +2023,39 @@ msgstr ""
 "                   (ou mettre à jour) les paquetages\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - imposer la recherche floue (identique à -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - montrer tous les paquetages disponibles.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - montrer tous les médias disponibles.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - montrer tous les médias disponibles et leurs URL.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - montrer tous les noeuds disponibles en\n"
 "                   utilisant --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - lister les alias parallèles disponibles.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
@@ -1886,12 +2063,14 @@ msgstr ""
 "                   pour urpmi.addmedia.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - le prochain paquetage est un paquetage de sources\n"
 "                   (identique à -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
@@ -1899,12 +2078,14 @@ msgstr ""
 "                   télécharger (administrateur seulement).\n"
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - autoriser la recherche de paquets pour d'autres\n"
 "                   architectures.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1912,73 +2093,87 @@ msgstr ""
 "  --use-distrib  - configure urpmi à la volée d'après l'arbre d'une\n"
 "                   distribution, permettant d'interroger une distribution.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - afficher le changelog.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - afficher le résumé.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 "  -c             - sortie sur la ligne de commande avec les\n"
 "                   noms des paquetages à désinstaller.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - étendre la requête aux dépendances du paquetage.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - afficher les groupes ainsi que les noms.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - afficher les informations utiles de manière plus "
 "lisible.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - lister les fichiers d'un paquetage.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - ne pas chercher dans les apports pour trouver un\n"
 "                   paquetage (par défaut).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr ""
 "  -p             - chercher dans les apports pour trouver le paquetage.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - afficher la version détaillée ainsi que le nom.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 "  -R             - recherche inversée des items nécessitant ce paquetage.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR            - recherche inversée étendue (paquetages virtuels "
 "compris).\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - le prochain paquetage est un paquetage de sources\n"
 "                   (identique à --src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
@@ -1987,33 +2182,122 @@ msgstr ""
 "déjà\n"
 "                   installée.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - imposer la recherche floue (identique à --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - comme -y mais n'est pas sensible à la casse\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  les noms ou fichiers rpm indiqués sur la ligne de commande sont "
 "interrogés.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes peut seulement être utilisé avec --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "média %s ignoré : aucun hdlist"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Aucune liste de fichiers n'a pu être trouvée\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Aucun Changelog trouvé\n"
+
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "échec de mput, le noeud est peut-être inaccessible"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr ""
+#~ "le noeud %s dispose d'une ancienne version d'urpme, veuillez le mettre à "
+#~ "jour"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "échec de rshp, le noeud est peut-être inaccessible"
+
+#~ msgid "on node %s"
+#~ msgstr "sur le noeud %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Propagation du fichier synthesis vers les noeuds..."
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "Résolution des dépendances sur les noeuds..."
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Distribution des fichiers vers les noeuds..."
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Vérification si l'installation est possible sur les noeuds..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "L'installation a échoué sur le noeud %s"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Installation des paquetages sur les noeuds..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "échec de scp sur la machine %s (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "Propagation du fichier synthesis vers le noeud %s..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "Résolution des dépendances sur le noeud %s..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "l'hôte %s ne dispose pas de la bonne version de urpmi (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Distribution des fichiers vers %s ..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "Vérification si l'installation est possible sur le noeud %s ..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Installation du paquetage sur %s ..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "Installation de %s sur %s ..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Préparation de l'installation sur %s..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "Pour satisfaire les dépendances, le paquetage suivant va être installé"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr ""
+#~ "  --probe-synthesis - essayer de trouver et d'utiliser un fichier de "
+#~ "synthèse.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr ""
+#~ "  --probe-hdlist - essayer de trouver et d'utiliser un fichier hdlist.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "directive « with » manquante pour les médias en réseau\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "options inconnues « %s »\n"
diff --git a/po/fur.po b/po/fur.po
index 474d39f9..20cf9661 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fur\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2004-05-21 14:55+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: Furlan <gft@freelists.org>\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
-#, fuzzy
+#: ../gurpmi:30 ../gurpmi2:63
+#, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Instalazion dal pachet..."
 
@@ -28,7 +28,8 @@ msgstr "Instalazion dal pachet..."
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
@@ -83,22 +84,23 @@ msgstr ""
 "\n"
 "Tu podaressis preferî di salvâlu. Cuale ise le to sielte?"
 
-#. - buttons
 #: ../gurpmi:97
-#, fuzzy
+#, fuzzy, c-format
 msgid "_Install"
 msgstr "Instale"
 
 #: ../gurpmi:98
-#, fuzzy
+#, fuzzy, c-format
 msgid "_Save"
 msgstr "Salve"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Scancele"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Sielç un puest dulà salvâ il file"
 
@@ -110,20 +112,21 @@ msgstr ""
 "opzions no cogniossudis '%s'\n"
 
 #: ../gurpmi.pm:89
-#, fuzzy
+#, fuzzy, c-format
 msgid "No packages specified"
 msgstr "Nissun comant specificât"
 
 #: ../gurpmi2:43
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please wait..."
 msgstr "Par plasè spiete."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr ""
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -133,37 +136,42 @@ msgstr ""
 "Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
 "%s"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Avertence"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:147
-#, fuzzy
+#: ../gurpmi2:149
+#, fuzzy, c-format
 msgid " (to install)"
 msgstr "Instalazion Automatiche"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Al covente un di chiscj pachets:"
 
-#: ../gurpmi2:174
-#, fuzzy
+#: ../gurpmi2:176
+#, fuzzy, c-format
 msgid "_Abort"
 msgstr "Informazions"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -173,7 +181,7 @@ msgstr ""
 "I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
 "%s"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -182,25 +190,27 @@ msgid ""
 msgstr ""
 "Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Instalazion dal pachet..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "no rivi a recuperâ i pachets sorzint, o fermi"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Par plasè insede le font clamade \"%s\" te periferiche [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "O stoi scjariant il pachet '%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -214,8 +224,7 @@ msgstr ""
 "\n"
 "Vuelistu continuâ le instalazion?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -226,36 +235,38 @@ msgstr ""
 "%s\n"
 "Tu podaressis ve voe di atualizâ il to database urpmi"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "rimozion di %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "In preparazion..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalazion dal pachet `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Instalazion falade"
 
-#: ../gurpmi2:329
-#, fuzzy
+#: ../gurpmi2:331
+#, fuzzy, c-format
 msgid "_Done"
 msgstr "Fat"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Al è dut dizà instalât"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Instalazion finide"
 
@@ -269,21 +280,23 @@ msgstr ""
 "la che [opzions] e son di\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - stampe chest mes di jutori.\n"
 
 #: ../rpm-find-leaves:17
-#, fuzzy
+#, fuzzy, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr ""
 "  --synthesis    - dopre il file synthesis specificât invezit dal db urpmi\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [group]     - selezione i risultâts di chel grop.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - stampe grops ancje cul non\n"
 
@@ -292,210 +305,126 @@ msgstr "  -g             - stampe grops ancje cul non\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    il valôr predefinît al è %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Dome il superutent al po instalâ pachets"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "no rivi a vierzi il database rpm"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "non dal file rpm no valevul [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "o recuperi il file rpm [%s] ..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...copie finide"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...copie falade: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "no rivi a acedi al file rpm [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "no rivi a analizâ \"%s\" tal file [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "no rivi a regjstrâ il file rpm"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "fal te regjistrazion dai pachets locâi"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "declarazion di proxy falade doprant le rie di comant\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Tu âs bisugne di sedi aministratôr par doprâ chest comant ! \n"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: no rivi a lei il file rpm \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "Nn"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "SsYy"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "Sielte falade, torne a provâ\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
+#: ../urpm/args.pm:426
 #, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
+msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr ""
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Instalazion falade"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Le instalazion e je pussibil"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "Instalazion dal pachet `%s' (%s/%s)..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
+#: ../urpm/args.pm:440
 #, c-format
-msgid "scp failed on host %s (%d)"
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "o esamini il file synthesis [%s]"
-
-#: ../urpm/parallel_ssh.pm:183
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "Nn"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "distribuzion di %s"
+msgid "Yy"
+msgstr "SsYy"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "Instalazion dal pachet..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "instalazion di %s"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "Instalazion dal pachet..."
+msgid "Sorry, bad choice, try again\n"
+msgstr "Sielte falade, torne a provâ\n"
 
 #: ../urpme:39
 #, fuzzy, c-format
@@ -514,49 +443,60 @@ msgstr ""
 "\n"
 "ûs:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - stampe chist mes di jutori.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - selezione automatichementri un pachet de sieltis.\n"
 
 #: ../urpme:46
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - verifiche se le instalazion e po sedi fate coretementri.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - sfuarçe le esecuzion ancje se cualchi pachet no l'esist.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi distribuît tra diferentis machinis.\n"
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --packager     - mostre le clâf packager: assembladôr dal pachet.\n"
 
 #: ../urpme:50
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - dopre une altre cartele di root par instalâ i file rpm.\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - dopre une altre cartele di root par instalâ i file rpm.\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description  - stampe il tag description: descrizion dal pachet.\n"
 
-#: ../urpme:52
-#, fuzzy
+#: ../urpme:53
+#, fuzzy, 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"
@@ -564,77 +504,79 @@ msgstr ""
 "  --use-distrib  - configure urpmi dal lamp di un arbul distribuît, zovevul\n"
 "                   par (dis)instalâ un pachet chroot cun opzion --root.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - cîr e dopre il file synthesis.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - prove a cirî e doprâ un file hdlist.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - maniere fetôse.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - modalitât fetôse.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - sielç ducj i pachets che cuadrin te espression.\n"
 
-#: ../urpme:74
-#, fuzzy
+#: ../urpme:75
+#, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Dome il superutent al po instalâ pachets"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "pachet no cognossût"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "pachets no cognossûts"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pachet no cognossût"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "I pachets seguints e contegnin %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "rimovi il pachet %s al prejudicarâ il to sisteme"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Nuie di rimovi"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "O controli le rimozion dai pachets seguints"
 
-#: ../urpme:133
+#: ../urpme:132
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "rimozion dal pachet %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Rimozion falade"
 
@@ -656,246 +598,269 @@ msgstr ""
 "ûs:\n"
 
 #: ../urpmf:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - stampe chist mes di jutori.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - dopre un ambient specific (di solit un rapuart di bug).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - no sta a doprâ les fonts listadis, disseparadis di "
 "virgulis.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - dopre dome les fonts te liste, disseparadis di virgulis.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - ordene fonts in base a les sotriis disseparadis di "
 "virgulis.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - dopre il file synthesis specificât invezit dal db urpmi\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - no sta a stampâ riis compagnis.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - dopre dome fonts di atualizazion.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modalitât fetôse.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - ignore le distinzion tra maiusculis e minusculis in "
 "cualsisei pattern.\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - ignore le distinzion tra maiusculis e minusculis in "
 "cualsisei pattern.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 "  -e             - cjape dentri il codis perl diretementri sicu perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - AND binari.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operadôr binari OR.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - NOT unari.\n"
 
-#: ../urpmf:55
-#, fuzzy
+#: ../urpmf:56
+#, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 "  )              - parentesis di diestre par sierâ un grop di espressions.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - dopre le interface X.\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    il valôr predefinît al è %s.\n"
 
-#: ../urpmf:59
-#, fuzzy
+#: ../urpmf:60
+#, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - stampe il tag url: url.\n"
 
-#: ../urpmf:60
-#, fuzzy
+#: ../urpmf:61
+#, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr ""
 "  --buildhost    - stampe il tag buildhost: host di compilazion dal pachet.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --files        - stampe i file tag: ducj i file.\n"
 
-#: ../urpmf:63
-#, fuzzy
+#: ../urpmf:64
+#, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 "  --conflicts     - stampe il tag conflicts: ducj i conflits rilevâts par il "
 "pachet.\n"
 
-#: ../urpmf:64
-#, fuzzy
+#: ../urpmf:65
+#, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - stampe il tag description: descrizion dal pachet.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - stampe tag epoch: ete.\n"
 
-#: ../urpmf:67
-#, fuzzy
+#: ../urpmf:68
+#, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --all           - stampe ducj i tag.\n"
 
-#: ../urpmf:68
-#, fuzzy
+#: ../urpmf:69
+#, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l         - liste i file presints int'un pachet.\n"
 
-#: ../urpmf:69
-#, fuzzy
+#: ../urpmf:70
+#, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - stampe il tag group: grop.\n"
 
-#: ../urpmf:70
-#, fuzzy
+#: ../urpmf:71
+#, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --all           - stampe ducj i tag.\n"
 
-#: ../urpmf:71
-#, fuzzy
+#: ../urpmf:72
+#, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 "  --obsoletes     - stampe il tag obsolete: dut chel fat deventâ vieli dal "
 "pachet.\n"
 
-#: ../urpmf:72
-#, fuzzy
+#: ../urpmf:73
+#, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - mostre le clâf packager: assembladôr dal pachet.\n"
 
-#: ../urpmf:73
-#, fuzzy
+#: ../urpmf:74
+#, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 "  --provides      - stampe il tag provides: elements furnîts dal pachet.\n"
 
-#: ../urpmf:74
-#, fuzzy
+#: ../urpmf:75
+#, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 "  --requires     - stampe il tag requires: dutis les pretesis dal pachet.\n"
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - stampe le tag size: dimension.\n"
 
-#: ../urpmf:76
-#, fuzzy
+#: ../urpmf:77
+#, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - stampe il tag sourcerpm: pachets rpm sorzint.\n"
 
-#: ../urpmf:77
-#, fuzzy
+#: ../urpmf:78
+#, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - stampe il tag summary: sumari dal pachet.\n"
 
-#: ../urpmf:78
-#, fuzzy
+#: ../urpmf:79
+#, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - stampe il tag url: url.\n"
 
-#: ../urpmf:79
-#, fuzzy
+#: ../urpmf:80
+#, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - modalitât fetôse.\n"
 
-#: ../urpmf:80
-#, fuzzy
+#: ../urpmf:81
+#, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l         - liste i file presints int'un pachet.\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - stampe version, release e architeture cun non.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "o dopri les variabilis di ambient su %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -903,11 +868,12 @@ msgstr ""
 "Note: fin che nissune font cirude e dopre hdlists, urpmf nol podarà dâ "
 "nissun risultât\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -924,27 +890,47 @@ msgstr ""
 "\n"
 "ûs:\n"
 
-#: ../urpmi:92
-#, fuzzy
+#: ../urpmi:88
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --media        - dopre dome les fonts te liste, disseparadis di virgulis.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - selezione automatichementri i pachets par atualizâ il "
 "sisteme.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - selezione automatichementri i pachets par atualizâ il "
+"sisteme.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - disabilite il control MD5SUM.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - sfuarçe le atualizazion de clâf gpg.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -952,12 +938,13 @@ msgstr ""
 "  --no-uninstall - no sta mai a domandâ di rimovi un pachet, ferme le "
 "instalazion.\n"
 
-#: ../urpmi:98
-#, fuzzy
+#: ../urpmi:97
+#, fuzzy, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --install-src  - instale dome il pachet sorzint (no i binaris).\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -965,7 +952,7 @@ msgstr ""
 "  --keep         - dopre i pachets esistints se possibil, dinee\n"
 "                   i pacchets domandâts se son di rimovi.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -976,39 +963,42 @@ msgstr ""
 "                   un pachet al stâ par sedi instalât o\n"
 "                   atualizât, il valôr predefinît al è %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 "  --split-length - par vê transazions plui piçulis, il valôr predefinît al è "
 "%d.\n"
 
-#: ../urpmi:105
-#, fuzzy
+#: ../urpmi:104
+#, fuzzy, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - impon une ricercje fuzzy (sicu -y).\n"
 
-#: ../urpmi:106
-#, fuzzy
+#: ../urpmi:105
+#, fuzzy, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr ""
 "  --src          - il prossim pachet al è un pachet sorzint (sicu -s).\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - instale dome il pachet sorzint (no i binaris).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - al rimôf i rpm de cache prin di fâ cualsisei altre robe.\n"
 
-#: ../urpmi:109
-#, fuzzy
+#: ../urpmi:108
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - ten i rpm no doprâs te cache.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -1016,7 +1006,8 @@ msgstr ""
 "  --allow-nodeps - permet di domandâ al utent se al ûl instalâ\n"
 "                   dai pachets cence controlâ les dipendencis.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -1024,12 +1015,14 @@ msgstr ""
 "  --allow-force   - permet di domandâ al utent di instalâ i pachets cence\n"
 "                   controlâ dipendencis e integritât.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --root         - dopre une altre cartele di root par instalâ i file rpm.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -1037,40 +1030,48 @@ msgstr ""
 "  --use-distrib  - configure urpmi dal lamp di un arbul distribuît, zovevul\n"
 "                   par instalâ un pachet chroot cun opzion --root.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - dopre wget par recuperâ file rimîs.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - dopre curl par recuperâ i file rimîs.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - dopre curl par recuperâ i file rimîs.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limite le velocitât di scjariament.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1078,7 +1079,8 @@ msgstr ""
 "  --resume       - ripie le stramude dai faile parzialmentri scjariâts\n"
 "                   (--no-resume lu disabilite, disabilitât predefinît).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1086,7 +1088,8 @@ msgstr ""
 "  --proxy        - dopre il proxy HTTP specificât, il numar di puarte\n"
 "                    predefinît al è1080 (formât: <proxyhost[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1095,6 +1098,7 @@ msgstr ""
 "                   le autenticazion cul proxy (formât: <utent:password>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1103,7 +1107,7 @@ msgstr ""
 "                   argoment seguitîf.\n"
 
 #: ../urpmi:138
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1112,7 +1116,7 @@ msgstr ""
 "                   (--no-verify-rpm le disabilite, predefinide abilitade).\n"
 
 #: ../urpmi:140
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1120,99 +1124,101 @@ msgstr ""
 "  --test         - verifiche se le instalazion e po sedi fate coretementri.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - trate di gjavâ fûr, disseparâs di virgulis.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - esclût i file di documentazion.\n"
 
 #: ../urpmi:143
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --no-uninstall - no sta mai a domandâ di rimovi un pachet, ferme le "
 "instalazion.\n"
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --url          - stampe il tag url: url.\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --description  - stampe il tag description: descrizion dal pachet.\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - disabilite il control MD5SUM.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - sfuarçe le atualizazion de clâf gpg.\n"
-
-#: ../urpmi:149
-#, fuzzy
+#: ../urpmi:147
+#, fuzzy, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr ""
 "  --test         - verifiche se le instalazion e po sedi fate coretementri.\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
 
-#: ../urpmi:152
-#, fuzzy
+#: ../urpmi:150
+#, fuzzy, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --noclean      - ten i rpm no doprâs te cache.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - selezione dutis les corispondencis te rie di comant.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - consint le ricercje tra i provides dal pachet.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - no sta a cirî tai provides par cjatâ il pachet.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - maniere cidine.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  i nons o file rpm scrits te linie di comant e vignaran instalâts\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
-#, fuzzy
+#: ../urpmi:220
+#, fuzzy, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 "Ce puedial sedi fat cun i file binaris rpm cuant che al ven doprât --install-"
 "src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1221,132 +1227,156 @@ msgstr ""
 "Le cartele [%s] e esist dizà, par plasè dopre une altre cartele par il bug "
 "report o scancelile"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "no rivi a creâ le cartele [%s] par il bug report"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Copie falade"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
 "Use --allow-force to force operation."
 msgstr ""
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, c-format
 msgid "%s (to upgrade)"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Instalazion Automatiche"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Instalazion Automatiche"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Cuale ise le to sielte? (1-%d) "
 
-#: ../urpmi:481
+#: ../urpmi:482
 #, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Continue distès?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (s/N) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
+"%s"
+msgstr[1] ""
 "Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Le instalazion no po continuâ parce che i pachets seguints\n"
+"e an di sedi rimovûts par atualizâ altris:\n"
+"%s\n"
+msgstr[1] ""
 "Le instalazion no po continuâ parce che i pachets seguints\n"
 "e an di sedi rimovûts par atualizâ altris:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
+"%s"
+msgstr[1] ""
 "I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
 "Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
-
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr ""
+msgstr[1] ""
 "Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
 
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1355,93 +1385,108 @@ msgstr ""
 "Tu âs di sedi root par podê instalâ chestis dipendencis: \n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Frache Enter cuant che tu sês pront..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Scancele"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Chiscj pachets e an firmis no valevulis"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Chiscj pachets e an firmis no valevulis"
+msgstr[1] "Chiscj pachets e an firmis no valevulis"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Âstu voie di continuâ le instalazion?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "distribuzion di %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "instalazion di %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "instalazion di %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalazion falade"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Provjo a instalâ cence controlâ les dipendencis? (s/N) "
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr ""
 "Ajo di provâ le instalazion in maniere ancjimò plui sfuarçâde (--force)? (s/"
 "N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d stramudis de instalazion faladis"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "Le instalazion e je pussibil"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Al è dut dizà instalât"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Al è dut dizà instalât"
+msgstr[1] "Al è dut dizà instalât"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Al è dut dizà instalât"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Al è dut dizà instalât"
+msgstr[1] "Al è dut dizà instalât"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "rinviament di urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1464,26 +1509,34 @@ msgstr ""
 "e [opzions] e son di\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - cree une font di atualizazion.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - cîr e dopre il file synthesis.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - prove a cirî e doprâ un file hdlist.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - nol cîr nissun file synthesis o\n"
 "                   hdlist.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1491,16 +1544,17 @@ msgstr ""
 "  --distrib      - crê automaticamentri duç i sopuarts di chei di\n"
 "                   instalazion.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - liste les fonts disponibilis.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1509,7 +1563,8 @@ msgstr ""
 "  --from        -dopre le url specificade par otignî le liste dai mirror, \n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1517,63 +1572,84 @@ msgstr ""
 "  --virtual      - cree une font virtuâl che je simpri atualizade,\n"
 "                   al è permitût dome il protocol file://.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - disabilite il control MD5SUM.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - nete les intestaduris de cartele in cache.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - sfuarçe gjenerazion di file hdlist.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - maniere cidine.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - maniere fetôse.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "no rivi a atualizâ le font \"%s\"\n"
 
-#: ../urpmi.addmedia:117
-#, fuzzy
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Dome il superutent al po instalâ pachets"
 
-#: ../urpmi.addmedia:120
+#: ../urpmi.addmedia:121
 #, fuzzy, c-format
-msgid "Will create config file [%s]"
+msgid "creating config file [%s]"
 msgstr "scrîf il file di configurazion [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "scrîf il file di configurazion [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "no l'è di bisugne di furnî <percors relatîf di hdlist> cun --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<percors relatîf di hdlist> mancjant\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "`with' al mancje par le font in rêt\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "no rivi a creâ le font \"%s\"\n"
@@ -1596,153 +1672,154 @@ msgstr ""
 "ûs:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - ten i rpm no doprâs te cache.\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-url     - liste les fonts disponibilis e i lôr url.\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-url     - liste les fonts disponibilis e i lôr url.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --all           - stampe ducj i tag.\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "il pachet %s no l'è stât cjatât."
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "o recuperi il file rpm [%s] ..."
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "Nissune liste di file cjatade\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "ûs: urpmi.removemedia [-a] <non> ...\n"
 "la che <non> al è il non de font di rimovi.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - selezione dutis les fonts.\n"
 
-#: ../urpmi.removemedia:57
-#, fuzzy
+#: ../urpmi.removemedia:43
+#, fuzzy, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr ""
 "  -a             - selezione dutis les corispondencis te rie di comant.\n"
 
-#: ../urpmi.removemedia:60
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opzions no cogniossudis '%s'\n"
-
-#: ../urpmi.removemedia:70
-#, fuzzy
+#: ../urpmi.removemedia:65
+#, fuzzy, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr "Dome il superutent al po instalâ pachets"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "nuie di rimovi (dopre urpmi.addmedia par zontâ une gnove font)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1752,6 +1829,7 @@ msgstr ""
 "(une di %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1760,32 +1838,46 @@ msgstr ""
 "la che <non> al è il non de font di atualizâ.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "--update       - dopre dome fonts di atualizazion.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - sfuarçe le atualizazion de clâf gpg.\n"
+
 #: ../urpmi.update:44
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "--update       - dopre dome fonts di atualizazion.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selezione une font no rimovibil.\n"
 
-#: ../urpmi.update:69
-#, fuzzy
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - sfuarçe gjenerazion di file hdlist.\n"
+
+#: ../urpmi.update:70
+#, fuzzy, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Dome il superutent al po instalâ pachets"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nuie di atualizâ (dopre urpmi.addmedia par zontâ une font)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1794,21 +1886,21 @@ msgstr ""
 "le vôs di atualizâ e mancje\n"
 "(une di %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, fuzzy, c-format
-msgid "enabling media %s"
-msgstr "o rimôf le font \"%s\""
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Modifiche de font \"%s\":"
 
+#: ../urpmi.update:101
+#, fuzzy, c-format
+msgid "enabling media %s"
+msgstr "o rimôf le font \"%s\""
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1827,7 +1919,7 @@ msgstr ""
 "ûs:\n"
 
 #: ../urpmq:50
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1835,31 +1927,38 @@ msgstr ""
 "  --media        - dopre dome les fonts te liste, disseparadis di virgulis.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - impon une ricercje fuzzy (sicu -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - liste i pachets disponibii.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - liste les fonts disponibilis.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - liste les fonts disponibilis e i lôr url.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - liste i grops disponibii cuant che si dopre --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - liste i alias paralei disponibii.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
@@ -1867,11 +1966,13 @@ msgstr ""
 "addmedia.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - il prossim pachet al è un pachet sorzint (sicu -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
@@ -1879,11 +1980,12 @@ msgstr ""
 "root).\n"
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --url          - stampe il tag url: url.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1891,67 +1993,77 @@ msgstr ""
 "  --use-distrib  - configure urpmi dal lamp di un arbul distribuît.\n"
 "                   Chest a ti permet di interogâ une distribuzion.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - stampe le liste des modifichis.\n"
 
-#: ../urpmq:82
-#, fuzzy
+#: ../urpmq:84
+#, fuzzy, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary      - stampe il tag summary: sumari dal pachet.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - risultâts complets cui pachets di rimovi.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - slargje le ricercje a lis dipendencis dal pachet.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - stampe grops ancje cul non\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - stampe informazions utilis in forme leibile.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l         - liste i file presints int'un pachet.\n"
 
-#: ../urpmq:90
-#, fuzzy
+#: ../urpmq:93
+#, fuzzy, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - no sta a cirî tai provides par cjatâ il pachet.\n"
 
-#: ../urpmq:91
-#, fuzzy
+#: ../urpmq:94
+#, fuzzy, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - consint le ricercje tra i provides dal pachet.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - stampe le version e le release ancje cui nons.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - ricercje ledrôse sui recuisîts dal pachet.\n"
 
-#: ../urpmq:94
-#, fuzzy
+#: ../urpmq:97
+#, fuzzy, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -R             - ricercje ledrôse sui recuisîts dal pachet.\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - il prossim pachet al è un pachet sorzint (compagn di --"
 "src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
@@ -1959,37 +2071,92 @@ msgstr ""
 "  -u             - rimôf il pachet se une version plui atualizade e je dizà "
 "instalade.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - impon une ricercje fuzzy (sicu --fuzzy).\n"
 
-#: ../urpmq:99
-#, fuzzy
+#: ../urpmq:101
+#, fuzzy, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -a             - selezione dutis les corispondencis te rie di comant.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  i nons o file rpm scrits te rie di comant e vegnin interogâs.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes al po sedi doprât dome cun --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, fuzzy, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "o salti le font %s: nissune hdlist\n"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Nissune liste di file cjatade\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Nissun changelog cjatât\n"
 
+#, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Instalazion falade"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Instalazion dal pachet `%s' (%s/%s)..."
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "o esamini il file synthesis [%s]"
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "distribuzion di %s"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "Instalazion dal pachet..."
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "instalazion di %s"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Instalazion dal pachet..."
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - cîr e dopre il file synthesis.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - prove a cirî e doprâ un file hdlist.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "`with' al mancje par le font in rêt\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "opzions no cogniossudis '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "protocol no cognosût definît par %s"
 
diff --git a/po/ga.po b/po/ga.po
index b497d7da..517b5f8e 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+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"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
-#, fuzzy
+#: ../gurpmi:30 ../gurpmi2:63
+#, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Ag Ullmhaigh feistiú"
 
@@ -27,8 +27,8 @@ msgstr "Ag Ullmhaigh feistiú"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
-#, fuzzy
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, fuzzy, c-format
 msgid "_Ok"
 msgstr "Ceart go Leor"
 
@@ -65,21 +65,23 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#. - buttons
 #: ../gurpmi:97
-#, fuzzy
+#, fuzzy, c-format
 msgid "_Install"
 msgstr "Ag Feistiú:"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Sábháil"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Cealaigh"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr ""
 
@@ -89,20 +91,21 @@ msgid "Unknown option %s"
 msgstr "Cód earraidh gan aithne %d\n"
 
 #: ../gurpmi.pm:89
-#, fuzzy
+#, fuzzy, c-format
 msgid "No packages specified"
 msgstr "pacáiste ar bith den ainm %s"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Fan go fóill, le do thoil..."
 
 #: ../gurpmi2:52
-#, fuzzy
+#, fuzzy, c-format
 msgid "Must be root"
 msgstr "Gaireas luchóige"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -110,37 +113,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "tá gach rud ann cheana féin"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Ceart go Leor"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Ceart go Leor"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:147
-#, fuzzy
+#: ../gurpmi2:149
+#, fuzzy, c-format
 msgid " (to install)"
 msgstr "Eirigh as Feistiú"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../gurpmi2:174
-#, fuzzy
+#: ../gurpmi2:176
+#, fuzzy, c-format
 msgid "_Abort"
 msgstr "Tobscoir"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -148,7 +156,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Tá %s ins na pacáistí a leanas: %s \n"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -156,26 +164,27 @@ msgid ""
 "%s\n"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../gurpmi2:215
-#, fuzzy
+#: ../gurpmi2:217
+#, fuzzy, c-format
 msgid "Package installation..."
 msgstr "Ag Ullmhaigh feistiú"
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Ag feistiál  pacáiste %s"
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -184,8 +193,7 @@ msgid ""
 "Do you want to continue installation ?"
 msgstr "Tá %s ins na pacáistí a leanas: %s \n"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -193,39 +201,40 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "ag feistiú %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Á Ullmhú..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, fuzzy, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 "Ag feisteáil pacáiste %s\n"
 "%d%%"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Theip ag feistiú"
 
-#: ../gurpmi2:329
-#, fuzzy
+#: ../gurpmi2:331
+#, fuzzy, c-format
 msgid "_Done"
 msgstr "Críochnithe"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "tá gach rud ann cheana féin"
 
-#: ../gurpmi2:339
-#, fuzzy
+#: ../gurpmi2:341
+#, fuzzy, c-format
 msgid "Installation finished"
 msgstr "Theip ag feistiú"
 
@@ -237,18 +246,22 @@ msgid ""
 msgstr ""
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr ""
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr ""
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr ""
 
 #: ../rpm-find-leaves:19
+#, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr ""
 
@@ -257,214 +270,126 @@ msgstr ""
 msgid "                    defaults to %s.\n"
 msgstr ""
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:73
-#, fuzzy
+#: ../urpm.pm:93
+#, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "Theip ar uathathmhéadú FAT: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, fuzzy, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpm.pm:139
-#, fuzzy
+#: ../urpm.pm:159
+#, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr ""
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, fuzzy, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "Teip ag leámh comhad chlár: %s"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "Nn"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "TtYy"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "Droch-rogha, athtrialaigh!\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
+#: ../urpm/args.pm:426
 #, c-format
-msgid "on node %s"
-msgstr ""
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Theip ag feistiú"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-#, fuzzy
-msgid "Installation is possible"
-msgstr "Theip ag feistiú"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
+msgid "Can't use %s with %s"
 msgstr ""
-"Ag feisteáil pacáiste %s\n"
-"%d%%"
 
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
+#: ../urpm/args.pm:440
 #, c-format
-msgid "scp failed on host %s (%d)"
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpm/parallel_ssh.pm:183
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "Nn"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "ag feistiú %s\n"
+msgid "Yy"
+msgstr "TtYy"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "Ag Ullmhaigh feistiú"
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "ag feistiú %s\n"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "Ag Ullmhaigh feistiú"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Droch-rogha, athtrialaigh!\n"
 
 #: ../urpme:39
 #, c-format
@@ -477,120 +402,134 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr ""
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
-#: ../urpme:51
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
 
 #: ../urpme:52
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr ""
+
+#: ../urpme:53
+#, 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"
 msgstr ""
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr ""
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr ""
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
 msgstr ""
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:74
-#, fuzzy
+#: ../urpme:75
+#, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Téip ag oscailt comhad: %s\n"
 
 #: ../urpme:106
-#, fuzzy
-msgid "unknown package"
-msgstr "gan aithne"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
-#, fuzzy
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "%d pacáistí"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "gan aithne"
+
 #: ../urpme:112
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr ""
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
-#, fuzzy
+#: ../urpme:125
+#, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpme:133
+#: ../urpme:132
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-#, fuzzy
-msgid " (y/N) "
-msgstr " (T/n) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "Ag feistiál  pacáiste %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
-#, fuzzy
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (T/n) "
+
+#: ../urpme:156
+#, fuzzy, c-format
 msgid "Removal failed"
 msgstr "Scríos modúil"
 
@@ -606,213 +545,260 @@ msgid ""
 msgstr ""
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr ""
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr ""
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Modúl Cumraíochta Konsole"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr ""
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr ""
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr ""
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr ""
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr ""
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr ""
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr ""
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr ""
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr ""
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr ""
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr ""
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr ""
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -823,39 +809,60 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+
+#: ../urpmi:94
+#, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
+
+#: ../urpmi:95
+#, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr ""
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -863,419 +870,480 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr ""
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr ""
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr ""
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr ""
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr ""
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr ""
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr ""
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr ""
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr ""
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr ""
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr ""
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:249
-#, fuzzy
+#: ../urpmi:247
+#, fuzzy, c-format
 msgid "Copying failed"
 msgstr "theip ar feistiú"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
 "Use --allow-force to force operation."
 msgstr ""
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, c-format
 msgid "%s (to upgrade)"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Eirigh as Feistiú"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Eirigh as Feistiú"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Céard é do rogha? (1-%d) "
 
-#: ../urpmi:481
+#: ../urpmi:482
 #, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Lean ar aghaidh ar aon nós?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (T/n) "
 
-#: ../urpmi:500
+#: ../urpmi:503
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr "tá gach rud ann cheana féin"
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] "tá gach rud ann cheana féin"
+msgstr[1] "tá gach rud ann cheana féin"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] "Tá %s ins na pacáistí a leanas: %s \n"
+msgstr[1] "Tá %s ins na pacáistí a leanas: %s \n"
 
-#: ../urpmi:535
+#: ../urpmi:541
 #, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr "Tá %s ins na pacáistí a leanas: %s \n"
+msgstr[0] "Tá %s ins na pacáistí a leanas: %s \n"
+msgstr[1] "Tá %s ins na pacáistí a leanas: %s \n"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "Tá ceann de na pacáistí seo de dhíth:"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] "Tá ceann de na pacáistí seo de dhíth:"
+msgstr[1] "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Tá ceann de na pacáistí seo de dhíth:"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
-#, fuzzy
+#: ../urpmi:618
+#, fuzzy, c-format
 msgid "Press Enter when ready..."
 msgstr "Brú Enter nuair atá sin déanta agat..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: ../urpmi:660
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "Tá ceann de na pacáistí seo de dhíth:"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Tá ceann de na pacáistí seo de dhíth:"
+msgstr[1] "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpmi:661
-#, fuzzy
+#: ../urpmi:668
+#, fuzzy, c-format
 msgid "Do you want to continue installation ?"
 msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "ag feistiú %s\n"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "ag feistiú %s\n"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "ag feistiú %s\n"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Theip ag feistiú"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr ""
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Theip ag feistiú"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Theip ag feistiú"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "tá gach rud ann cheana féin"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "tá gach rud ann cheana féin"
+msgstr[1] "tá gach rud ann cheana féin"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "tá gach rud ann cheana féin"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "tá gach rud ann cheana féin"
+msgstr[1] "tá gach rud ann cheana féin"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1289,106 +1357,139 @@ msgid ""
 msgstr ""
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
 msgstr ""
 
 #: ../urpmi.addmedia:59
+#, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
+msgstr ""
+
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr ""
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, fuzzy, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr ""
 
-#: ../urpmi.addmedia:120
+#: ../urpmi.addmedia:121
 #, fuzzy, c-format
-msgid "Will create config file [%s]"
+msgid "creating config file [%s]"
 msgstr "Téip ag cruthaigh comhad: %s"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "Téip ag cruthaigh comhad: %s"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
 msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, fuzzy, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "Téip ag oscailt comhad: %s\n"
@@ -1405,141 +1506,151 @@ msgid ""
 msgstr ""
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr ""
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr ""
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr ""
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr ""
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr ""
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
-#, fuzzy
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr "Úsáid: urpmi.removemedia [-a] <ainm>..."
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:60
-#, fuzzy, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr "%s: rogha gan aithne `%s'\n"
-
-#: ../urpmi.removemedia:70
+#: ../urpmi.removemedia:65
+#, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr ""
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1547,55 +1658,72 @@ msgid ""
 msgstr ""
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr ""
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr ""
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr ""
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, fuzzy, c-format
-msgid "enabling media %s"
+msgid "ignoring media %s"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, fuzzy, c-format
-msgid "ignoring media %s"
+msgid "enabling media %s"
 msgstr "léamh depslist comhad [%s]"
 
 #: ../urpmq:42
@@ -1610,149 +1738,222 @@ msgid ""
 msgstr ""
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr ""
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr ""
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr ""
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr ""
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Theip ag feistiú"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr ""
+#~ "Ag feisteáil pacáiste %s\n"
+#~ "%d%%"
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "léamh depslist comhad [%s]"
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "ag feistiú %s\n"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "Ag Ullmhaigh feistiú"
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "ag feistiú %s\n"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Ag Ullmhaigh feistiú"
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "Tá ceann de na pacáistí seo de dhíth:"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr "%s: rogha gan aithne `%s'\n"
+
+#, fuzzy
 #~ msgid "trying to override existing medium \"%s\", skipping"
 #~ msgstr "léamh depslist comhad [%s]"
 
diff --git a/po/gl.po b/po/gl.po
index 187be705..16877943 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-09-10 00:34+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 "Language-Team: Galician <<gpul-traduccion@ceu.fi.udc.es>>\n"
@@ -21,7 +21,8 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "Instalación de RPMs"
 
@@ -30,7 +31,8 @@ msgstr "Instalación de RPMs"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Erro: non foi posible atopar o ficheiro %s, cancelarase a operación"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Aceptar"
 
@@ -86,20 +88,23 @@ msgstr ""
 "\n"
 "Podería preferir só gardalo. Que desexa facer?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Instalar"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Escolla a localización onde se gardará o ficheiro"
 
@@ -109,18 +114,21 @@ msgid "Unknown option %s"
 msgstr "Opción descoñecida %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Non especificou ningún paquete"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Agarde..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Debe ser root"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -131,36 +139,42 @@ msgstr ""
 "%s\n"
 "Desexa continua-la instalación de tódolos xeitos?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Aceptar"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Aceptar"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr "(para actualizar)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr "(para instalar)"
 
-#: ../gurpmi2:150
-#, fuzzy
+#: ../gurpmi2:152
+#, fuzzy, c-format
 msgid "Package choice"
 msgstr "Selección de paquetes"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Necesítase un dos seguintes paquetes:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Abortar"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -171,7 +185,7 @@ msgstr ""
 "%s\n"
 "Desexa continuar a instalación de tódolos xeitos?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -181,25 +195,27 @@ msgstr ""
 "Para satisfacer as dependencias, vanse instalar os seguintes %d paquetes:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Instalación de paquetes..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Non foi posible consegui-los paquetes fonte, abortando"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Insira o soporte que se chama \"%s\" no dispositivo [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Descargando o paquete `%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -212,8 +228,7 @@ msgstr ""
 "\n"
 "Desexa continuar ca instalación?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -224,35 +239,38 @@ msgstr ""
 "%s\n"
 "Pode ser que desexe actualizar a base de datos do seu urpmi"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "eliminando %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Preparando..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalando o paquete `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "A instalación fallou"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Feito"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Xa está todo instalado"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Instalación rematada"
 
@@ -266,19 +284,22 @@ msgstr ""
 "onde [opcións] son dende\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - amosa esta mensaxe de axuda.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <ruta>  - usar a ruta dada no canto de /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [grupo]     - restrinxe os resultados a un grupo dado.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  !              - NOT unario.\n"
 
@@ -287,212 +308,127 @@ msgstr "  !              - NOT unario.\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    por defecto é %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Só o superusuario pode instalar paquetes"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Executando urpmi en modo restrinxido..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "non foi posible abrir rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nome de ficheiro rpm incorrecto [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "recuperando o ficheiro rpm [%s] ..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...recuperación rematada"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...fallo ó recuperar: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "non foi posible acceder ó ficheiro rpm [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "non foi posible analisar o ficheiro spec %s [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "non foi posible rexistrar o ficheiro rpm"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "erro ó rexistra-los paquetes locais"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Esta operación está prohibida mentres se executa en modo restrinxido"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "declaración errónea do proxy na liña de comandos\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
-#, fuzzy
+#: ../urpm/args.pm:133
+#, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "O directorio de ambiente %s non existe"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Necesita ser root para usar --use-distrib"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: non se puido ler o ficheiro rpm \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, c-format
+msgid "Can't use %s with %s"
+msgstr ""
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "Demasiados argumentos\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "Nn"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "SsYy"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Mala elección, probe de novo\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-#, fuzzy
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "mput fallou, pode ser que un nodo non estea dispoñible"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "o nodo %s ten unha versión antiga de urpme, por favor actualice"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-#, fuzzy
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "rshp fallou, pode ser que un nodo non estea dispoñible"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "no nodo %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Propagando synthesis ós nodos..."
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "Resolvendo dependencias nos nodos..."
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Distribuíndo ficheiros ós nodos..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Verificando se é posible a instalación nos nodos..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "A instalación fallou no nodo %s"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "A instalación é viable"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Instalando paquetes nos nodos..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "scp fallou na máquina %s (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "Propagando synthesis a %s..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "Resolvendo dependencias en %s..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "a máquina %s non ten unha boa versión de urpmi (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "Distribuíndo os ficheiros a %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "Verificando se é posible a instalación en %s..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "Levando a cabo a instalación en %s..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "Instalando %s en %s..."
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "Preparando a instalación en %s..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -509,109 +445,122 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - amosa esta mensaxe de axuda.\n"
 
 #: ../urpme:45
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - selecciona automáticamente un paquete na selección.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - verifica se a eliminación se pode facer de xeito "
 "correcto.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - forzar a invocación incluso se algún paquete non existe.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Reempaquetar os ficheiros antes de eliminar\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - usar outra raíz para a eliminación de rpms.\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - usar outra raíz para a instalación de rpms.\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description  - descrición do paquete\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
 msgstr ""
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - intentar buscar e usar o ficheiro synthesis.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - intentar buscar e usar o ficheiro hdlist.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modo detallado.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - modo detallado.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - selecciona tódolos paquetes que concordan ca expresión.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Só o superusuario pode eliminar paquetes"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "paquete descoñecido"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "paquetes descoñecidos"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "paquete descoñecido"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Os seguintes paquetes conteñen %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "Se se elimina o paquete %s o sistema estropearase"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Non hai nada que eliminar"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
-#, fuzzy
+#: ../urpme:125
+#, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "Comprobando para eliminar os seguintes paquetes"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
@@ -619,17 +568,18 @@ msgstr ""
 "Para satisfacer as dependencias, vanse eliminar os seguintes %d paquetes (%d "
 "MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "Desexa eliminar %d paquetes?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Fallo ó eliminar"
 
@@ -650,212 +600,258 @@ msgstr ""
 "uso: urpmf [opcións] expresión-patrón\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - amosa o número de versión desta ferramenta.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - non usar os soportes dados, separados por comas.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - usar só os soportes dados, separados por comas.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - ordenar os soportes de acordo cas cadeas separadas por "
 "comas.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - usar o ficheiro synthesis proporcionado no\n"
 "                   canto da base de datos de urpmi.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - non amosa as liñas idénticas.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - usar só soportes de actualización.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modo detallado.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - ignorar a distinción de maiúsculas-minúsculas nos "
 "patróns.\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - ignorar a distinción de maiúsculas-minúsculas nos "
 "patróns.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 "  -F<str>        - cambiar o separador de campos (predeterminado ':').\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "Expresións patrón:\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operador binario AND.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operador binario OR.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - NOT unario.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - parénteses esquerdo e dereito.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "Lista de etiquetas:\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - especifica un formato de saída coma o de printf\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   exemplo: '%%nome:%%ficheiros'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arquitectura\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - máquina de construcción\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - hora de construcción\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - ficheiros de configuración\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - descrición do paquete\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distribución\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr ""
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - nome de ficheiro do paquete\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - lista dos ficheiros contidos no paquete\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grupo\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - nome do paquete\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - empaquetador\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - tamaño despois de instalar\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - nome do rpm fonte\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - resumo\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - vendedor\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - o soporte no que se atopou o paquete\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "usando ambiente específico en %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -863,11 +859,12 @@ msgstr ""
 "Nota: xa que ningún dos soportes nos que se buscou usa hdlists, urpmf non "
 "puido devolver ningún resultado\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Podería querer usar --name para buscar polo nome do paquete.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -883,14 +880,16 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - usar só o soporte dado para buscar os paquetes "
 "solicitados.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
@@ -898,14 +897,33 @@ msgstr ""
 "  --auto         - modo non-interactivo, tómanse as respostas "
 "predeterminadas para as preguntas.\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - seleccionar automáticamente os paquetes para actualizar o "
 "sistema.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - seleccionar automáticamente os paquetes para actualizar o "
+"sistema.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deshabilitar a comprobación de ficheiros MD5SUM.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - forzar a actualización da clave gpg.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -913,11 +931,13 @@ msgstr ""
 "  --no-uninstall - nunca preguntar pola desinstalación dun paquete, abortar "
 "a instalación.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - non instalar os paquetes (só descargalos)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -925,7 +945,7 @@ msgstr ""
 "  --keep         - manten os paquetes existentes se é posible, rexeita\n"
 "                   os paquetes solicitados que provocan eliminacións.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -936,35 +956,39 @@ msgstr ""
 "                   actualizar máis paquetes dos dados polo usuario,\n"
 "                   por defecto é %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - tamaño mínimo de transacción, por defecto é %d.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr ""
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s      - o seguinte paquete é un paquete de fontes.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - instalar só o paquete de fontes (non os binarios).\n"
 
-#: ../urpmi:108
-#, fuzzy
+#: ../urpmi:107
+#, fuzzy, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - eliminar os rpms da caché antes de facer nada.\n"
 
-#: ../urpmi:109
-#, fuzzy
+#: ../urpmi:108
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - non eliminar os rpms da caché.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -972,57 +996,67 @@ msgstr ""
 "  --allow-nodeps - permitirlle ó usuario instalar paquetes sen\n"
 "                   comprobar as dependencias.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - usar outra raíz para a instalación de rpms.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - usar wget para descargar ficheiros distantes.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - usar curl para descargar ficheiros distantes.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - usar curl para descargar ficheiros distantes.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - opcións adicionais para pasarlle a curl\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- opcións adicionais para pasarlle a rsync\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - opcións adicionais para pasarlle a wget\n"
 
 #: ../urpmi:127
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --curl-options - opcións adicionais para pasarlle a curl\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limita a velocidade de descarga.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1031,7 +1065,8 @@ msgstr ""
 "                   descargados parcialmente (--no-resume\n"
 "                   desactívaa, por defecto está desactivada).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1040,7 +1075,8 @@ msgstr ""
 "                   número de porto é o 1080 por defecto (o formato é\n"
 "                   <máquinaproxy[:porto]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1050,6 +1086,7 @@ msgstr ""
 "                   <usuario:contrasinal>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1058,6 +1095,7 @@ msgstr ""
 "                   polo seguinte argumento.\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1067,6 +1105,7 @@ msgstr ""
 "                   defecto está activada).\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1075,42 +1114,39 @@ msgstr ""
 "correcta.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - excluir as rutas separadas por comas.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - exclúe os ficheiros da documentación.\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --ignoresize   - non verificar o espacio baleiro do disco antes\n"
 "                   de instalar.\n"
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --arch         - arquitectura\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --description  - descrición do paquete\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - deshabilitar a comprobación de ficheiros MD5SUM.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - forzar a actualización da clave gpg.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - omitir a instalación destes paquetes.\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1118,51 +1154,60 @@ msgstr ""
 "  --more-choices - cando se atopan varios paquetes, propoñer máis eleccións\n"
 "                   ademais da predeterminada.\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - non bloquear a base de datos rpm.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - actualizar só paquetes ca mesma arquitectura.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - permite buscar en proporciona para atopar o paquete.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - non buscar en proporciona para atopar o paquete.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -v             - modo abreviado.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  nomes ou ficheiros rpm dados na liña de comandos instalaranse.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Non pode instalar ficheiros rpm de binarios cando usa --install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1171,21 +1216,22 @@ msgstr ""
 "O directorio [%s] xa existe, use outro directorio para a comunicación de "
 "erros ou elimíneo"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Non foi posible crear o directorio [%s] para a comunicación de erros"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Fallo ó copiar"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "O directorio de ambiente %s non existe"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1194,52 +1240,59 @@ msgstr ""
 "Erro: semella que %s se montou coma de só lectura.\n"
 "Use --allow-force para forzar a operación."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "Actualizando soporte...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "(para actualizar)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "(para actualizar)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "(para instalar)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "(para instalar)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "¿Cal é a súa elección? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Non se poden instalar os seguintes paquetes porque dependen de paquetes\n"
+"que son máis antigos cós instalados:\n"
+"%s"
+msgstr[1] ""
 "Non se poden instalar os seguintes paquetes porque dependen de paquetes\n"
 "que son máis antigos cós instalados:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1247,58 +1300,82 @@ msgstr ""
 "\n"
 "¿Continuar a instalación de tódolos xeitos?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Algún dos paquetes solicitados non se puido instalar:\n"
+"%s"
+msgstr[1] ""
 "Algún dos paquetes solicitados non se puido instalar:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"A instalación non pode continuar porque cómpre eliminar os seguintes\n"
+"paquetes para para poder actualizar outros:\n"
+"%s\n"
+msgstr[1] ""
 "A instalación non pode continuar porque cómpre eliminar os seguintes\n"
 "paquetes para para poder actualizar outros:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Teñen que eliminarse os seguintes paquetes para poder actualizar outros:\n"
+"%s"
+msgstr[1] ""
 "Teñen que eliminarse os seguintes paquetes para poder actualizar outros:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(só probar, a eliminación non se fará agora mesmo)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "Para satisface-las dependencias, vanse instala-los seguintes paquetes"
-
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Para satisface-las dependencias, vaise instala-lo seguinte paquete"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"Para satisface-las dependencias, vanse instala-los seguintes paquetes"
+msgstr[1] ""
+"Para satisface-las dependencias, vanse instala-los seguintes paquetes"
 
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d paquetes, %d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1307,89 +1384,106 @@ msgstr ""
 "Necesita ser root para instalar as seguintes dependencias:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(só probar, a instalación non se fará agora mesmo)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "Continuar ca instalación dos %d paquetes? (%d MB)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "Continuar ca instalación dos %d paquetes? (%d MB)"
+msgstr[1] "Continuar ca instalación dos %d paquetes? (%d MB)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Prema Enter cando estea preparado..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Os seguintes paquetes teñen sinaturas incorrectas"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Os seguintes paquetes teñen sinaturas incorrectas"
+msgstr[1] "Os seguintes paquetes teñen sinaturas incorrectas"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "¿Desexa continuar ca instalación?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "distribuíndo %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "instalando %s dende %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "instalando %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "A instalación fallou:"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "¿Probar a instalación sen comprobar as dependencias? (s/N) "
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "¿Probar a instalación con menos comprobacións (--force)? (s/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "fallaron %d transaccións de instalación"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "A instalación é viable"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Xa está todo instalado"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Xa está todo instalado"
+msgstr[1] "Xa está todo instalado"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Xa está todo instalado"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Xa está todo instalado"
+msgstr[1] "Xa está todo instalado"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "reiniciando urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1403,26 +1497,34 @@ msgid ""
 msgstr ""
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - crear un soporte de actualización.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - intentar buscar e usar o ficheiro synthesis.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - intentar buscar e usar o ficheiro hdlist.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - non intentar buscar ningún ficheiro\n"
 "                   synthesis ou hdlist.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1430,16 +1532,17 @@ msgstr ""
 "  --distrib      - crea automáticamente tódolos soportes dende un\n"
 "                   soporte de instalación.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - lista os soportes dispoñibles.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1449,7 +1552,8 @@ msgstr ""
 "                   espello, o predeterminado é\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1457,48 +1561,68 @@ msgstr ""
 "  --virtual      - crear un soporte virtual que sempre está actualizado,\n"
 "                   só se permite o protocolo file://.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deshabilitar a comprobación de ficheiros MD5SUM.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - non importar a clave pública do soporte engadido\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - engadir o soporte á configuración, pero non actualizalo.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
-#, fuzzy
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, fuzzy, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - limpar o directorio de caché de cabeceiras.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - forzar a xeración de ficheiros hdlist.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -v             - modo abreviado.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modo detallado.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "non foi posible actualizar o soporte \"%s\"\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Só o superusuario pode engadir soportes"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Crearase o ficheiro de configuración [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Non se puido crear o ficheiro de configuración [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "non cómpre dar a <ruta relativa a hdlist> con --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1507,16 +1631,17 @@ msgstr ""
 "\n"
 "Desexa engadir o soporte '%s'"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "falta `with' no soporte de rede\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "non foi posible crear o soporte \"%s\"\n"
@@ -1538,154 +1663,156 @@ msgstr ""
 "uso:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 
-#: ../urpmi.recover:36
-#, fuzzy
+#: ../urpmi.recover:37
+#, fuzzy, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - lista as transaccións dende o argumento data/duración "
 "proporcionado\n"
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-all     - lista tódalas transaccións en rpmdb (longo)\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-url     - lista os soportes dispoñibles e o seu url.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - apagar o reempacamento\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "Data ou duración incorrecta [%s]\n"
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "Non se definiu o directorio de reempacamento\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, fuzzy, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "Non se puido escribir no directorio de reempacamento [%s]\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, fuzzy, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "Limpando (ou baleirando) o directorio de reempacamento [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "elimináronse %d ficheiros\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr "Non pode especificar --checkpoint e --rollback ó mesmo tempo\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr "Non pode especificar --checkpoint e --list ó mesmo tempo\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "Non pode especificar --rollback e --list ó mesmo tempo\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "Non pode especificar --disable xunta con outra opción"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "Non se atoparon transaccións dende %s\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "Debe ser o superusuario para facer isto"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Escribindo o ficheiro de macros rpm [%s]...\n"
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "Non se atopou a lista de ficheiros\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, fuzzy, c-format
 msgid "Rollback until %s...\n"
 msgstr "Desfacer ata %s...\n"
 
-#: ../urpmi.recover:194
-#, fuzzy
+#: ../urpmi.recover:195
+#, fuzzy, c-format
 msgid "Disabling repackaging\n"
 msgstr "Deshabilitando o reempacamento\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "uso: urpmi.removemedia [-a] <nome> ...\n"
 "onde <nome> é o nome do soporte que se desexa eliminar.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - selecciona tódolos soportes.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opcións descoñecidas '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Só o superusuario pode eliminar soportes"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "non hai nada que eliminar (use urpmi.addmedia para engadir un soporte)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1695,6 +1822,7 @@ msgstr ""
 "(unha de %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1703,31 +1831,47 @@ msgstr ""
 "onde <nome> é o nome do soporte que se desexa actualizar.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - actualizar só os soportes de actualización.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - forzar a actualización da clave gpg.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - non actualizar, marcar o soporte coma ignorado.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - non actualizar, marcar o soporte coma activado.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selecciona tódolos soportes non extraíbles.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - forzar a xeración de ficheiros hdlist.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Só o superusuario pode actualizar soportes"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "non hai nada que actualizar (use urpmi.addmedia para engadir un soporte)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1736,21 +1880,21 @@ msgstr ""
 "falta a entrada a actualizar\n"
 "(unha de %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "habilitando o soporte %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorando o soporte %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "habilitando o soporte %s"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1768,6 +1912,7 @@ msgstr ""
 "uso:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1776,31 +1921,38 @@ msgstr ""
 "solicitados (ou a actualizar).\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - listar os paquetes dispoñibles.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - lista os soportes dispoñibles.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - lista os soportes dispoñibles e o seu url.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - lista os nodos dispoñibles cando se usa --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
@@ -1808,85 +1960,102 @@ msgstr ""
 "addmedia.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - o seguinte paquete é un paquete de fontes (igual ca -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --arch         - arquitectura\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - amosa o changelog.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - amosar o resumo.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - saída completa co paquete que se vai eliminar.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - extender a solicitude ás dependencias do paquete.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - amosa información útil en forma lexible.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - lista os ficheiros do paquete.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - non buscar en proporciona para atopar o paquete "
 "(predeterminado).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - buscar en proporciona para atopar o paquete.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - o seguinte paquete é un paquete de fontes (igual ca --"
 "src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
@@ -1894,35 +2063,121 @@ msgstr ""
 "  -u             - elimina o paquete se xa está instalada unha versión máis "
 "nova.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes só se pode usar con --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "saltando o soporte %s: non ten hdlist"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Non se atopou a lista de ficheiros\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Non se atopou o changelog\n"
 
+#, fuzzy
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "mput fallou, pode ser que un nodo non estea dispoñible"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr "o nodo %s ten unha versión antiga de urpme, por favor actualice"
+
+#, fuzzy
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "rshp fallou, pode ser que un nodo non estea dispoñible"
+
+#~ msgid "on node %s"
+#~ msgstr "no nodo %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Propagando synthesis ós nodos..."
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "Resolvendo dependencias nos nodos..."
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Distribuíndo ficheiros ós nodos..."
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Verificando se é posible a instalación nos nodos..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "A instalación fallou no nodo %s"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Instalando paquetes nos nodos..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "scp fallou na máquina %s (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "Propagando synthesis a %s..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "Resolvendo dependencias en %s..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "a máquina %s non ten unha boa versión de urpmi (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Distribuíndo os ficheiros a %s..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "Verificando se é posible a instalación en %s..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Levando a cabo a instalación en %s..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "Instalando %s en %s..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Preparando a instalación en %s..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "Para satisface-las dependencias, vaise instala-lo seguinte paquete"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr ""
+#~ "  --probe-synthesis - intentar buscar e usar o ficheiro synthesis.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - intentar buscar e usar o ficheiro hdlist.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "falta `with' no soporte de rede\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "opcións descoñecidas '%s'\n"
+
 #~ msgid "%s is not available, falling back on %s"
 #~ msgstr "non está dispoñible %s, volvendo a %s"
 
diff --git a/po/he.po b/po/he.po
index 02c08ca0..caf1ab1d 100644
--- a/po/he.po
+++ b/po/he.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2005-07-09 23:33+0300\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <mdk-hebrew@iglu.org.il>\n"
@@ -26,7 +26,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "התקנת חבילות תוכנה"
 
@@ -35,7 +36,8 @@ msgstr "התקנת חבילות תוכנה"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_המשך"
 
@@ -90,20 +92,23 @@ msgstr ""
 "\n"
 "ייתכן וברצונך רק לשמור את החבילה לדיסק. מה ברצונך לעשות?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_התקנה"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_שמירה"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_ביטול"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "עליך לבחור מקום לשמירת הקובץ"
 
@@ -115,19 +120,21 @@ msgstr ""
 "unknown options '%s'\n"
 
 #: ../gurpmi.pm:89
-#, fuzzy
+#, fuzzy, c-format
 msgid "No packages specified"
 msgstr "לא נמצאה חבילה בשם %s"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "נא להמתין..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "עליך להיות בעל הרשאות מנהל מערכת"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -138,35 +145,42 @@ msgstr ""
 "%s\n"
 "האם ברצונך להמשיך?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "אישור"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "אישור"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (לשדרג)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (להתקין)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "בחירת חבילות"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "אחת החבילות הבאות נדרשת:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_בטל"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -177,7 +191,7 @@ msgstr ""
 "%s\n"
 "האם ברצונך להמשיך?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -187,25 +201,27 @@ msgstr ""
 "בכדי לספק את התלויות, %d החבילות הבאות יותקנו:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "התקנת חבילה..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "אין אפשרות לקרוא חבילות מהמאגר, הפעולה מתבטלת"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "נא להכניס את המדיה הנקראת \"%s\"  להתקן [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "מוריד חבילה `%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -218,8 +234,7 @@ msgstr ""
 "\n"
 "האם להמשיך את ההתקנה?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -230,35 +245,38 @@ msgstr ""
 "%s\n"
 "יתכן ועליך לעדכן את מאגר הנתונים של urpmi"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "מסיר %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "הכנה..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "מתקין חבילה `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "ההתקנה נכשלה"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_סיום"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "הכל כבר מותקן"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "ההתקנה הסתיימה"
 
@@ -272,19 +290,22 @@ msgstr ""
 "כאשר [options] הם מתוך\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - הצגת הודעת עזרה זו.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <path>  - השתמש בשורש המוגדר במקום /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [group]     - הגבלת התוצאות לקבוצה (group) מסויימת.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - הצג גם קבוצות עם שם זה.\n"
 
@@ -293,210 +314,126 @@ msgstr "  -g             - הצג גם קבוצות עם שם זה.\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    ברירת המחדל היא %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "רק מנהל מערכת מורשה להתקין חבילות"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "הפעלת urpmi באופן עבודה מוגבל..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "אין אפשרות לפתוח את בסיס הנתונים של החבילות rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "שם החבילה [%s] אינו תקין"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "מאחזר קובץ RPM [%s]..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...האחזור הסתיים"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...האיחזור נכשל: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "הגישה לחבילה [%s] נכשלה"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "אין אפשרות לפענח את \"%s\" בקובץ [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "אין אפשרות לבצע רישום של החבילה"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "חלה שגיאה בעת רישום חבילות מקומיות"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "פעולה זו אינה מותרת באופן עבודה מוגבל"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "הכרזת proxy לא תקנית בשורת הפקודה\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "עליך להיות משתמש-על כדי להפעיל פקודה זו!\n"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: לא יכול קובץ RPM \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "לkKמnN"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "כfFטyY"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "מצטער ,בחירה רעה, יש לנסות שנית\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
+#: ../urpm/args.pm:426
 #, c-format
-msgid "on node %s"
+msgid "Can't use %s with %s"
 msgstr ""
 
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "ההתקנה נכשלה"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Installation is possible"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "מתקין חבילה `%s' (%s/%s)..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
+#: ../urpm/args.pm:440
 #, c-format
-msgid "scp failed on host %s (%d)"
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "בודק את קובץ הsynthesis [%s]"
-
-#: ../urpm/parallel_ssh.pm:183
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "לkKמnN"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "מפיץ %s"
+msgid "Yy"
+msgstr "כfFטyY"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "התקנת חבילה..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "מתקין את %s מתוך %s"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "התקנת חבילה..."
+msgid "Sorry, bad choice, try again\n"
+msgstr "מצטער ,בחירה רעה, יש לנסות שנית\n"
 
 #: ../urpme:39
 #, fuzzy, c-format
@@ -515,44 +452,56 @@ msgstr ""
 "\n"
 "שימוש:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - הצגת הודעת עזרה זו.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - בחירה אוטומטית של חבילה מהאפשרויות.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - בדיקה האם הסרת החבילה יכולה להסתיים בהצלחה.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - אלץ הפעלה גם אם חלק מהחבילות חסרות.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - הפעלה מבוזרת מול מספר מכונות שתוכנן זהה.\n"
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --packager     - הדפסת אורז התג: אורז.\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - שימוש בשורש אחר לצורך הסרת חבילות תוכנה.\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - השתמש בשורש מערכת קבצים אחר להתקנת חבילות.\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description  - הדפסת תיאור התג: תיאור.\n"
 
-#: ../urpme:52
-#, fuzzy
+#: ../urpme:53
+#, fuzzy, 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"
@@ -560,76 +509,79 @@ msgstr ""
 "  --use-distrib  - הגדרת urpmi בזמן ריצה לפי עץ ההפצה, שימושי\n"
 "                  להוסיף/להסיר מערכת chroot עם האופציה --root.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - נסה לחפש ולהשתמש בקובץ synthesis.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - נסה למצוא ולהשתמש בקובץ hdlist.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - verbose mode.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - verbose mode.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - בחירת כל החבילות עם ביטוי מתאים.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "רק מנהל מערכת מורשה להסיר חבילות תוכנה"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "חבילה לא מוכרת"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "חבילות לא מוכרות"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "חבילה לא מוכרת"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "The following packages contain %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "הסרת החבילה %s תגרום נזק למערכת"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "שום-דבר למחיקה"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "בדיקה להסרה של החבילות הבאות"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "בכדי לענות על התלויות, %d החבילות הבאות יימחקו (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (כן/*לא) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "מסיר חבילה %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (כן/*לא) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "ההסרה נכשלה"
 
@@ -651,232 +603,253 @@ msgstr ""
 "שימוש:\n"
 
 #: ../urpmf:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - הצגת הודעת עזרה זו.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - השתמש בסביבה מסויימת (בדרך כלל דיווח על בעיה).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - do not use the given media, separated by comma.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - שימוש ברשימת המקורות המופרדים ע\"י פסיק בלבד\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - מיון מדיה בהתאם לכותרות משנה המופרדים ע\"י פסיק.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - השתמש בקובץ synthesis המוגדר במקום בסיס הנתונים של "
 "urpmi.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - לא מדפיס שורות זהות.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       -שימוש במאגר העדכונים בלבד.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - verbose mode.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - ignore case distinctions in patterns.\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - ignore case distinctions in patterns.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - include perl code directly as perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - אופרטור AND בינארי.\n"
 
-#: ../urpmf:53
-#, fuzzy
+#: ../urpmf:54
+#, fuzzy, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -a             - אופרטור AND בינארי.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - שלילה של מרכיב.\n"
 
-#: ../urpmf:55
-#, fuzzy
+#: ../urpmf:56
+#, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - סוגר ימני כדי לסגור קבוצת ביטויים.\n"
 
-#: ../urpmf:56
-#, fuzzy
+#: ../urpmf:57
+#, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "רשימת מידע לשחזור:\n"
 "\n"
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - use X interface.\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    ברירת המחדל היא %s.\n"
 
-#: ../urpmf:59
-#, fuzzy
+#: ../urpmf:60
+#, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - print tag url: url.\n"
 
-#: ../urpmf:60
-#, fuzzy
+#: ../urpmf:61
+#, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - הדפס תגית buildhost: build host.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "החל את השינוי על קובץ התצורה"
 
-#: ../urpmf:63
-#, fuzzy
+#: ../urpmf:64
+#, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - print tag conflicts: all conflicts.\n"
 
-#: ../urpmf:64
-#, fuzzy
+#: ../urpmf:65
+#, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - הדפסת תיאור התג: תיאור.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - הדפסת תקופת התג: תקופה.\n"
 
-#: ../urpmf:67
-#, fuzzy
+#: ../urpmf:68
+#, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - הצגת שמות חבילות בלבד.\n"
 
-#: ../urpmf:68
-#, fuzzy
+#: ../urpmf:69
+#, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - הצגת רשימת הקבצים בחבילה.\n"
 
-#: ../urpmf:69
-#, fuzzy
+#: ../urpmf:70
+#, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - הדפסת קבוצת התג: קבוצה.\n"
 
-#: ../urpmf:70
-#, fuzzy
+#: ../urpmf:71
+#, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - הצגת שמות חבילות בלבד.\n"
 
-#: ../urpmf:71
-#, fuzzy
+#: ../urpmf:72
+#, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 
-#: ../urpmf:72
-#, fuzzy
+#: ../urpmf:73
+#, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - הדפסת אורז התג: אורז.\n"
 
-#: ../urpmf:73
-#, fuzzy
+#: ../urpmf:74
+#, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - print tag provides: all provides.\n"
 
-#: ../urpmf:74
-#, fuzzy
+#: ../urpmf:75
+#, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - הדפסת דרישות התג: כל הדרישות.\n"
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - הדפסת גודל התג: גודל.\n"
 
-#: ../urpmf:76
-#, fuzzy
+#: ../urpmf:77
+#, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - הדפסת תג חבילות קוד מקור: source rpm.\n"
 
-#: ../urpmf:77
-#, fuzzy
+#: ../urpmf:78
+#, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary, -S  - הצג מידע תמציתי.\n"
 
-#: ../urpmf:78
-#, fuzzy
+#: ../urpmf:79
+#, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - print tag url: url.\n"
 
-#: ../urpmf:79
-#, fuzzy
+#: ../urpmf:80
+#, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - verbose mode.\n"
 
-#: ../urpmf:80
-#, fuzzy
+#: ../urpmf:81
+#, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - הצגת רשימת הקבצים בחבילה.\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - הדפסת גרסה, שחרור וארכיון עם שם.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "שימוש בסביבה מסוימת על  %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -884,11 +857,12 @@ msgstr ""
 "Note: מאחר ואף אחד מהמקורות הזמינים לא משתמש ב-hdlists, urpmf לא הצליח למצוא "
 "אף תוצאה רלונטית\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "באפשרותך להשתמש ב --name לחפש אחר שמות חבילות.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -905,38 +879,59 @@ msgstr ""
 "\n"
 "שימוש:\n"
 
-#: ../urpmi:92
-#, fuzzy
+#: ../urpmi:88
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - השתמש רק במקור הנתון לחיפוש החבילות המבוקשות (או עדכון "
 "שלהן).\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - נטרל בדיקת חתימת MD5SUM של הקובץ.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - אלץ עדכון מפתח gpg.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 "  --no-uninstall - לעולם אל תבקש להסיר התקנה של חבילה, בטל את ההתקנה.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - אל תתקין חבילות (הורדה בלבד)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -944,7 +939,7 @@ msgstr ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -955,34 +950,38 @@ msgstr ""
 "                   are going to be installed or upgraded,\n"
 "                   default is %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - אורך טרנזקציה קצרה, ברירת המחדל היא %d.\n"
 
-#: ../urpmi:105
-#, fuzzy
+#: ../urpmi:104
+#, fuzzy, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - מפעיל חיפוש מקורב (זהה ל -y).\n"
 
-#: ../urpmi:106
-#, fuzzy
+#: ../urpmi:105
+#, fuzzy, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src          - החבילה הבאה היא חבילת מקור (אותו הדבר כמו -s).\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - install only source package (no binaries).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - remove rpm from cache before anything else.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - אל תמחק חבילות מהמטמון.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -990,7 +989,8 @@ msgstr ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -998,11 +998,13 @@ msgstr ""
 "  --allow-force  - מאפשר לתשאל את המשתמש אודות התקנת חבילות\n"
 "                   בלי בדיקת תלויות.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - השתמש בשורש מערכת קבצים אחר להתקנת חבילות.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -1010,40 +1012,48 @@ msgstr ""
 "  --use-distrib  - הגדר את urpmi בזמן ריצה מעץ חבילות ההפצה, שימושי\n"
 "                   להתקנת chroot עם האפשרות --root.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - use wget to retrieve distant files.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - use curl to retrieve distant files.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - use curl to retrieve distant files.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limit the download speed.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1051,7 +1061,8 @@ msgstr ""
 "  --resume       - המשך בהורדת קבצים שהורדו חלקית מנקודת ההפסקה\n"
 "                   (--no-resume מנטרל זאת, ברירת המחדל היא \"מנוטרל\").\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1059,7 +1070,8 @@ msgstr ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1068,6 +1080,7 @@ msgstr ""
 "                   authentication (format is <user:password>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1076,7 +1089,7 @@ msgstr ""
 "                   המשתנה הבא.\n"
 
 #: ../urpmi:138
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1085,49 +1098,45 @@ msgstr ""
 "                   (--no-verify-rpm מנטרל זאת, ברירת המחדל היא \"מאופשר\").\n"
 
 #: ../urpmi:140
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - וידוי שהתקנת החבילה יכולה להסתיים בהצלחה.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - exclude path separated by comma.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - למעט קבצי מסמכים.\n"
 
 #: ../urpmi:143
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --no-uninstall - לעולם אל תבקש להסיר התקנה של חבילה, בטל את ההתקנה.\n"
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --url          - print tag url: url.\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --description  - הדפסת תיאור התג: תיאור.\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - נטרל בדיקת חתימת MD5SUM של הקובץ.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - אלץ עדכון מפתח gpg.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - חבילות שיש לדלג על ההתקנה שלהן\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1135,52 +1144,59 @@ msgstr ""
 "  --more-choices - כאשר קיימות מספר חבילות מתאימות, הצע מגוון אפשרויות\n"
 "                   ולא רק את ברירת המחדל.\n"
 
-#: ../urpmi:152
-#, fuzzy
+#: ../urpmi:150
+#, fuzzy, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --noclean      - אל תמחק חבילות מהמטמון.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - עדכן רק חבילות בעלות אותה ארכיטקטורה.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - select all matches on command line.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - allow search in provides to find package.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - do not search in provides to find package.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - מצב שקט.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr " שמות או קובצי RPM שניתנו בשורת הפקודה יותקנו.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
-#, fuzzy
+#: ../urpmi:220
+#, fuzzy, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "מה יכול להיעשות עם קובצי RPM כשמשתמשים --install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1188,21 +1204,22 @@ msgid ""
 msgstr ""
 "הספרייה [%s] כבר קיימת, עליך לבחור ספרייה אחרת לדיווח על תקלה או למחוק אותה"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "יצירת הספרייה. [%s] עבור דיווחי תקלות נכשלה"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "ההעתקה נכשלה"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1211,114 +1228,142 @@ msgstr ""
 "שגיאה: נראה ו-%s עוגן לקריאה בלבד.\n"
 "עליך להשתמש ב --allow-force לאלץ פעולה זו."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (לשדרג)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (לשדרג)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (להתקין)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (להתקין)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "מה היא בחירתך? (1-%d)"
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"החבילות הבאות לא ניתנות להתקנה מאחר והן תלויות בחבילות\n"
+"מגרסאות קודמות מאלו המותקנות במחשבך:\n"
+"%s"
+msgstr[1] ""
 "החבילות הבאות לא ניתנות להתקנה מאחר והן תלויות בחבילות\n"
 "מגרסאות קודמות מאלו המותקנות במחשבך:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "האם להמשיך בכל זאת?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr "אישור/ביטול (*כ/ל) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"לא יכול להתקין כמה חבילות מבוקשות:\n"
+"%s"
+msgstr[1] ""
 "לא יכול להתקין כמה חבילות מבוקשות:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"ההתקנה לא יכולה להמשיך בגלל החבילות הבאות\n"
+"יש צורך להסיר אותן, בכדי לשדרג את האחרות:\n"
+"%s\n"
+msgstr[1] ""
 "ההתקנה לא יכולה להמשיך בגלל החבילות הבאות\n"
 "יש צורך להסיר אותן, בכדי לשדרג את האחרות:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"החבילות הבאות עומדות להימחק בכדי שניתן יהיה לשדרג חבילות אחרות: \n"
+"%s"
+msgstr[1] ""
 "החבילות הבאות עומדות להימחק בכדי שניתן יהיה לשדרג חבילות אחרות: \n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"בכדי לספק את התלויות, %d החבילות הבאות יותקנו:\n"
+"%s\n"
+msgstr[1] ""
 "בכדי לספק את התלויות, %d החבילות הבאות יותקנו:\n"
 "%s\n"
 
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "בכדי לספק את התלויות, החבילות הבאות יותקנו (%d MB)"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1327,91 +1372,106 @@ msgstr ""
 "יש צורך בהרשאות מנהל מערכת בכדי להתקין את התלויות הבאות: \n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "נא להקיש Enter"
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "לחבילות הבאות יש בעיה בחתימות"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "לחבילות הבאות יש בעיה בחתימות"
+msgstr[1] "לחבילות הבאות יש בעיה בחתימות"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "האם להמשיך בתהליך ההתקנה?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "מפיץ %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "מתקין את %s מתוך %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "מתקין %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "ההתקנה נכשלה"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "האם לנסות להתקין ללא בדיקת תלויות? (כן/*לא)"
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "האם לנסות להתקין תוך אילוץ תלויות (--force)? (כן/לא) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d עסקת התקנה נכשלה"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "Installation is possible"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "הכל כבר מותקן"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "הכל כבר מותקן"
+msgstr[1] "הכל כבר מותקן"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "הכל כבר מותקן"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "הכל כבר מותקן"
+msgstr[1] "הכל כבר מותקן"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "מפעיל מחדש את urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1435,41 +1495,50 @@ msgstr ""
 "and [options] are from\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - הגדרת מאגר עדכון.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - נסה לחפש ולהשתמש בקובץ synthesis.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - נסה למצוא ולהשתמש בקובץ hdlist.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - יצירה אוטומטית של כל המקורות מתקליטורי ההתקנה\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - list available media.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1478,7 +1547,8 @@ msgstr ""
 "  --from         - השתמש בכתובת מרשימת השרתים, ברירת המחדל הוא \n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1486,63 +1556,85 @@ msgstr ""
 "  --virtual      - יצירת מדיה וירטואלית שתמיד עדכנית,\n"
 "                   רק פרוטוקול file:// מורשה.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - נטרל בדיקת חתימת MD5SUM של הקובץ.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - אל תייבא את מפתח האימות של המקור שנוסף\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - הוסף את המקור לרשימה, אבל אל תעדכן את רשימת הקבצים.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - ניקוי ספריית מטמון כותרים.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - אלץ חילול קבצי hdlist.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - מצב שקט.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - verbose mode.\n"
+
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "עדכון המאגר \"%s\" נכשל\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "רק מנהל מערכת מורשה להוסיף מקור תוכנה"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "יוצר את קובץ ההגדרות [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "אין אפשרות ליצור את קובץ ההגדרות [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "no need to give <relative path of hdlist> with --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "חסר <relative path of hdlist>\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "`with' חסר עבור מדית רשת\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "הוספת המאגר \"%s\" נכשל\n"
@@ -1565,150 +1657,153 @@ msgstr ""
 "שימוש:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - אל תמחק חבילות מהמטמון.\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-url     - הצגת מאגרי עדכון זמינים ואת כתובתם.\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-url     - הצגת מאגרי עדכון זמינים ואת כתובתם.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --name         - הצגת שמות חבילות בלבד.\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "החבילה %s לא נמצאה."
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "מאחזר קובץ RPM [%s]..."
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "לא נמצאה רשימת קבצים\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - select all media.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - זיהוי מקורב של שמות מקורות.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"unknown options '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "רק מנהל מערכת מורשה להסיר מקור תוכנה"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "אין מה להסיר (יש להשתמש ב urpmi.addmedia לצורך הוספת מאגר)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1718,6 +1813,7 @@ msgstr ""
 "(אחד מ %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1726,30 +1822,46 @@ msgstr ""
 "כאשר <name> הינו שם המדיה המיודעת לעדכון.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - update only update media.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - אלץ עדכון מפתח gpg.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - אל תעדכן, סמן מקור זה כלא-פעיל.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - אל תעדכן, סמן מקור זה כמאופשר.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - בחירת כל המדיות שאינן ניתנות להסרה.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - אלץ חילול קבצי hdlist.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "רק מנהל מערכת מורשה לעדכן מקור תוכנה"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "אין מה לעדכן (יש להשתמש ב urpmi.addmedia לצורך הוספת מאגר)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1758,21 +1870,21 @@ msgstr ""
 "לא חסרה שום כניסה המיועדת לעדכון\n"
 "(אחד מ %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "מאפשר את המקור %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "מתעלם ממקור \"%s\""
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "מאפשר את המקור %s"
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1790,6 +1902,7 @@ msgstr ""
 "שימוש:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1798,49 +1911,59 @@ msgstr ""
 "שלהן).\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - מפעיל חיפוש מקורב (זהה ל -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - list available packages.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - list available media.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - הצגת מאגרי עדכון זמינים ואת כתובתם.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - list available nodes when using --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - list available parallel aliases.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - ייצא את ההגדרות במבנה של משתני urpmi.addmedia.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - החבילה הבאה היא חבילת מקור (אותו הדבר כמו -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      -נותן כל חבילות המקור לפני הורדה (רק מנהל מערכת).\n"
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --url          - print tag url: url.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1848,97 +1971,166 @@ msgstr ""
 "  --use-distrib  - הגדר את urpmi בזמן ריצה מעץ חבילות ההפצה.\n"
 "                   דבר זה מאפשר להפעיל שאילתות על הפצה.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - הדפס דו\"ח שינויים.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - הצג מידע תמציתי.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -a             - בחירת כל החבילות עם ביטוי מתאים.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - הרחב את השאילתה לתלויות החבילות.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - הצג גם קבוצות עם שם זה.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - הדפס מידע שימושי באופן המובן לבני-אנוש.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - הצגת רשימת הקבצים בחבילה.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - do not search in provides to find package (default).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - search in provides to find package.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - print version and release with name also.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 "  -R             - בצע חיפוש הפוך אחר חבילות הדורשות את החבילה המוגדרת.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -RR            - חיפוש הפוך מורחב (כולל חבילות וירטואליות).\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - החבילה הבאה היא חבילת מקור (אותו הדבר כמו --src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - הסרת חבילה אם גרסה מאוחרת יותר כבר מותקנת.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - impose fuzzy search (same as --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - כמו -y, אבל מאלץ בדיקה תלויית רישיות.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  שמות או קובצי RPM שניתנו בשורת הפקודה נמצאים בסימן שאלה.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes ניתן לשימוש רק ביחד עם --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "מדלג על המקור %s: לא קיים קובץ hdlist"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "לא נמצאה רשימת קבצים\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "לא נמצאה רשימת שינויים\n"
 
+#, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "ההתקנה נכשלה"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "מתקין חבילה `%s' (%s/%s)..."
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "בודק את קובץ הsynthesis [%s]"
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "מפיץ %s"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "התקנת חבילה..."
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "מתקין את %s מתוך %s"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "התקנת חבילה..."
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "בכדי לספק את התלויות, החבילות הבאות יותקנו (%d MB)"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - נסה לחפש ולהשתמש בקובץ synthesis.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - נסה למצוא ולהשתמש בקובץ hdlist.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "`with' חסר עבור מדית רשת\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "פרוטוקול לא מזוהה הוגדר עבור %s"
 
diff --git a/po/hi.po b/po/hi.po
index 05ec577c..7e1c19d4 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2005-08-23 20:11+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
 "Language-Team: Hindi, India\n"
@@ -17,7 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "आरपीएम संसाधन"
 
@@ -26,7 +27,8 @@ msgstr "आरपीएम संसाधन"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "ठीक (_O)"
 
@@ -81,20 +83,23 @@ msgstr ""
 "\n"
 "आप हो सकता है कि इसे सिर्फ़ सुरक्षित करना चाहते है । आपकी पसन्द क्या है?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "संसाधन (_I)"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "सुरक्षित (_S)"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "खत्म करें (_C)"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "संचिका को सुरक्षित करने के स्थान का चयन करें"
 
@@ -106,19 +111,21 @@ msgstr ""
 "अज्ञात विकल्प '%s'\n"
 
 #: ../gurpmi.pm:89
-#, fuzzy
+#, fuzzy, c-format
 msgid "No packages specified"
 msgstr "%s नाम का कोई पैकेज नहीं है"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "कृपया प्रतीक्षा करें..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "रूट होना चाहिए"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -128,35 +135,42 @@ msgstr ""
 "निवेदित किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
 "%sजारी रहा जाएँ?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "ओ०के०"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "चेतावनी"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "ओ०के०"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr "(अपग्रेड के लिए)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr "(संसाधन के लिए)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "पैकेज चयन"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "निम्नलिखित पैकेजों में से एक की आवश्यकता है:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "निष्फ़ल (_A)"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -166,7 +180,7 @@ msgstr ""
 "अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
 "%sजारी रहा जाएँ?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -176,25 +190,27 @@ msgstr ""
 "अधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित %d पैकेजों का संसाधन होने जा रहा है:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "पैकेज संसाधित हो रहा है..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "स्रोत्र पैकेजों को पाने में असमर्थ, कार्यक्रम विफ़ल किया जा रहा है"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "कृपया \"%s\" नामक माध्यम को [%s] साधन पर प्रवेश करें"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' पैकेज को डॉउनलोड किया जा रहा है..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -207,8 +223,7 @@ msgstr ""
 "\n"
 "क्या आप संसाधन जारी रखना चाहते है?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -219,35 +234,38 @@ msgstr ""
 "%s\n"
 "आपको अपना यू०आर०पी०एम०आई० डाटाबेस को अपडेट करना चाहिए"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "%s को हटाया जा रहा है"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "तैयारी की जा रही है..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "संसाधन असफ़ल"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "किया गया(_D)"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "सभी कुछ पहिले से ही संसाधित है"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "संसाधन समाप्त"
 
@@ -261,19 +279,22 @@ msgstr ""
 "जहाँ सभी [विकल्प] से है\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - यह सहायता संदेश मुद्रित करें\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "  --root <path>    - निर्दिष्ट रूट के बजाय उपयोग करें /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [group]     - परिणामों को दिये हुए समूह तक सीमित करना\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - समूहों को नाम के साथ मुद्रित करें\n"
 
@@ -282,210 +303,126 @@ msgstr "  -g             - समूहों को नाम के साथ
 msgid "                    defaults to %s.\n"
 msgstr "                    %s डिफ़ाल्ट है ।\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "सिर्फ़ महाउपयोगकर्ता को ही पैकेजों को संसाधित करने की अनुमति है"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "यूआरपीएमआई सीमित विधा में चल रही है..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "आर०पी०एम०डी०बी० को खोलने में असमर्थ"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "अवैध आर०पी०एम० संचिका नाम [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "आर०पी०एम० संचिका [%s] को पुनः प्राप्त किया जा रहा है..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...पुनः प्राप्त करने की क्रिया संपन्न"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "आर०पी०एम० संचिका [%s] को पाने में असमर्थ"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "\"%s\" का पदभंजन [%s] संचिका में करने में असमर्थ"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "आर०पी०एम० संचिका का पंजीकरण में असमर्थ"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "स्थानीय पैकेजों का पंजीकरण करने में त्रुटि"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "सीमित विधा में चलते समय, इस संक्रिया को मनाही है"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "निर्देश वाक्य पर निकृष्ट प्रोक्सी की घोषणा\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "इस निर्देश को उपयोग करने के लिए आपको महा-उपयोगकर्ता होना चाहिए !\n"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: आर०पी०एम० संचिका \"%s\" को नहीं पढ़ सकता है\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "Nn"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "Yy"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "क्षमा करें, खराब पसन्द, पुनः प्रयास करें\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
+#: ../urpm/args.pm:426
 #, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
+msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
+#: ../urpm/args.pm:440
 #, c-format
-msgid "on node %s"
-msgstr ""
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "संसाधन असफ़ल"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "संसाधन संभव है"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "कृत्रिम संचिका [%s] का निरीक्षण किया जा रहा है"
-
-#: ../urpm/parallel_ssh.pm:183
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "Nn"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "%s वितिरण किया जा रहा है"
+msgid "Yy"
+msgstr "Yy"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "पैकेज संसाधित हो रहा है..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "%s को %s से संसाधित किया जा रहा है"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "पैकेज संसाधित हो रहा है..."
+msgid "Sorry, bad choice, try again\n"
+msgstr "क्षमा करें, खराब पसन्द, पुनः प्रयास करें\n"
 
 #: ../urpme:39
 #, fuzzy, c-format
@@ -504,47 +441,59 @@ msgstr ""
 "\n"
 "उपयोग विधि:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - यह सहायता संदेश मुद्रित करें\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - इच्छित पैकेजों में से एक पैकेज स्वतः चयन\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - जाँच करें कि सही-सही तरीके से हटाया जा सकता है\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - यद्यपि कुछ पैकेज ना विद्यमान हो, तो भी इनवोकेशन को बल-पूर्वक लागू "
 "करें \n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel     - वितरित यू०आर०पी०एम०आई०, उपनाम वाली प्रणालीयों के बीच में\n"
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --packager     - टैग पैकेजर को मुद्रित करना: पैकेजर\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - आरपीएम को हटाने के अन्य रूट का उपयोग\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - आरपीएम संसाधन के लिए अन्य रूट का उपयोग\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description  - टैग विवरण मुद्रित करें: विवरण\n"
 
-#: ../urpme:52
-#, fuzzy
+#: ../urpme:53
+#, fuzzy, 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"
@@ -553,76 +502,79 @@ msgstr ""
 "                   एक सीएचरूट को --root विकल्प के साथ संसाधित (असंसाधित) करने में "
 "उपयोगी।\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - कृत्रिम संचिका को खोजने और उपयोग करने के प्रयास\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - हार्डडिस्क सूची संचिका को खोजना और उपयोग करना\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - शब्दों का वॄथा प्रयोगिक विधि\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - शब्दों का वॄथा प्रयोगिक विधि\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - मिलती हुई अभिव्यक्तियों वाले सभी पैकेजों का चयन करें\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "सिर्फ़ रूट यूज़र को ही पैकेजों को हटाने की अनुमति है"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "अज्ञात पैकेज"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "पैकेजों का प्रकार अज्ञात"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "अज्ञात पैकेज"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "निम्नलिखित पैकेज %s को समाहित करते है:  %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s पैकेज को हटाने से आपकी प्रणाली नष्ट हो जायेगी"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "हटाने को कुछ भी नहीं"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "निम्नलिखित पैकेजों को हटाने जाने के लिए जाँच हो रही है"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों %d को हटाया जायेगा (%d एमबी)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr "(हाँ/ना:y/N)"
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "%s पैकेज को हटाया जा रहा है"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr "(हाँ/ना:y/N)"
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "हटाना असफ़ल"
 
@@ -644,236 +596,258 @@ msgstr ""
 "उपयोग विधि:\n"
 
 #: ../urpmf:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - यह सहायता संदेश मुद्रित करें\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - विशिष्ट वातावरण का उपयोग (आदर्श रूप में एक दोष रिपोर्ट)\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - दिये हुए मीडीया का उपयोग ना करें, छोटे विराम चिह्न के द्वारा अलग "
 "किये हुए\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - सिर्फ़ दिए गए माध्यम का उपयोग करें, छोटे विराम चिह्न के द्वारा अलग "
 "किये हुए\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - मीडीया को कॉमा के द्वारा अलग की हुई सहायक-कड़ियों के अनुसार क्रम "
 "में लगाना\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - यू०आर०पी०एन०आई० डी०बी० के बजाय, दी हुई कृत्रिमता का उपयोग करें\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - एक जैसे वाक्यों को मुद्रित ना करें\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - सिर्फ़ अपडेट माध्यम का ही उपयोग करें\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - शब्दों का वॄथा प्रयोगिक विधि\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - सभी प्रतिरूपों में छोटे-बड़े शब्दों का ध्यान ना रखें\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - सभी प्रतिरूपों में छोटे-बड़े शब्दों का ध्यान ना रखें\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - पर्ल कोड को perl -e जैसे सीधे सम्मलित\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - द्विआधारी \"और\" प्रवर्तक (ऑपरेटर).\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - द्विआधारी \"या\" प्रवर्तक (ऑपरेटर).\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - एकल \"नहीं\".\n"
 
-#: ../urpmf:55
-#, fuzzy
+#: ../urpmf:56
+#, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - दाहिना कोष्टक का चिह्न समूह अभिव्यक्ति का बंद करने के लिए\n"
 
-#: ../urpmf:56
-#, fuzzy
+#: ../urpmf:57
+#, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "डाटा की सूची जिसे पुनःस्थापित करना है:\n"
 "\n"
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - एक्स (X) इन्टरफ़ेस का उपयोग करें\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    %s डिफ़ाल्ट है ।\n"
 
-#: ../urpmf:59
-#, fuzzy
+#: ../urpmf:60
+#, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
 
-#: ../urpmf:60
-#, fuzzy
+#: ../urpmf:61
+#, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - टैग होस्ट निर्माणकर्ता को मुद्रित करना: होस्ट निर्माणकर्ता\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "संरचना फ़ाइल में परिवर्तनों को लागू करें"
 
-#: ../urpmf:63
-#, fuzzy
+#: ../urpmf:64
+#, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - टैग के विरोधाभासों को मुद्रित करें: सभी विरोधाभास\n"
 
-#: ../urpmf:64
-#, fuzzy
+#: ../urpmf:65
+#, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - टैग विवरण मुद्रित करें: विवरण\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - टैग इपॉच्च को मुद्रित करें: इपॉच्च\n"
 
-#: ../urpmf:67
-#, fuzzy
+#: ../urpmf:68
+#, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - सिर्फ़ पैकेजों के नामों को मुद्रित करें\n"
 
-#: ../urpmf:68
-#, fuzzy
+#: ../urpmf:69
+#, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - पैकेज में स्थित संचिकाओं की सूची।\n"
 
-#: ../urpmf:69
-#, fuzzy
+#: ../urpmf:70
+#, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - टैग समूह को मुद्रित करें: समूह\n"
 
-#: ../urpmf:70
-#, fuzzy
+#: ../urpmf:71
+#, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - सिर्फ़ पैकेजों के नामों को मुद्रित करें\n"
 
-#: ../urpmf:71
-#, fuzzy
+#: ../urpmf:72
+#, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
 
-#: ../urpmf:72
-#, fuzzy
+#: ../urpmf:73
+#, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - टैग पैकेजर को मुद्रित करना: पैकेजर\n"
 
-#: ../urpmf:73
-#, fuzzy
+#: ../urpmf:74
+#, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     -  टैग की उपलब्धियां मुद्रित करें: सभी उपलब्धियां\n"
 
-#: ../urpmf:74
-#, fuzzy
+#: ../urpmf:75
+#, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - टैग की आवश्यकताऐं मुद्रित करें: सभी आवश्यकताऐं (बहु-वाक्य)\n"
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - टैग आकार को मुद्रित करें: आकार\n"
 
-#: ../urpmf:76
-#, fuzzy
+#: ../urpmf:77
+#, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - टैग स्रोत्र आर०पी०एम० को मुद्रित करें: स्रोत्र आर०पी०एम०\n"
 
-#: ../urpmf:77
-#, fuzzy
+#: ../urpmf:78
+#, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary, -S    - सारांश को मुद्रित करना।\n"
 
-#: ../urpmf:78
-#, fuzzy
+#: ../urpmf:79
+#, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
 
-#: ../urpmf:79
-#, fuzzy
+#: ../urpmf:80
+#, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - शब्दों का वॄथा प्रयोगिक विधि\n"
 
-#: ../urpmf:80
-#, fuzzy
+#: ../urpmf:81
+#, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - पैकेज में स्थित संचिकाओं की सूची।\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - \tमुद्रित संस्मरण, विमोचन और आर्च नाम के साथ\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s पर विशिष्ट वातावरण का उपयोग करते हुए\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -881,11 +855,12 @@ msgstr ""
 "सूचना: क्योंकि खोज किये गये माध्यम ने एचडीसूचियों का उपयोग किया, अतैव यूआरपीएमएफ़ किसी "
 "परिणाम को बताने में असमर्थ रहा था\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "पैकेज के नामों की खोज हेतु आप --name का उपयोग करना चाहेगें।\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -902,37 +877,57 @@ msgstr ""
 "\n"
 "उपयोग विधि:\n"
 
-#: ../urpmi:92
-#, fuzzy
+#: ../urpmi:88
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia    - निवेदित (या अपडेट किये हुए) पैकेजों की खोज के लिए,  सिर्फ़ दिए गए "
 "माध्यम का उपयोग करें ।\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - प्रणाली को उन्नयन बनाने के लिए, स्वतः पैकेजों का चयन करें\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr "  --auto-select  - प्रणाली को उन्नयन बनाने के लिए, स्वतः पैकेजों का चयन करें\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - एम०डी०-५ सम संचिका की जाँच निष्क्रिय ।\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - जीपीजी कुँजी का बलपूर्वक उन्नयन ।\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 "  --no-uninstall - एक पैकेज को असंसाधित करने के लिए कभी ना पूछेना,संसाधन को रोकना\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - पैकेजों को संसाधित ना करना (सिर्फ़ डॉउनलोड करना)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -941,7 +936,7 @@ msgstr ""
 "अस्वीकार करें,\n"
 "                   जिनके कारण से हटाना पड़ रहा है।\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -952,34 +947,38 @@ msgstr ""
 "को संसाधित या उन्नयत किया जाना है,\n"
 "                   सामान्य संख्या %d है।\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - लघु क्रिया-कलाप लंबाई, सामान्य संख्या %d है।\n"
 
-#: ../urpmi:105
-#, fuzzy
+#: ../urpmi:104
+#, fuzzy, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - अस्पष्ट खोज को लागू करें (-y जैसा)\n"
 
-#: ../urpmi:106
-#, fuzzy
+#: ../urpmi:105
+#, fuzzy, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src          - अगला पैकेज एक स्रोत्र पैकेज है (-s जैसा)\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - सिर्फ़ स्रोत्र पैकेज को संसाधित करें (कोई बॉयनरी नहीं)\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - कुछ भी करने कि पहिले आर०पी०एम० को कैश से हटाना\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - कैश में से आरपीएमों की सफ़ाई ना करना\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -987,7 +986,8 @@ msgstr ""
 "  --allow-nodeps - उपयोगकर्ता को, पैकेजों को बिना अधिनताओं की जाँच करें,\n"
 "                   संसाधित करने के लिए प्रश्न पूछने की अनुमति प्रदान करें\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -995,11 +995,13 @@ msgstr ""
 "  --allow-force  - उपयोगकर्ता को, पैकेजों को बिना अधिनताओं और अखंडता की जाँच करें,\n"
 "                   संसाधित करने के लिए प्रश्न पूछने की अनुमति प्रदान करें\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - आरपीएम संसाधन के लिए अन्य रूट का उपयोग\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -1008,41 +1010,49 @@ msgstr ""
 "                   एक सीएचरूट को --root विकल्प के साथ संसाधित (असंसाधित) करने में "
 "उपयोगी।\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - डबलू०गेट का उपयोग दूर स्थित संचिकाओं को प्राप्त करने के लिए करें\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - कर्ल का उपयोग दूर स्थित संचिकाओं को प्राप्त करने के लिए करें\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - कर्ल का उपयोग दूर स्थित संचिकाओं को प्राप्त करने के लिए करें\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - डॉउनलोड के वेग को सीमित करें\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1050,7 +1060,8 @@ msgstr ""
 "  --resume   - अधूरी-डॉउनलोड-की-हुई संचिकाओं के स्थानान्तरण का पुनः आरम्भ\n"
 "                   (--no-resume इसे असक्रिय करता है, डिफ़ॉल्ट असक्रिय है)।\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1059,7 +1070,8 @@ msgstr ""
 "डिफ़ॉल्ट कल्पना १०८० के रूप में\n"
 "                   कर ली गई है (निर्देश देने का तरीका <प्रोक्सी होस्ट[:पोर्ट]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1068,6 +1080,7 @@ msgstr ""
 "                    (निर्देश देने का तरीका <उपयोगकर्ता:कूटशब्द>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1076,7 +1089,7 @@ msgstr ""
 "                   निर्गम करें\n"
 
 #: ../urpmi:138
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1085,49 +1098,45 @@ msgstr ""
 "                   (--no-verify-rpm इसे अयोग्य करता है, डिफ़ॉल्ट जाँच के साथ है).\n"
 
 #: ../urpmi:140
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - जाँच करें कि संसाधन सफ़लता-पूर्वक किया जा सकता है\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - पथ को अलग करें, छोटे विराम चिह्न के द्वारा अलग किये हुए\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - प्रलेखन संचिकाओं को अलग करके।\n"
 
 #: ../urpmi:143
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --no-uninstall - एक पैकेज को असंसाधित करने के लिए कभी ना पूछेना,संसाधन को रोकना\n"
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --url          - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --description  - टैग विवरण मुद्रित करें: विवरण\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - एम०डी०-५ सम संचिका की जाँच निष्क्रिय ।\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - जीपीजी कुँजी का बलपूर्वक उन्नयन ।\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - पैकेजों जिनका संसाधन छोड़ा जाना चाहिए\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1135,55 +1144,62 @@ msgstr ""
 "  --more-choices - जब अनेको पैकेज मिल जाते है, तब डिफ़ाल्ट के स्थान पर अनेको "
 "विकल्प                            चयन हेतु प्रस्तावित होते है ।\n"
 
-#: ../urpmi:152
-#, fuzzy
+#: ../urpmi:150
+#, fuzzy, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --noclean      - कैश में से आरपीएमों की सफ़ाई ना करना\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - समान संरचना वाले पैकेजों को ही अपग्रेड करें।\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - निर्देश वाक्य पर सभी मिलानों को चयन करें\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - पूर्वनिर्दिष्टों में पैकेज को पाने के लिए खोज की अनुमति प्रदान करें\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - पूर्वनिर्दिष्टों में पैकेज को पाने के लिए ना खोजे\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - शांत विधि\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "निर्देश वाक्य पर दिये हुए नाम या आर०पी०एम० संचिकाऐं संसाधित की जायेगी\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
-#, fuzzy
+#: ../urpmi:220
+#, fuzzy, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 "द्विआधारी आर०पी०एम० संचिकाओं के साथ क्या किया जा सकता है, जब  --install-src निर्देश "
 "का उपयोग किया जा रहा हो"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1192,21 +1208,22 @@ msgstr ""
 "[%s] निर्देशिका पहिले से विद्यमान है, कृपया दोष रिपोर्ट के लिए अन्य निर्देशिका का उपयोग "
 "करेंया इसे हटा दें ।"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "दोष रिपोर्ट के लिए, [%s] निर्देशिका का निर्माण करने में असमर्थ"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "प्रतिलिपि बनना असफ़ल"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1215,115 +1232,142 @@ msgstr ""
 "त्रुटि: सम्भवता %s को सिर्फ़-पढ़ने-के लिए माउन्ट किया गया लगता है ।\n"
 "इस प्रक्रिया को बल-पूर्वक करने के लिए --allow-force विकल्प का उपयोग करें ।"
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "(अपग्रेड के लिए)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "(अपग्रेड के लिए)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "(संसाधन के लिए)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "(संसाधन के लिए)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "आपकी क्या इच्छा है?  (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"निम्मलिखित पैकेजो को संसाधित नहीं किया जा सका क्योंकि ये उन पैकेजो पर आश्रित है जो कि\n"
+"संसाधित किये जा चुके पैकेजो से पहिले के है:\n"
+"%s"
+msgstr[1] ""
 "निम्मलिखित पैकेजो को संसाधित नहीं किया जा सका क्योंकि ये उन पैकेजो पर आश्रित है जो कि\n"
 "संसाधित किये जा चुके पैकेजो से पहिले के है:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "कुछ भी हो जारी रहा जायें?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr "(हाँ/ना:Y/n)"
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"निवेदन किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
+"%s"
+msgstr[1] ""
 "निवेदन किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"संसाधन जारी नहीं रक्खा जा सकता है क्योंकि अन्य पैकेजों को उन्न्त बनाने के लिए\n"
+"निम्नलिखित पैकेजों को हटाना पड़ेगा:\n"
+"%s\n"
+msgstr[1] ""
 "संसाधन जारी नहीं रक्खा जा सकता है क्योंकि अन्य पैकेजों को उन्न्त बनाने के लिए\n"
 "निम्नलिखित पैकेजों को हटाना पड़ेगा:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
+"%s"
+msgstr[1] ""
 "अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"अधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित %d पैकेजों का संसाधन होने जा रहा है:\n"
+"%s\n"
+msgstr[1] ""
 "अधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित %d पैकेजों का संसाधन होने जा रहा है:\n"
 "%s\n"
 
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr ""
-"आधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेज का संसाधन होने जा रहा है(%d एमबी)"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1332,91 +1376,106 @@ msgstr ""
 "निम्नलिखित आधिनताओं को संसाधित करने लिए, आपको महाउपयोगकर्ता होना चाहिए:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "तैयार होने पर इन्टर (Enter) कुंजी को दबायें..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "निरस्त"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
+msgstr[1] "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "क्या आप संसाधन जारी रखना चाहते है ?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "%s वितिरण किया जा रहा है"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s को %s से संसाधित किया जा रहा है"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "%s का संसाधन किया जा रहा है"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "संसाधन असफ़ल"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "संसाधन का प्रयास बिना आधिनताओं की जाँच किये हुए किया जाये?  (हाँ/ना)(y/N) "
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "संसाधन का प्रयास और जोर से (बलपूर्वक) किया जाये (--force)?  (हाँ/ना)(y/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d संसाधन क्रिया-कलाप असफ़ल"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "संसाधन संभव है"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "सभी कुछ पहिले से ही संसाधित है"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "सभी कुछ पहिले से ही संसाधित है"
+msgstr[1] "सभी कुछ पहिले से ही संसाधित है"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "सभी कुछ पहिले से ही संसाधित है"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "सभी कुछ पहिले से ही संसाधित है"
+msgstr[1] "सभी कुछ पहिले से ही संसाधित है"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "यू०आर०पी०एम०आई० को पुनः आरम्भ किया जा रहा है"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1440,26 +1499,34 @@ msgstr ""
 "और [विकल्प] से है\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - एक अपडेट माध्यम का निर्माण करें\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - कृत्रिम संचिका को खोजने और उपयोग करने के प्रयास\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - हार्डडिस्क सूची संचिका को खोजना और उपयोग करना\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - किसी कृत्रिम या हार्डडिस्क सूची संचिका को खोजने का \n"
 "                   प्रयास ना करें\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1467,16 +1534,17 @@ msgstr ""
 "  --distrib      - एक संसाधन माध्यम से सभी मीडीया का स्वतः \n"
 "                   निर्माण करें\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - उपलब्ध माध्यमों को दिखायें\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1486,7 +1554,8 @@ msgstr ""
 "करें, डिफ़ॉल्ट\n"
 "                   %s है\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1494,62 +1563,84 @@ msgstr ""
 "  --virtual      - काल्पनिक माध्यम का निर्माण करना जो हमेशा अप-टु-डेट रहें,\n"
 "                   सिर्फ़  file:// प्रोटोकॉल की अनूमति है।\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - एम०डी०-५ सम संचिका की जाँच निष्क्रिय ।\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - जोड़े गये माध्यम की सामान्यजन कुँजी को इम्पोर्ट ना करना\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - संरचना में माध्यम को जोड़ना, परन्तु इसे अपडेट ना करना । \n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - शीर्ष कैश निर्देशिका को स्वच्छ करें\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - हार्डडिस्क सूची संचिकाओं का बल-पूर्वक निर्माण\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - शांत विधि\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - शब्दों का वॄथा प्रयोगिक विधि\n"
+
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "\"%s\" माध्यम को अपडेट करने में असमर्थ\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "सिर्फ़ महाउपयोगकर्ता को ही माध्यम को जोड़ने की अनुमति है"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "संरचना-संचिका [%s] का निर्माण करेगा"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "संरचना-संचिका [%s] को निर्माण नहीं कर सकता है"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "<हार्डडिस्क सूची का सापेक्ष पथ>  --distrib के साथ देने की कोई आवश्यकता नहीं है"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<हार्डडिस्क सूची का सापेक्ष पथ> लुप्त है\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "नेटवर्क माध्यम `के साथ' विलुप्त\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "\"%s\" माध्यम का निर्माण करने में असमर्थ\n"
@@ -1572,151 +1663,154 @@ msgstr ""
 "उपयोग विधि:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - कैश में से आरपीएमों की सफ़ाई ना करना\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-url   - उपलब्ध माध्यमों और उनके यूआरएल को दिखायें\n"
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-url   - उपलब्ध माध्यमों और उनके यूआरएल को दिखायें\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --name         - सिर्फ़ पैकेजों के नामों को मुद्रित करें\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "%s पैकेज नहीं मिला"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "आर०पी०एम० संचिका [%s] को पुनः प्राप्त किया जा रहा है..."
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "कोई संचिकासूची नहीं मिली\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "उपयोग विधि: urpmi.removemedia [-a] <नाम> ...\n"
 "जहाँ <नाम> एक माध्यम का नाम है जिसे हटाना है\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - सभी माध्यमों का चयन करें\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - माध्यम नामों में अस्पष्ट मेल\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"अज्ञात विकल्प '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "सिर्फ़ महाउपयोगकर्ता को ही माध्यम को हटाने की अनुमति है"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "हटाने को कुछ भी नहीं (urpmi.addmedia निर्देश का उपयोग एक माध्यम को जोड़ने के लिए करें)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1726,6 +1820,7 @@ msgstr ""
 "(%s में से एक)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1734,33 +1829,49 @@ msgstr ""
 "जहाँ <नाम> एक माध्यम का नाम है जिसे अपडेट करना है\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - सिर्फ़ अपडेट माध्यम को अपडेट करें\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - जीपीजी कुँजी का बलपूर्वक उन्नयन ।\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr ""
 "  --ignore       - अपडेट ना करना, माध्यम को भुला-दिया जैसा चिह्नन्ति करना ।\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - अपडेट ना करना, माध्यम को सक्रिय जैसा चिह्नन्ति करना ।\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - सभी स्थिर माध्यमों का चयन करें\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - हार्डडिस्क सूची संचिकाओं का बल-पूर्वक निर्माण\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "सिर्फ़ महाउपयोगकर्ता को ही माध्यम को अपडेट करने की अनुमति है"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "अपडेट करने को कुछ भी नहीं (urpmi.addmedia निर्देश का उपयोग एक माध्यम को जोड़ने के लिए "
 "करें)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1769,21 +1880,21 @@ msgstr ""
 "अपडेट की जाने वाली प्रविष्टि लुप्त है\n"
 "(%s में से एक)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "\"%s\" माध्यम को सक्रिय किया जा रहा है"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "\"%s\" माध्यम की ओर ध्यान नहीं दिया जा रहा है"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "\"%s\" माध्यम को सक्रिय किया जा रहा है"
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1802,6 +1913,7 @@ msgstr ""
 "उपयोग विधि:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1810,32 +1922,39 @@ msgstr ""
 "माध्यम का उपयोग करें ।\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - अस्पष्ट खोज को लागू करें (-y जैसा)\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - उपलब्ध पैकेजों को दिखायें\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - उपलब्ध माध्यमों को दिखायें\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   - उपलब्ध माध्यमों और उनके यूआरएल को दिखायें\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - उपलब्ध नोडस को दिखायें, जब --parallel विकल्प का उपयोग किया जा "
 "रहा हो\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - उपलब्ध समान्तर नामों को दिखायें\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
@@ -1843,21 +1962,24 @@ msgstr ""
 "प्रारुप में संरचना को डम्प करना।\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - अगला पैकेज एक स्रोत्र पैकेज है (-s जैसा)\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - सभी स्रोत्र पैकेजों को डॉउनलोड के पहिले दें (सिर्फ़ महाउपयोगकर्ता)\n"
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --url          - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1865,98 +1987,168 @@ msgstr ""
 "  --use-distrib  - एक वितरित वृक्ष के लिए यूआरपीएमआई की देखते-देखते संरचना।\n"
 "                   यह एक वितरण की पूछ-ताछ करने की अनुमति देता है।\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  -changelog      - परिवर्तन लॉग का मुद्रण\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S    - सारांश को मुद्रित करना।\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - सम्पूर्ण आउटपुट को पैकेज के साथ हटायें\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - जाँच को पैकेज की अधिनताओं तक ले जायें\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - समूहों को नाम के साथ मुद्रित करें\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - उपयोगी सूचनाओं का पठनीय रूप में मुद्रण\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - पैकेज में स्थित संचिकाओं की सूची।\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - पूर्वनिर्दिष्टों में पैकेज को पाने के लिए ना खोजे (डिफ़ाल्ट)।\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - पूर्वनिर्दिष्टों में पैकेज पाने के लिए खोज ।\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - संस्मरण और विमोचन संख्या को नाम के साथ मुद्रित करें\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - पैकेजों की जो आवश्यक है उससे विपरीत खोज करें\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR            - विपरीत खोज को विस्तृत करना (काल्पनिक पैकेजों को शामिल करके)।\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - अगला पैकेज एक स्रोत्र पैकेज है (--src जैसा)\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "-u             - पैकेज को हटायें यदि एक अत्यधिक नवीन संस्मरण पहिले सेसंसाधित है\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - अस्पष्ट खोज को लागू करें (--fuzzy जैसा)\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - -y जैसा, परन्तु बिना छोटे-बड़े शब्दों के आधार पर मिलान करने को "
 "बांधित करता है\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  निर्देश वाक्य पर दिये हुए नामों या आर०पी०एम० संचिकाओं की जाँच की गई है\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes को सिर्फ़ --parallel के साथ उपयोग किया जा सकता है"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "%s माध्यम को छोड़ा जा रहा है: कोई एचडीसूची नहीं"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "कोई संचिकासूची नहीं मिली\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "कोई परिवर्तनलॉग नहीं मिला\n"
 
+#, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "संसाधन असफ़ल"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "कृत्रिम संचिका [%s] का निरीक्षण किया जा रहा है"
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "%s वितिरण किया जा रहा है"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "पैकेज संसाधित हो रहा है..."
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "%s को %s से संसाधित किया जा रहा है"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "पैकेज संसाधित हो रहा है..."
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "आधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेज का संसाधन होने जा रहा है(%d एमबी)"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - कृत्रिम संचिका को खोजने और उपयोग करने के प्रयास\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - हार्डडिस्क सूची संचिका को खोजना और उपयोग करना\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "नेटवर्क माध्यम `के साथ' विलुप्त\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "अज्ञात विकल्प '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "अज्ञात प्रोटोकॉल %s के लिए परिभाषित"
 
diff --git a/po/hr.po b/po/hr.po
index 6335f623..43f3b001 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2005-01-04 21:27+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
 "X-Generator: TransDict server\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
-#, fuzzy
+#: ../gurpmi:30 ../gurpmi2:63
+#, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Pripremam instalaciju"
 
@@ -26,7 +26,8 @@ msgstr "Pripremam instalaciju"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_U redu"
 
@@ -65,21 +66,23 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "Instaliraj"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Spremi"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Odustani"
 
 #: ../gurpmi:107
-#, fuzzy
+#, fuzzy, c-format
 msgid "Choose location to save file"
 msgstr "Izaberite datoteku"
 
@@ -91,20 +94,21 @@ msgstr ""
 "nepoznata opcija '%s'\n"
 
 #: ../gurpmi.pm:89
-#, fuzzy
+#, fuzzy, c-format
 msgid "No packages specified"
 msgstr "Naredba nije specificirana"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Molim pričekajte..."
 
 #: ../gurpmi2:52
-#, fuzzy
+#, fuzzy, c-format
 msgid "Must be root"
 msgstr "Port miša"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -114,37 +118,42 @@ msgstr ""
 "Naki traženi paketi ne mogu biti instalirani:\n"
 "%s"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "U redu"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../gurpmi2:146
-#, fuzzy
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "U redu"
+
+#: ../gurpmi2:148
+#, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Dogradnja"
 
-#: ../gurpmi2:147
-#, fuzzy
+#: ../gurpmi2:149
+#, fuzzy, c-format
 msgid " (to install)"
 msgstr "Izlaz iz instalacije"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jedan od slijedećih paketa je potreban:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Prekini"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -152,7 +161,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Slijedeći paketi će biti uklonjeni"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -160,25 +169,27 @@ msgid ""
 "%s\n"
 msgstr "Slijedeći paketi će biti instalirani"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Pripremam se za instalaciju"
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Molim umetnite medij pod nazivom \"%s\" u uređaj [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Instaliram pakete..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -187,8 +198,7 @@ msgid ""
 "Do you want to continue installation ?"
 msgstr "Slijedeći paketi će biti instalirani"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -198,36 +208,38 @@ msgstr ""
 "Instalacija neuspješna, neke datoteke nedostaju.\n"
 "Možda ćete poželjeti dograditi vašu urpmi bazu"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "Uklanjam %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
-#: ../gurpmi2:329
-#, fuzzy
+#: ../gurpmi2:331
+#, fuzzy, c-format
 msgid "_Done"
 msgstr "Gotov"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "sve je već instalirano"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Instalirano"
 
@@ -239,21 +251,22 @@ msgid ""
 msgstr ""
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - ispiši ovaj tekst s pomoći.\n"
 
 #: ../rpm-find-leaves:17
-#, fuzzy
+#, fuzzy, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "  --synthesis    - koristi datu synthesu umjesto urpmi db.\n"
 
 #: ../rpm-find-leaves:18
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "  --group         -ispisuje oznaku group: grupu."
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f             - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
 
@@ -266,212 +279,126 @@ msgstr ""
 "\n"
 "\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:73
-#, fuzzy
+#: ../urpm.pm:93
+#, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nepravilno ime rpm datoteke [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "dohvaćam hdlists datoteku..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...dohvat završen"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...dohvaćanje neuspješno: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "ne mogu registrirati rpm datoteku"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "greška prilikom registriranja lokalnih paketa"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "pogrešna deklaracija proxyja u komandnom retku\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Trebate biti administrator (root) da koristite ovu komandu! \n"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "Nn"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "YyDd"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "Žalim, loš odabir, pokušajte ponovo\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
+#: ../urpm/args.pm:426
 #, c-format
-msgid "on node %s"
+msgid "Can't use %s with %s"
 msgstr ""
 
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Instalacija nije uspjela"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-#, fuzzy
-msgid "Installation is possible"
-msgstr "Problem u instalaciji"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "Instaliram paket `%s' (%s/%s)..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
+#: ../urpm/args.pm:440
 #, c-format
-msgid "scp failed on host %s (%d)"
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "ispitujem synthesis datoteku [%s]"
-
-#: ../urpm/parallel_ssh.pm:183
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "Nn"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "instaliram %s\n"
+msgid "Yy"
+msgstr "YyDd"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "Pripremam se za instalaciju"
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "instaliram %s\n"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "Pripremam se za instalaciju"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Žalim, loš odabir, pokušajte ponovo\n"
 
 #: ../urpme:39
 #, fuzzy, c-format
@@ -489,129 +416,135 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
 #: ../urpme:45
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "Prikaži automatski odabrane pakete"
 
 #: ../urpme:46
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr " --test         - potvrdi da instalacija može biti dostignuta točno.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - prisili pozivanje iako neki paketi ne postoje.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:49 ../urpmi:148
-#, fuzzy
+#: ../urpme:49 ../urpmi:146
+#, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --group         -ispisuje oznaku group: grupu."
 
 #: ../urpme:50
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --wget         - koristi wget za dohvaćanje udaljenih datoteka.\n"
 
-#: ../urpme:51
-#, fuzzy
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --wget         - koristi wget za dohvaćanje udaljenih datoteka.\n"
+
+#: ../urpme:52
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description   - ispisuje oznaku description: opis."
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
 msgstr ""
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-hdlist - pokušaj pronaći i upotrijebiti hdlist datoteku.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - pokušaj pronaći i upotrijebiti hdlist datoteku.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  -v             - opširan mod.\n"
 
-#: ../urpme:57
-#, fuzzy
+#: ../urpme:58
+#, fuzzy, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
 
-#: ../urpme:74
-#, fuzzy
+#: ../urpme:75
+#, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
 #: ../urpme:106
-#, fuzzy
-msgid "unknown package"
-msgstr "Nepoznata greška"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
-#, fuzzy
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "Izaberite vaše pakete"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "Nepoznata greška"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Slijedeći paketi sadrže %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, fuzzy, c-format
 msgid "removing package %s will break your system"
 msgstr "uklanjanje paketa %s će pokvariti vaš sustav\n"
 
-#: ../urpme:121
-#, fuzzy
+#: ../urpme:120
+#, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "Nema oznake za uklanjanje"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
-#, fuzzy
+#: ../urpme:125
+#, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "Jedan od slijedećih paketa je potreban:"
 
-#: ../urpme:133
+#: ../urpme:132
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (d/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, fuzzy, c-format
 msgid "Remove %d packages?"
 msgstr "Instaliram paket %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
-#, fuzzy
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (d/N) "
+
+#: ../urpme:156
+#, fuzzy, c-format
 msgid "Removal failed"
 msgstr "Prijava nije uspjela"
 
@@ -632,115 +565,124 @@ msgstr ""
 "uporaba:\n"
 
 #: ../urpmf:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - koristi specifično okružje (tipično izvješće o grešci).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
-#, fuzzy
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, fuzzy, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
-#, fuzzy
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --update       - koristi samo medije za dogradnju.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
-#, fuzzy
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, fuzzy, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - koristi datu synthesu umjesto urpmi db.\n"
 
-#: ../urpmf:43
-#, fuzzy
+#: ../urpmf:44
+#, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr ""
 "  -P             - nemoj pretraživati u provides kako bi pronašli paket.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - koristi samo medije za dogradnju.\n"
 
-#: ../urpmf:45
-#, fuzzy
+#: ../urpmf:46
+#, fuzzy, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -v             - opširan mod.\n"
 
-#: ../urpmf:46
-#, fuzzy
+#: ../urpmf:47
+#, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
 
-#: ../urpmf:47
-#, fuzzy
+#: ../urpmf:48
+#, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:51
-#, fuzzy
+#: ../urpmf:52
+#, fuzzy, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binarni AND operator.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binarni OR operator.\n"
 
-#: ../urpmf:54
-#, fuzzy
+#: ../urpmf:55
+#, fuzzy, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  -o             - binarni OR operator.\n"
 
-#: ../urpmf:55
-#, fuzzy
+#: ../urpmf:56
+#, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 "  -o             - binarni OR operator, istinit ukoliko je jedan izraz "
 "istinit.\n"
 
-#: ../urpmf:56
-#, fuzzy
+#: ../urpmf:57
+#, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Popis podataka za povrat:\n"
 "\n"
 
-#: ../urpmf:57
-#, fuzzy
+#: ../urpmf:58
+#, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - koristi X sučelje.\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr ""
@@ -749,144 +691,150 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../urpmf:59
-#, fuzzy
+#: ../urpmf:60
+#, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:60
-#, fuzzy
+#: ../urpmf:61
+#, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --files         - ispisuje oznaku files: sve datoteke (više linija)."
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:62
-#, fuzzy
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Alat za podešavanje Konzole"
 
-#: ../urpmf:63
-#, fuzzy
+#: ../urpmf:64
+#, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 "  --conflicts     - ispisuje oznaku conflicts: sve konflikte (više linija)."
 
-#: ../urpmf:64
-#, fuzzy
+#: ../urpmf:65
+#, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - ispisuje oznaku description: opis."
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:66
-#, fuzzy
+#: ../urpmf:67
+#, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:67
-#, fuzzy
+#: ../urpmf:68
+#, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:68
-#, fuzzy
+#: ../urpmf:69
+#, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr ""
 "  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
 
-#: ../urpmf:69
-#, fuzzy
+#: ../urpmf:70
+#, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:70
-#, fuzzy
+#: ../urpmf:71
+#, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:71
-#, fuzzy
+#: ../urpmf:72
+#, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 "  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
 
-#: ../urpmf:72
-#, fuzzy
+#: ../urpmf:73
+#, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --group         -ispisuje oznaku group: grupu."
 
-#: ../urpmf:73
-#, fuzzy
+#: ../urpmf:74
+#, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 "  --provides      - ispisuje oznaku provides: sve što pruža (više linija)."
 
-#: ../urpmf:74
-#, fuzzy
+#: ../urpmf:75
+#, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 "  --requires      - ispisuje oznaku requires: sve što zahtjeva (više linija)."
 
-#: ../urpmf:75
-#, fuzzy
+#: ../urpmf:76
+#, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:76
-#, fuzzy
+#: ../urpmf:77
+#, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --group         -ispisuje oznaku group: grupu."
 
-#: ../urpmf:77
-#, fuzzy
+#: ../urpmf:78
+#, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary       - ispisuje oznaku summary: sažeto."
 
-#: ../urpmf:78
-#, fuzzy
+#: ../urpmf:79
+#, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:79
-#, fuzzy
+#: ../urpmf:80
+#, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  -v             - opširan mod.\n"
 
-#: ../urpmf:80
-#, fuzzy
+#: ../urpmf:81
+#, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr ""
 "  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "koristim posebno okružje na %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr ""
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -902,39 +850,57 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../urpmi:92
-#, fuzzy
+#: ../urpmi:88
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:54
-#, fuzzy
+#: ../urpmi:92 ../urpmq:54
+#, fuzzy, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - automatski izaberi pakete za dogradnju sustava.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr "  --auto-select  - automatski izaberi pakete za dogradnju sustava.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - isključi MD5SUM provjeru datoteka.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - forsiraj ažuriranje gpg ključa.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 "  --no-uninstall - ne traži deinstalaciju paketa, odustani od instalacije.\n"
 
-#: ../urpmi:98
-#, fuzzy
+#: ../urpmi:97
+#, fuzzy, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 "  --install-src  - instaliraj samo pakete izvornog koda (bez izvršnih "
 "programa).\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -942,7 +908,7 @@ msgstr ""
 "  --keep         - zadrži postojeće pakete ako je moguće, odbij zatražene\n"
 "pakete koji bi bili uklonjeni.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -953,40 +919,42 @@ msgstr ""
 "                   biti instalirano ili unapređeno,\n"
 "                   uobičajeno je %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - mala dužina prenosa, uobičajeno je %d.\n"
 
-#: ../urpmi:105
-#, fuzzy
+#: ../urpmi:104
+#, fuzzy, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - uključi fuzzy pretraživanje (isto kao -y).\n"
 
-#: ../urpmi:106
-#, fuzzy
+#: ../urpmi:105
+#, fuzzy, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr ""
 "  --src          - slijedeći paket je izvorišni(source) paket (isto kao -"
 "s).\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - instaliraj samo pakete izvornog koda (bez izvršnih "
 "programa).\n"
 
-#: ../urpmi:108
-#, fuzzy
+#: ../urpmi:107
+#, fuzzy, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --noclean      - zadrži rpm koji nije korišten u međuspremniku.\n"
 
-#: ../urpmi:109
-#, fuzzy
+#: ../urpmi:108
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - zadrži rpm koji nije korišten u međuspremniku.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -994,7 +962,8 @@ msgstr ""
 "  --allow-nodeps - dozvoli korisniku instalaciju paketa\n"
 "bez provjere ovisnosti.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -1003,52 +972,60 @@ msgstr ""
 "paketa bez\n"
 "                    ovisnosti o provjeri i integritetu.\n"
 
-#: ../urpmi:116
-#, fuzzy
+#: ../urpmi:115 ../urpmq:69
+#, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --wget         - koristi wget za dohvaćanje udaljenih datoteka.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - koristi wget za dohvaćanje udaljenih datoteka.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - koristi curl za dohvaćanje udaljenih datoteka.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - koristi curl za dohvaćanje udaljenih datoteka.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - ograniči brzinu preuzimanja datoteka.\n"
 
 #: ../urpmi:129
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1057,7 +1034,8 @@ msgstr ""
 "                   (--no-verify-rpm treba biti isključen, uobičajeno je "
 "uključen).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1066,7 +1044,8 @@ msgstr ""
 "porta\n"
 "                   1080 (format je <proxyhost[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1075,6 +1054,7 @@ msgstr ""
 "                   autentikaciju (format je <user:password>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1083,7 +1063,7 @@ msgstr ""
 "sljedećim argumentom.\n"
 
 #: ../urpmi:138
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1093,236 +1073,264 @@ msgstr ""
 "uključen).\n"
 
 #: ../urpmi:140
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr " --test         - potvrdi da instalacija može biti dostignuta točno.\n"
 
 #: ../urpmi:141
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - isljuči doc datoteke.\n"
 
 #: ../urpmi:143
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --no-uninstall - ne traži deinstalaciju paketa, odustani od instalacije.\n"
 
 #: ../urpmi:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
 #: ../urpmi:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --description   - ispisuje oznaku description: opis."
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - isključi MD5SUM provjeru datoteka.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - forsiraj ažuriranje gpg ključa.\n"
-
-#: ../urpmi:149
-#, fuzzy
+#: ../urpmi:147
+#, fuzzy, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr " --test         - potvrdi da instalacija može biti dostignuta točno.\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
 
-#: ../urpmi:152
-#, fuzzy
+#: ../urpmi:150
+#, fuzzy, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --noclean      - zadrži rpm koji nije korišten u međuspremniku.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - nemoj pretraživati u provides kako bi pronašli paket.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - tihi mod.\n"
 
-#: ../urpmi:159
-#, fuzzy
+#: ../urpmi:157
+#, fuzzy, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:222
-#, fuzzy
+#: ../urpmi:220
+#, fuzzy, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 "Što može biti učinjeno s binarnim rpm datotekama kad se korsiti opcija --"
 "install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, fuzzy, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "Grupa već postoji, molimo odaberite drugo ime grupe"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, fuzzy, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Nije uspjelo stvaranje direktorija %s"
 
-#: ../urpmi:249
-#, fuzzy
+#: ../urpmi:247
+#, fuzzy, c-format
 msgid "Copying failed"
 msgstr "...kopiranje neuspješno"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
 "Use --allow-force to force operation."
 msgstr ""
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "Dogradnja"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "Dogradnja"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Izlaz iz instalacije"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Izlaz iz instalacije"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Izaberite jedan? (1-%d) "
 
-#: ../urpmi:481
+#: ../urpmi:482
 #, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../urpmi:489 ../urpmi:507
-#, fuzzy
+#: ../urpmi:492 ../urpmi:511
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Da ipak nastavim?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Naki traženi paketi ne mogu biti instalirani:\n"
+"%s"
+msgstr[1] ""
+"Naki traženi paketi ne mogu biti instalirani:\n"
+"%s"
+msgstr[2] ""
 "Naki traženi paketi ne mogu biti instalirani:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:534
 #, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
+"uvijek nije podržano\n"
+msgstr[1] ""
+"neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
+"uvijek nije podržano\n"
+msgstr[2] ""
 "neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
 "uvijek nije podržano\n"
 
-#: ../urpmi:535
+#: ../urpmi:541
 #, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr "Slijedeći paketi će biti uklonjeni"
+msgstr[0] "Slijedeći paketi će biti uklonjeni"
+msgstr[1] "Slijedeći paketi će biti uklonjeni"
+msgstr[2] "Slijedeći paketi će biti uklonjeni"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:572 ../urpmi:584
-#, fuzzy
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "Slijedeći paketi će biti instalirani"
-
-#: ../urpmi:573 ../urpmi:585
-#, fuzzy
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr ""
-"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] "Slijedeći paketi će biti instalirani"
+msgstr[1] "Slijedeći paketi će biti instalirani"
+msgstr[2] "Slijedeći paketi će biti instalirani"
 
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1331,93 +1339,110 @@ msgstr ""
 "Morate biti administrator(root) kako bi instalirali slijedeće ovisnosti:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:589
+#: ../urpmi:594
 #, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../urpmi:612
-#, fuzzy
+#: ../urpmi:618
+#, fuzzy, c-format
 msgid "Press Enter when ready..."
 msgstr "Pritisnite Enter kada ste gotovi..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../urpmi:660
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "Slijedeći paketi će biti instalirani"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Slijedeći paketi će biti instalirani"
+msgstr[1] "Slijedeći paketi će biti instalirani"
+msgstr[2] "Slijedeći paketi će biti instalirani"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Želite li nastaviti instalaciju?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "instaliram %s\n"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "instaliram %s\n"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "instaliram %s\n"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
-#, fuzzy
+#: ../urpmi:756
+#, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalacija nije uspjela"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Pokušati instalaciju bez provjere ovisnosti (d/N) "
 
-#: ../urpmi:771
-#, fuzzy
+#: ../urpmi:780
+#, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Pokušati instalaciju još snažnije (--force)? (d/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "instalacijske intrukcije"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Problem u instalaciji"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "sve je već instalirano"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "sve je već instalirano"
+msgstr[1] "sve je već instalirano"
+msgstr[2] "sve je već instalirano"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "sve je već instalirano"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "sve je već instalirano"
+msgstr[1] "sve je već instalirano"
+msgstr[2] "sve je već instalirano"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "restartam urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1441,43 +1466,49 @@ msgstr ""
 "i [opcije] su od\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - napravi medij za dogradnju.\n"
 
 #: ../urpmi.addmedia:55
-#, fuzzy
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-hdlist - pokušaj pronaći i upotrijebiti hdlist datoteku.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - pokušaj pronaći i upotrijebiti hdlist datoteku.\n"
 
 #: ../urpmi.addmedia:57
-#, fuzzy
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --probe-hdlist - pokušaj pronaći i upotrijebiti hdlist datoteku.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
 
 #: ../urpmi.addmedia:59
-#, fuzzy
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
+msgstr "  --probe-hdlist - pokušaj pronaći i upotrijebiti hdlist datoteku.\n"
+
+#: ../urpmi.addmedia:61
+#, fuzzy, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 "  --distrib      - automatski napravi sve medije iz instalacijskog medija.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
-#, fuzzy
+#: ../urpmi.addmedia:64
+#, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1487,7 +1518,8 @@ msgstr ""
 "(mirora),\n"
 "uobičajeno je %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1495,64 +1527,84 @@ msgstr ""
 "  --virtual      - kreiraj virtualni medij koji je uvijek up-to-date,\n"
 "                   samo je file:// dopušten.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - isključi MD5SUM provjeru datoteka.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tihi mod.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - opširan mod.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "ne mogu ažurirati medij \"%s\"\n"
 
-#: ../urpmi.addmedia:117
-#, fuzzy
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpmi.addmedia:120
+#: ../urpmi.addmedia:121
 #, fuzzy, c-format
-msgid "Will create config file [%s]"
+msgid "creating config file [%s]"
 msgstr "zapisana config datoteka [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "zapisana config datoteka [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "nema potrebe za davanje <relativne putanje do hdlist> sa --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<relativna putanja do hdlist> nedostaje\n"
 
-#: ../urpmi.addmedia:167
-#, fuzzy
-msgid "`with' missing for network media\n"
-msgstr "`with' nedostaje za ftp medij\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "ne mogu napraviti medij \"%s\"\n"
@@ -1574,153 +1626,154 @@ msgstr ""
 "uporaba:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
 #: ../urpmi.recover:35
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - zadrži rpm koji nije korišten u međuspremniku.\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:37
-#, fuzzy
+#: ../urpmi.recover:38
+#, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmi.recover:38
-#, fuzzy
+#: ../urpmi.recover:39
+#, fuzzy, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:41
-#, fuzzy
+#: ../urpmi.recover:42
+#, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:64
-#, fuzzy
+#: ../urpmi.recover:65
+#, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "paket %s nije pronađen."
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr ""
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr ""
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr ""
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "dohvaćam hdlists datoteku..."
 
-#: ../urpmi.recover:184
-#, fuzzy
+#: ../urpmi.recover:185
+#, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "Nije pronađena ni jedna slika"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "uporaba: urpmi.removemedia [-a] <ime> ...\n"
 "gdje je <ime> ime medija za ukloniti.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - odaberi sve medije.\n"
 
-#: ../urpmi.removemedia:57
-#, fuzzy
+#: ../urpmi.removemedia:43
+#, fuzzy, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
 
-#: ../urpmi.removemedia:60
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nepoznata opcija '%s'\n"
-
-#: ../urpmi.removemedia:70
-#, fuzzy
+#: ../urpmi.removemedia:65
+#, fuzzy, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nema ništa za uklanjanje (koristite urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1730,6 +1783,7 @@ msgstr ""
 "(jedan od %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1738,34 +1792,47 @@ msgstr ""
 "gdje je <ime> ime medija za dogradnju.\n"
 
 #: ../urpmi.update:41
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - koristi samo medije za dogradnju.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - forsiraj ažuriranje gpg ključa.\n"
+
 #: ../urpmi.update:44
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --update       - koristi samo medije za dogradnju.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - odaberi sve neprenosive medije.\n"
 
-#: ../urpmi.update:69
-#, fuzzy
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
+
+#: ../urpmi.update:70
+#, fuzzy, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nema ništa za nadogradnju (koristite urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1774,21 +1841,21 @@ msgstr ""
 "nedostaje unos za nadogradnju\n"
 "(jedan od %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, fuzzy, c-format
-msgid "enabling media %s"
-msgstr "uklanjam medij \"%s\""
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Mijenjam medij \"%s\":"
 
+#: ../urpmi.update:101
+#, fuzzy, c-format
+msgid "enabling media %s"
+msgstr "uklanjam medij \"%s\""
+
 #: ../urpmq:42
 #, fuzzy, c-format
 msgid ""
@@ -1806,184 +1873,247 @@ msgstr ""
 "uporaba:\n"
 
 #: ../urpmq:50
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - uključi fuzzy pretraživanje (isto kao -y).\n"
 
 #: ../urpmq:58
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --list         - list available packages.\n"
 msgstr ""
 "  --src          - slijedeći paket je izvorišni(source) paket (isto kao -"
 "s).\n"
 
 #: ../urpmq:59
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --all           - ispiši sve oznake."
 
 #: ../urpmq:60
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --all           - ispiši sve oznake."
 
 #: ../urpmq:61
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --all           - ispiši sve oznake."
 
 #: ../urpmq:62
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --all           - ispiši sve oznake."
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - snimi konfiguraciju u obliku urpmi.addmedia argumenta.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - slijedeći paket je izvorišni(source) paket (isto kao -"
 "s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - daj sve izvorne pakete prije skidanja (root samo).\n"
 
 #: ../urpmq:67
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:81
-#, fuzzy
+#: ../urpmq:83
+#, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmq:82
-#, fuzzy
+#: ../urpmq:84
+#, fuzzy, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary       - ispisuje oznaku summary: sažeto."
 
-#: ../urpmq:84
-#, fuzzy
+#: ../urpmq:87
+#, fuzzy, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -d             - proširi ispitivanje ovisnosti paketa.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - proširi ispitivanje ovisnosti paketa.\n"
 
-#: ../urpmq:87
-#, fuzzy
+#: ../urpmq:90
+#, fuzzy, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -f             - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
 
-#: ../urpmq:88
-#, fuzzy
+#: ../urpmq:91
+#, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
 
-#: ../urpmq:89
-#, fuzzy
+#: ../urpmq:92
+#, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 "  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
 
-#: ../urpmq:90
-#, fuzzy
+#: ../urpmq:93
+#, fuzzy, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - nemoj pretraživati u provides kako bi pronašli paket.\n"
 
-#: ../urpmq:91
-#, fuzzy
+#: ../urpmq:94
+#, fuzzy, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr ""
 "  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
 
-#: ../urpmq:92
-#, fuzzy
+#: ../urpmq:95
+#, fuzzy, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -f             - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
 
-#: ../urpmq:93
-#, fuzzy
+#: ../urpmq:96
+#, fuzzy, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 "  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
 
-#: ../urpmq:94
-#, fuzzy
+#: ../urpmq:97
+#, fuzzy, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - slijedeći paket je izvorišni paket (isto kao --src).\n"
 
-#: ../urpmq:96
-#, fuzzy
+#: ../urpmq:99
+#, fuzzy, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "  -s             - slijedeći paket je izvorišni paket (isto kao --src).\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -v             - uključi fuzzy pretraživanje (isto kao --fuzzy).\n"
 
-#: ../urpmq:99
-#, fuzzy
+#: ../urpmq:101
+#, fuzzy, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
 
-#: ../urpmq:176
-#, fuzzy
+#: ../urpmq:177
+#, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr ""
 
-#: ../urpmq:405
-#, fuzzy
+#: ../urpmq:406
+#, fuzzy, c-format
 msgid "No filelist found\n"
 msgstr "Nije pronađena ni jedna slika"
 
-#: ../urpmq:417
-#, fuzzy
+#: ../urpmq:418
+#, fuzzy, c-format
 msgid "No changelog found\n"
 msgstr "Nije pronađena ni jedna slika"
 
+#, fuzzy
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Instalacija nije uspjela"
+
+#, fuzzy
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Instaliram paket `%s' (%s/%s)..."
+
+#, fuzzy
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "ispitujem synthesis datoteku [%s]"
+
+#, fuzzy
+#~ msgid "Distributing files to %s..."
+#~ msgstr "instaliram %s\n"
+
+#, fuzzy
+#~ msgid "Performing install on %s..."
+#~ msgstr "Pripremam se za instalaciju"
+
+#, fuzzy
+#~ msgid "Installing %s on %s..."
+#~ msgstr "instaliram %s\n"
+
+#, fuzzy
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Pripremam se za instalaciju"
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
+
+#, fuzzy
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr ""
+#~ "  --probe-hdlist - pokušaj pronaći i upotrijebiti hdlist datoteku.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr ""
+#~ "  --probe-hdlist - pokušaj pronaći i upotrijebiti hdlist datoteku.\n"
+
+#, fuzzy
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "`with' nedostaje za ftp medij\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "nepoznata opcija '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "definiran je nepoznati protokol za %s"
 
diff --git a/po/hu.po b/po/hu.po
index 3f583677..eafa19b6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-09-03 21:40+0200\n"
 "Last-Translator: Arpad Biro\n"
 "Language-Team: Hungarian\n"
@@ -23,7 +23,8 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "RPM-telepítés"
 
@@ -32,7 +33,8 @@ msgstr "RPM-telepítés"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Hiba: %s nevű fájl nem található - a művelet megszakítva"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_OK"
 
@@ -87,20 +89,23 @@ msgstr ""
 "\n"
 "Választhatja azt is, hogy csak elmenti a csomagot. Mit szeretne tenni?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Telepítés"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "M_entés"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Mégsem"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Válasszon helyet a fájlnak"
 
@@ -110,18 +115,21 @@ msgid "Unknown option %s"
 msgstr "Ismeretlen opció: \"%s\""
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Nincs megadva csomag"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Kis türelmet..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Rendszergazdai jogosultság szükséges"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -132,35 +140,42 @@ msgstr ""
 "%s\n"
 "Kívánja folytatni a telepítést?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "OK"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (frissítés)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (telepítés)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Csomagválasztás"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "A következő csomagok valamelyikére szükség van:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Megszakítás"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -172,7 +187,7 @@ msgstr ""
 "%s\n"
 "Kívánja folytatni a telepítést?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -182,25 +197,27 @@ msgstr ""
 "A függőségek feloldásához a következő %d csomag telepítésre kerül:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Csomagtelepítés..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "a forráscsomagok nem elérhetők, ezért a művelet félbeszakad"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, 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"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "A(z) '%s' csomag letöltése folyik..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -213,8 +230,7 @@ msgstr ""
 "\n"
 "Kívánja folytatni a telepítést?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -225,35 +241,38 @@ msgstr ""
 "%s\n"
 "Érdemes lehet frissíteni az urpmi adatbázist."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "\"%s\" eltávolítása"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Előkészítés..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "A(z) '%s' (%s/%s) csomag telepítése..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "A telepítés nem sikerült"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Kész"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "A csomag(ok) már telepítve van(nak)"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "A telepítés befejeződött"
 
@@ -267,21 +286,24 @@ msgstr ""
 "ahol [opciók] a következők lehetnek:\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - jelen segítség megjelenítése\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr ""
 "   --root <hely>  - a megadott útvonal használata gyökérkönyvtárnak\n"
 "                    a / helyett\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [csoport]   - eredmények korlátozása az adott csoportra\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - a névvel együtt a csoportok is jelenjenek meg\n"
 
@@ -290,210 +312,127 @@ msgstr "  -g             - a névvel együtt a csoportok is jelenjenek meg\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    alapértelmezés: %s\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Csomagok telepítéséhez rendszergazdai jogosultság szükséges"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Az Urpmi indítása korlátozott módban..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "az rpmdb megnyitása nem sikerült"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "érvénytelen csomagfájlnév: \"%s\""
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-fájl behozatala: \"%s\"..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...behozatal megtörtént"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...a behozatal sikertelen: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "a csomagfájl nem elérhető: \"%s\""
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "nem sikerült elemezni a(z) \"%s\" specifikációs fájlt [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "az RPM-csomagfájl nem regisztrálható"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Az RPM-mel nem kompatibilis architektúra [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "hiba a helyi csomagok regisztrálásakor"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Korlátozott mód esetén ez a művelet nem végezhető el"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "helytelen proxy-megadás a parancssorban\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
-#, fuzzy
+#: ../urpm/args.pm:133
+#, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "\"%s\" környezeti könyvtár nem létezik"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "A --use-distrib használatához rendszergazdai jogosultság szükséges"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: egy RPM-fájl nem olvasható: \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, c-format
+msgid "Can't use %s with %s"
+msgstr ""
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "Túl sok argumentum\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "Nn"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "IiyY"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Ezt nem lehet választani, próbálja meg újra\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "az mput sikertelen volt - elképzelhető, hogy egy gép nem elérhető"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "a(z) %s gépen az urpme program egyik régebbi verziója van - frissítse"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "az rshp sikertelen volt - elképzelhető, hogy egy gép nem elérhető"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "ezen a gépen: %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Kiterjesztett függőséglista átvitele a gépekre..."
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "Függőségek feloldása a gépeken..."
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Fájlok átvitele a gépekre..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Ellenőrzés: lehetséges-e a telepítés a gépeken..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "A telepítés nem sikerült ezen a gépen: %s"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "A telepítés elvégezhető"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Csomagok telepítése a gépekre..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "az scp sikertelen volt ezen a gépen: %s (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "Kiterjesztett függőséglista átvitele ide: %s..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "Függőségek feloldása itt: %s..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "a(z) %s gépen nincs megfelelő verziójú urpmi program (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "Fájlok átvitele ide: %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "Ellenőrzés: lehetséges-e a telepítés itt: %s..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "Telepítés elvégzése itt: %s..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "%s telepítése itt: %s"
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "Telepítés előkészítése itt: %s..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -510,45 +449,60 @@ msgstr ""
 "\n"
 "Használat:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - jelen segítség megjelenítése\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - választási lehetőségnél automatikusan választ csomagot\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - annak ellenőrzése, hogy az eltávolítás végrehajtható-e\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - végrehajtás akkor is, ha néhány csomag nem elérhető\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - elosztott urpmi több számítógép közt\n"
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - a fájlok újracsomagolása törlés előtt\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - másik gyökér használata az RPM-csomageltávolításhoz\n"
 
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - másik gyökér használata az RPM-csomagtelepítéshez\n"
+
+#: ../urpme:52
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - a csomagok szkriptjei ne legyenek végrehajtva\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
@@ -557,78 +511,81 @@ msgstr ""
 "                   fából - például chroot telepítéséhez/eltávolításához\n"
 "                   használható a --root opció esetén\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - kiterjesztett függőséglista keresése és felhasználása\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - fejléclista keresése és felhasználása\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - részletes információ\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - részletes információ\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - a mintára illeszkedő csomagok kijelölése\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Csomagok eltávolításához rendszergazdai jogosultság szükséges"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "ismeretlen csomag"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "ismeretlen csomagok"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "ismeretlen csomag"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "A következő csomagok tartalmazzák a(z) %s komponenst: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "a(z) \"%s\" csomag eltávolítása tönkreteheti a rendszert"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Nincs mit eltávolítani"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Ellenőrzés a következő csomagok eltávolításához"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "A függőségek feloldásához a következő %d csomag el lesz távolítva (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (i/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "%d csomag eltávolítása?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (i/N) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Az eltávolítás sikertelen"
 
@@ -649,22 +606,26 @@ msgstr ""
 "Használat: urpmf [opciók] mintakifejezés\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - jelen program verziószámának megjelenítése\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - megadott környezet használata (általában hibajelentés\n"
 "                   esetében)\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - a felsorolt (elválasztás: vessző) adatforrások\n"
 "                   feldolgozásának mellőzése\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
@@ -672,198 +633,241 @@ msgstr ""
 "szövegként\n"
 "                   való kezelése\n"
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - csak a felsorolt (elválasztás: vessző) adatforrások\n"
 "                   használata\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - az adatforrások sorbarendezése vesszővel elválasztott\n"
 "                   sztringek alapján\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - a megadott kiterjesztett függőséglista használata az\n"
 "                   urpmi-adatbázis helyett\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - az azonos sorok csak egyszer jelenjenek meg\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - csak frissítési adatforrás legyen használva\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - részletes információ\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - a minták feldolgozása nem nagybetűérzékeny\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -I             - a minták feldolgozása nagybetűérzékeny (alapértelmezés)\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<szöveg>     - mezőelválasztó módosítása (alapértelmezés: \":\")\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mintakifejezések:\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  szöveg         - a szövegek reguláris kifejezésként vannak kezelve, ezt -"
 "l\n"
 "                   opcióval lehet felülbírálni\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - Perl kód közvetlen betevése (perl -e)\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - bináris ÉS művelet.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - bináris VAGY művelet.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unáris NEM művelet.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - bal illetve jobb oldali zárójel\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "Címkék listája:\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - printf-szerű kiírási formátum megadása\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   példa: '%%name:%%files'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - architektúra\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - a csomagkészítéshez használt gép\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - a csomagkészítés időpontja\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - beállítási fájlok\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - \"ütközés\" címkék\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - csomagleírás\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - disztribúció\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - generáció\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - a csomag fájlneve\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - a csomagban levő fájlok listája\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - csoport\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - csomagnév\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - \"elavulttá tesz\" címkék\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - csomagkészítő\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - \"szolgáltatásjegyzék\" címkék\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - \"követelmények\" címkék\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - telepített méret\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - a forráscsomag neve\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - összefoglaló\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - terjesztő\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - a csomagot tartalmazó adatforrás\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - a névvel együtt a verzió, a kiadásszám és az\n"
 "                   architektúra is jelenjen meg\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Helytelen formátum: csak egy darab többértékű címke használható"
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "a következő környezet használata: %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -871,11 +875,12 @@ msgstr ""
 "Megjegyzés: a feldolgozott adatforrások egyike sem használ fejléclistát, "
 "ezért az urpmf nem tudott eredményt adni\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Csomagnevek keresésére használható a --name opció.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -891,14 +896,16 @@ msgstr ""
 "\n"
 "Használat:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - csak a megadott adatforrások használata a kért csomagok\n"
 "                   kereséséhez\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
@@ -906,13 +913,31 @@ msgstr ""
 "  --auto         - nem-interaktív mód, a kérdésekre az alapértelmezett\n"
 "                   válaszok lesznek feltételezve\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - automatikusan kiválasztja a frissíthető csomagokat\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatikusan kiválasztja a frissíthető csomagokat\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - az MD5-ös összeg ellenőrzésének kikapcsolása\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - a GPG-kulcs frissítésének kikényszerítése\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -921,11 +946,13 @@ msgstr ""
 "inkább\n"
 "                   szakadjon félbe a telepítés\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - csomagok telepítésének mellőzése (csak letöltés)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -933,7 +960,7 @@ msgstr ""
 "  --keep         - a már telepített csomagok megtartása, ha lehetséges - a\n"
 "                   törlést igénylő csomagok nem kerülnek telepítésre\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -945,36 +972,42 @@ msgstr ""
 "                   telepítése vagy frissítése esetén,\n"
 "                   az alapértelmezés szerinti érték: %d\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 "  --split-length - csökkentett művelethossz használata, az alapértelmezés: %"
 "d\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - fuzzy keresés használata\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s      - a következő csomag egy forráscsomag\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - csak a forráscsomag telepítése (a programok mellőzése)\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - RPM-fájl eltávolítása a gyorstárból a műveletek előtt\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - az RPM-fájlok ne törlődjenek a gyorstárból\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -983,7 +1016,8 @@ msgstr ""
 "                   telepítését (a felhasználótól érkező megerősítést "
 "követően)\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -994,11 +1028,13 @@ msgstr ""
 "megerősítést\n"
 "                   követően)\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - másik gyökér használata az RPM-csomagtelepítéshez\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -1008,41 +1044,48 @@ msgstr ""
 "root\n"
 "                   opció esetén\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - a wget használata távoli fájlok letöltésére\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - a curl használata távoli fájlok letöltésére\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - a curl használata távoli fájlok letöltésére\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - további opciók a Curl program számára\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- további opciók az Rsync program számára\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - további opciók a Wget program számára\n"
 
 #: ../urpmi:127
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --curl-options - további opciók a Curl program számára\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - a letöltési sebesség korlátozása\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1051,7 +1094,8 @@ msgstr ""
 "                   (a --no-resume kikapcsolja; alapértelmezésben "
 "kikapcsolt)\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1060,7 +1104,8 @@ msgstr ""
 "alapértelmezés\n"
 "                   szerint 1080 (formátum: <proxygép[:port]>)\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1069,6 +1114,7 @@ msgstr ""
 "                   (formátum: <felhasználónév:jelszó>)\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1077,6 +1123,7 @@ msgstr ""
 "                   könyvtárba\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1085,26 +1132,31 @@ msgstr ""
 "                   --no-verify-rpm; alapértelmezés: bekapcsolt állapot)\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - csak ellenőrzés, hogy a telepítés végrehajtható-e\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 "  --excludepath  - bizonyos útvonalak (elválasztás: vessző) kihagyása\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - dokumentációs fájlok kihagyása\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --ignoresize   - telepítés előtt ne legyen ellenőrizve az üres lemezhely\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - az RPM-csomagok telepítésének engedélyezése nem "
@@ -1112,22 +1164,17 @@ msgstr ""
 "                   architektúra esetén is\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - a csomagok szkriptjei ne legyenek végrehajtva\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - az MD5-ös összeg ellenőrzésének kikapcsolása\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - a GPG-kulcs frissítésének kikényszerítése\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - a nem telepítendő csomagok\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1136,42 +1183,50 @@ msgstr ""
 "az\n"
 "                   alapértelmezettnél több lehetőséget kínáljon fel\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - ne legyen zárolva az RPM-adatbázis\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - csak az azonos architektúrájú csomagok frissítése\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - kijelölés a parancssorban megadott minta szerint\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - csomag keresése a szolgáltatásjegyzékben\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - néma üzemmód\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  a parancssorban megadott csomagok illetve RPM-fájlok lesznek telepítve\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
@@ -1180,11 +1235,12 @@ msgstr ""
 "argumentumokat\n"
 "a --bug opcióval együtt.\n"
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Nem telepíthet bináris RPM-fájlokat, ha --install-src van megadva"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1193,23 +1249,24 @@ msgstr ""
 "\"%s\" nevű könyvtár már létezik. Használjon más könyvtárt a "
 "hibajelentéshez, vagy pedig törölje."
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 "A következő könyvtárnak a hibajelentés céljából való létrehozása sikertelen: "
 "\"%s\""
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "A másolás sikertelen"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "\"%s\" környezeti könyvtár nem létezik"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1218,52 +1275,59 @@ msgstr ""
 "Hiba: úgy tűnik, hogy \"%s\" csak olvasható módon lett csatolva.\n"
 "Ha mégis végre kívánja hajtani a műveletet, használja a --allow-force opciót."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "Adatforrás frissítése...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (frissítés)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (frissítés)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (telepítés)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (telepítés)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Melyiket választja? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"A következő csomagok nem telepíthetők, mivel olyan csomagokat igényelnek,\n"
+"amelyek régebbiek a telepítetteknél:\n"
+"%s"
+msgstr[1] ""
 "A következő csomagok nem telepíthetők, mivel olyan csomagokat igényelnek,\n"
 "amelyek régebbiek a telepítetteknél:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1271,59 +1335,82 @@ msgstr ""
 "\n"
 "Kívánja folytatni a telepítést?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (I/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"A kért csomagok közül néhányat nem lehet telepíteni:\n"
+"%s"
+msgstr[1] ""
 "A kért csomagok közül néhányat nem lehet telepíteni:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"A telepítés nem folytatható, mert a következő csomagokat el kell\n"
+"távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
+"%s\n"
+msgstr[1] ""
 "A telepítés nem folytatható, mert a következő csomagokat el kell\n"
 "távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"A következő csomagokat el kell távolítani, hogy a szükséges csomagok "
+"frissíthetők legyenek:\n"
+"%s"
+msgstr[1] ""
 "A következő csomagokat el kell távolítani, hogy a szükséges csomagok "
 "frissíthetők legyenek:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(csak teszt; az eltávolítás nem lesz ténylegesen végrehajtva)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "A függőségek feloldásához a következő csomagok telepítésre kerülnek"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] "A függőségek feloldásához a következő csomagok telepítésre kerülnek"
+msgstr[1] "A függőségek feloldásához a következő csomagok telepítésre kerülnek"
 
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "A függőségek feloldásához a következő csomag telepítésre kerül"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d csomag, %d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1332,89 +1419,106 @@ msgstr ""
 "A következő függőségek telepítéséhez rendszergazdai jogosultság szükséges:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(csak teszt; a telepítés nem lesz ténylegesen végrehajtva)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "Kívánja folytatni a(z) %d csomag telepítését? (%d MB)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "Kívánja folytatni a(z) %d csomag telepítését? (%d MB)"
+msgstr[1] "Kívánja folytatni a(z) %d csomag telepítését? (%d MB)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Amikor elkészült, nyomja le az Enter billentyűt..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "A következő csomagok helytelen aláírást tartalmaznak:"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "A következő csomagok helytelen aláírást tartalmaznak:"
+msgstr[1] "A következő csomagok helytelen aláírást tartalmaznak:"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Szeretné folytatni a telepítést?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "%s elosztása"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s telepítése innen: %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "%s telepítése folyik"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "A telepítés nem sikerült:"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Próbáljam meg a telepítést a függőségek ellenőrzése nélkül? (i/N) "
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Ha problémát okozhat, akkor is legyen telepítés (--force)? (i/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d telepítési művelet nem sikerült"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "A telepítés elvégezhető"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "A csomag(ok) már telepítve van(nak)"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "A csomag(ok) már telepítve van(nak)"
+msgstr[1] "A csomag(ok) már telepítve van(nak)"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "A csomag(ok) már telepítve van(nak)"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "A csomag(ok) már telepítve van(nak)"
+msgstr[1] "A csomag(ok) már telepítve van(nak)"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "az urpmi újraindítása"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1438,27 +1542,35 @@ msgstr ""
 "az [opciók] pedig a következők lehetnek:\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - frissítési adatforrás létrehozása\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - kiterjesztett függőséglista keresése és felhasználása\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - fejléclista keresése és felhasználása\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - fejléclista illetve kiterjesztett függőséglista\n"
 "                   keresésének mellőzése\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1466,18 +1578,20 @@ msgstr ""
 "  --distrib      - az összes adatforrás létrehozása telepítési "
 "adatforrásból\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - --distrib esetén: megerősítés kérése minden "
 "adatforráshoz\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 "  --all-media    - --distrib esetén: minden listázott adatforrás felvétele\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1487,7 +1601,8 @@ msgstr ""
 "                   tükörkiszolgáló-listaként; alapértelmezés:\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1495,49 +1610,70 @@ msgstr ""
 "  --virtual      - virtuális, mindig naprakész adatforrás létrehozása,\n"
 "                   amelynél csak a file:// protokoll használható\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - az MD5-ös összeg ellenőrzésének kikapcsolása\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 "  --nopubkey     - a felvett adatforrás publikus kulcsa ne legyen "
 "importálva\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - az adatforrás felvétele, de a frissítésének mellőzése\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - a fejlécgyorstár könyvtárának kiürítése\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - fejléclista-fájlok létrehozásának kikényszerítése\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - néma üzemmód\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - részletes információ\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "a(z) \"%s\" adatforrás frissítése nem sikerült\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Adatforrás felvételéhez rendszergazdai jogosultság szükséges"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "\"%s\" beállításfájl létrehozása"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "\"%s\" beállításfájl nem hozható létre"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "<a fejléclista relatív útvonala> --distrib esetén szükségtelen"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1546,16 +1682,17 @@ msgstr ""
 "\n"
 "Szeretné felvenni ezt az adatforrást: \"%s\"?"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<a fejléclista relatív útvonala> hiányzik\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "hiányzó 'with' paraméter a hálózati adatforrásnál\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "a(z) \"%s\" adatforrás létrehozása nem sikerült\n"
@@ -1577,34 +1714,40 @@ msgstr ""
 "Használat:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - újracsomagolás indítása most\n"
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 "  --noclean      - ellenőrzőpont (checkpoint) esetén ne törlődjön az\n"
 "                   újracsomagolási könyvtár\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - tranzakciók listázása a megadott dátum/időtartam\n"
 "                   argumentumtól kezdődően\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr ""
 "  --list-all     - az RPM-adatbázisban levő tranzakciók listázása (hosszú)\n"
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr ""
 "  --list-safe    - tranzakciók listázása az ellenőrzőponttól (checkpoint)\n"
 "                   kezdődően\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
@@ -1612,120 +1755,123 @@ msgstr ""
 "  --rollback     - visszagörgetés a megadott dátumig, vagy a megadott számú\n"
 "                   tranzakció visszagörgetése\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - újracsomagolás kikapcsolása\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "Helytelen dátum vagy időtartam [%s]\n"
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr "Újracsomagolási könyvtár nincs megadva\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "Nem sikerült írni az újracsomagolási könyvtárba [%s]\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "Az újracsomagolási könyvtár takarítása [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "%d fájl törölve\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "Helytelen parancssori argumentumok [%s]\n"
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr "A --checkpoint és a --rollback opció nem adható meg egyszerre\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr "A --checkpoint és a --list opció nem adható meg egyszerre\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "A --rollback és a --list opció nem adható meg egyszerre\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "A --disable opció nem adható meg más opcióval együtt"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "Nem található ez utáni tranzakció: %s\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "Ehhez rendszergazdai jogosultság szükséges"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "RPM-makrófájl írása [%s]...\n"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr "Visszagörgetési dátum nem található\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "Visszagörgetés eddig: %s...\n"
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr "Újracsomagolás kikapcsolása\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "Használat: urpmi.removemedia [-a] <név> ...\n"
 "ahol <név> az eltávolítandó adatforrás neve.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - az összes adatforrás kijelölése\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - fuzzy keresés az adatforrásnevekben\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"ismeretlen opciók: \"%s\"\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Adatforrás eltávolításához rendszergazdai jogosultság szükséges"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nincs mit eltávolítani (használja az urpmi.addmedia parancsot adatforrás "
 "felvételéhez)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1735,6 +1881,7 @@ msgstr ""
 "(valamelyik ezek közül: %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1743,36 +1890,52 @@ msgstr ""
 "ahol <név> a frissítendő adatforrás neve.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - csak frissítési adatforrás legyen frissítve\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - a GPG-kulcs frissítésének kikényszerítése\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr ""
 "  --ignore       - ne legyen frissítés; az adatforrások kihagyottnak "
 "jelölése\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 "  --no-ignore    - ne legyen frissítés; az adatforrások bekapcsoltnak "
 "jelölése\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - az összes nem cserélhető adatforrás kijelölése\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - fejléclista-fájlok létrehozásának kikényszerítése\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Adatforrás frissítéséhez rendszergazdai jogosultság szükséges"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nincs mit frissíteni (használja az urpmi.addmedia parancsot adatforrás "
 "felvételéhez)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1781,21 +1944,21 @@ msgstr ""
 "a frissítendő bejegyzés hiányzik\n"
 "(valamelyik ezek közül: %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "\"%s\" adatforrás bekapcsolása"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "\"%s\" adatforrás kihagyása"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "\"%s\" adatforrás bekapcsolása"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1813,6 +1976,7 @@ msgstr ""
 "Használat:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1821,31 +1985,38 @@ msgstr ""
 "                   frissített) csomagok kereséséhez\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - fuzzy keresés használata (-y opcióval azonos)\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - az elérhető csomagok listázása\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - az elérhető adatforrások listázása\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - elérhető adatforrások és URL-jeik listázása\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - az elérhető gépek listázása --parallel használata esetén\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - az elérhető párhuzamos aliasok listázása\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
@@ -1853,11 +2024,13 @@ msgstr ""
 "formájában\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - a következő csomag egy forráscsomag (-s opcióval azonos)\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
@@ -1865,13 +2038,15 @@ msgstr ""
 "                   (rendszergazdai jogosultság szükséges)\n"
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - a nem megfelelő architektúrájú RPM-csomagok "
 "lekérdezésének\n"
 "                   engedélyezése\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1879,108 +2054,208 @@ msgstr ""
 "  --use-distrib  - az urpmi menet közben való beállítása egy disztribúciós\n"
 "                   fából; lehetővé teszi egy disztribúció lekérdezését\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - változások listájának megjelenítése\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - összefoglaló megjelenítése\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 "  -c             - teljes információ, az eltávolítandó csomaggal együtt\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - a lekérdezés terjedjen ki a csomagfüggőségekre is\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - a névvel együtt a csoportok is jelenjenek meg\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - hasznos információk kiírása könnyen olvasható formában\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - a csomagban levő fájlok listázása\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
 "                   (alapértelmezés)\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - csomag keresése a szolgáltatásjegyzékben\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 "  -r             - a névvel együtt a verzió és a kiadásszám is jelenjen meg\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - fordított keresés: mi igényli a csomagot\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR            - kiterjesztett fordított keresés (virtuális csomagokban "
 "is)\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - a következő csomag egy forráscsomag (--src opcióval "
 "azonos)\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "  -u             - csomag kihagyása, ha már van újabb verzió telepítve\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 "  -y             - fuzzy keresés használata (--fuzzy opcióval azonos)\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - mint -y, de a kis- és nagybetűket nem különbözteti meg\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  a parancssorban megadott csomagok illetve RPM-fájlok lesznek lekérdezve\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "a --list-nodes csak a --parallel opcióval használható"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "\"%s\" adatforrás kihagyása: nincs fejléclista"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Fájllista nem található\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Változási lista nem található\n"
 
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "az mput sikertelen volt - elképzelhető, hogy egy gép nem elérhető"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr ""
+#~ "a(z) %s gépen az urpme program egyik régebbi verziója van - frissítse"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "az rshp sikertelen volt - elképzelhető, hogy egy gép nem elérhető"
+
+#~ msgid "on node %s"
+#~ msgstr "ezen a gépen: %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Kiterjesztett függőséglista átvitele a gépekre..."
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "Függőségek feloldása a gépeken..."
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Fájlok átvitele a gépekre..."
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Ellenőrzés: lehetséges-e a telepítés a gépeken..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "A telepítés nem sikerült ezen a gépen: %s"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Csomagok telepítése a gépekre..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "az scp sikertelen volt ezen a gépen: %s (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "Kiterjesztett függőséglista átvitele ide: %s..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "Függőségek feloldása itt: %s..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "a(z) %s gépen nincs megfelelő verziójú urpmi program (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Fájlok átvitele ide: %s..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "Ellenőrzés: lehetséges-e a telepítés itt: %s..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Telepítés elvégzése itt: %s..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "%s telepítése itt: %s"
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Telepítés előkészítése itt: %s..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "A függőségek feloldásához a következő csomag telepítésre kerül"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr ""
+#~ "  --probe-synthesis - kiterjesztett függőséglista keresése és "
+#~ "felhasználása\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - fejléclista keresése és felhasználása\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "hiányzó 'with' paraméter a hálózati adatforrásnál\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "ismeretlen opciók: \"%s\"\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "ismeretlen protokoll van definiálva ehhez: \"%s\""
 
diff --git a/po/id.po b/po/id.po
index d858392f..e3068bb5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-12-01 08:54+0700\n"
 "Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
 "Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -23,7 +23,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "Instalasi RPM"
 
@@ -32,7 +33,8 @@ msgstr "Instalasi RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Kesalahan: tidak dapat mencari file %s, membatalkan operasi"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
@@ -86,20 +88,23 @@ msgstr ""
 "\n"
 "Anda dapat menyimpannya. Apakah pilihan anda?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "Install"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Simpan"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Batal"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Pilih lokasi penyimpanan file"
 
@@ -109,18 +114,21 @@ msgid "Unknown option %s"
 msgstr "Opsi %s tidak diketahui"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Tidak ada paket yang ditentukan"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Silahkan menunggu..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Harus sebagai root"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -131,35 +139,42 @@ msgstr ""
 "%s\n"
 "Lanjutkan installasi?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Peringatan"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr "(untuk upgrade)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr "(untuk menginstal)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Pilihan paket"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Salah satu paket berikut dibutuhkan:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Batal"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -170,7 +185,7 @@ msgstr ""
 "%s\n"
 "Lanjutkan installasi?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -180,25 +195,27 @@ msgstr ""
 "Untuk memenuhi ketergantungan, paket %d berikut juga harus diinstal:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Instalasi paket..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "tidak dapat mengambil paket sumber, dibatalkan"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Harap masukkan media bernama \"%s\" ke perangkat [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Mendownload paket `%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -211,8 +228,7 @@ msgstr ""
 "\n"
 "Apakah Anda mau melanjutkan instalasi ?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -223,35 +239,38 @@ msgstr ""
 "%s\n"
 "Anda mungkin perlu meng-update database urpmi Anda"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "menghapus %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Persiapan..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Menginstall paket `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Instalasi gagal"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Selesai"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Semua paket telah terinstal"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Instalasi selesai"
 
@@ -265,18 +284,22 @@ msgstr ""
 "dimana [opsi] dari\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - cetak pesan bantuan ini.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "  --root <lokasi>  - gunakan root yang diberikan /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [grup]     - batasi hasil ke grup yang ditentukan.\n"
 
 #: ../rpm-find-leaves:19
+#, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f             - tampilkan nama lengkap RPM (NVRA)\n"
 
@@ -285,209 +308,128 @@ msgstr "  -f             - tampilkan nama lengkap RPM (NVRA)\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    default pada %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Hanya superuser yang boleh meng-instal paket"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Menjalankan urpmi dalam mode terbatas..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "gagal membuka rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
-msgstr "menemukan header rpm %d pada cache, menghapus header %d yang kadaluarsa"
+msgstr ""
+"menemukan header rpm %d pada cache, menghapus header %d yang kadaluarsa"
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nama file rpm [%s] tak valid"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "mengambil file rpm [%s] ..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...pengambilan selesai"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...pengambilan gagal: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "gagal mengakses file rpm [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "gagal mem-parse file spec %s [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "gagal meregistrasi file rpm"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Arsitektur tidak kompatibel untuk rpm [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "kesalahan meregistrasi paket lokal"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Operasi ini dilarang ketika berjalan dalam mode terbatas"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "deklarasi proxy buruk pada pada perintah baris\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Direktori chroot tidak ada"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Anda harus menjadi root untuk menggunakan --use-distrib"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: tidak dapat membaca file rpm \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Tidak bisa menggunakan %s tanpa %s"
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, fuzzy, c-format
+msgid "Can't use %s with %s"
+msgstr "Tidak bisa menggunakan %s tanpa %s"
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "Terlalu banyak argumen\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "TtNn"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "Yy"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Maaf, pilihan buruk, coba lagi\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "mput gagal, mungkin sebuah node tidak dapat dicapai"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "node %s menggunakan urpmi versi lama, harap melakukan upgrade"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "rshp gagal, mungkin sebuah node tidak dapat dicapai"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "pada node %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Melakukan propaganda sintesis pada node..."
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "Mencari ketergantungan pada node..."
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Mendistribusikan file pada node..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Verifikasi jika install dimungkinkan pada node..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "Installasi gagal pada node %s"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Installasi dimungkinkan"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Menginstall paket pada node..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "scp gagal pada host %s (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "Melakukan propaganda sintesis pada %s"
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "Mencari ketergantungan pada %s..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "host %s tidak memiliki versi urpmi yang baik (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "Mendistribusikan file pada %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "Verifikasi jika install dimungkinkan pada %s..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "Melakukan installasi pada %s..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "Menginstall %s dari %s..."
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "Mempersiapkan installasi pada %s..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -505,42 +447,57 @@ msgstr ""
 "\n"
 "pemakaian:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - cetak pesan bantuan ini.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - seleksi otomatis paket pilihan.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - pastikan apakah penghapusan bisa dilakukan dengan benar.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - paksa instal meski beberapa paket tidak ada.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi tersebar di antara mesin-mesin alias.\n"
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage     - Paket ulang file sebelum menghapus\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - gunakan root lain untuk penghapusan rpm.\n"
 
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - gunakan root lain untuk installasi rpm.\n"
+
+#: ../urpme:52
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts   - tidak menjalankan script paket.\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
@@ -549,74 +506,79 @@ msgstr ""
 "berguna\n"
 "                   untuk meng(un)install chroot dengan opsi --root.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "    --probe-synthesis - gunakan file sintesa.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "    --probe-hdlist - gunakan file hdlist.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - mode verbose.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - mode verbose.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - pilih semua paket yang cocok dengan ekspresi.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Hanya superuser yang diperbolehkan menghapus paket"
 
 #: ../urpme:106
-msgid "unknown package"
+#, c-format
+msgid "unknown packages"
 msgstr "paket tidak dikenal"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
 #: ../urpme:106
-msgid "unknown packages"
+#, c-format
+msgid "unknown package"
 msgstr "paket tidak dikenal"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Paket berikut berisi %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "menghapus paket %s akan merusak sistem Anda"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Tidak ada yang dihapus"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Pengujian untuk menghapus paket berikut"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "Untuk memenuhi ketergantungan, paket %d berikut akan dihapus (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (y/T) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "Menghapus paket-paket %d?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (y/T) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Penghapusan gagal"
 
@@ -638,219 +600,266 @@ msgstr ""
 "pemakaian:\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version         - cetak nomor versi perkakas ini.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - gunakan lingkungan khusus (umumnya laporan kecacatan).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - jangan pakai media yang diberikan, dipisahkan dengan "
 "koma.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 "  --literal, -l  - jangan melakukan pencocokan pola, gunakan argumen  "
 "sebagai string literal.\n"
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - hanya pakai hanya media yang diberikan, dipisahkan koma.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - urutkan media menurut substring yang dipisahkan dengan "
 "koma.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - gunakan sintesa yang diberikan, bukan db urpmi.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - jangan cetak baris identik dua kali.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - hanya pakai media update.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - mode verbose.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - abaikan perbedaan huruf besar/kecil dalam setiap pola.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -I             - menerima perbedaan huruf besar/kecil pada pola "
 "(default).\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - ganti field pemisah (default menjadi ':').\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "Pola ekspresi:\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  teks           - sembarang teks diparsing sebagai regexp, kecuali -l "
 "digunakan.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 "  -e             - sertakan kode perl secara langsung sebagai perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operator AND biner.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operator OR biner.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unary NOT.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )              - tanda kurung kiri dan kanan.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "Daftar tag:\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr ""
 "  --qf            - tentukan sebuah format output yang menyerupai printf\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   contoh: '%%name:%%file'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch          - arsitektur\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - buat host\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - buat waktu\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - file konfigurasi\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - tag konflik tag\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - penjelasan paket\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distribusi\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch          - epoch\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename          - nama file paket\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files             - daftar file yang terdapat pada paket\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - grup\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name          - nama paket\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - tag kadaluarsa\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - pemaket\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - tag yang disediakan\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - tag kebutuhan\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - ukuran yang terinstall\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - nama rpm sumber\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary     - ringkasan\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor      - vendor\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - media dimana paket ditemukan\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - cetak versi, rilis dan arch dengan nama.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 "Format tidak benar: Anda hanya boleh menggunakan satu tag yang bernilai "
 "banyak"
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "mengunakan lingkungan spesifik pada %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -858,11 +867,12 @@ msgstr ""
 "Catatan: karena tidak ada media dan menggunakan hdlist, urpmf tidak dapat "
 "mengembalikan sembarang hasil\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Anda mungkin akan menggunakan --name untuk mencari nama paket.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -879,14 +889,16 @@ msgstr ""
 "\n"
 "pemakaian:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - hanya gunakan media yang diberikan untuk mencari paket "
 "yang dicari.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
@@ -894,23 +906,42 @@ msgstr ""
 "  --auto         - mode non-interaktif, mengasumsikan jawaban default pada "
 "semua pertanyaan.\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - otomatis menyeleksi paket untuk upgrade sistem.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr "  --auto-select  - otomatis menyeleksi paket untuk upgrade sistem.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - nonaktifkan pengujian file MD5SUM.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - paksakan update pada kunci gpg.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 "  --no-uninstall - jangan tanya untuk uninstal paket, batalkan instalasi.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install  - tidak menginstall paket (hanya download).\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -919,7 +950,7 @@ msgstr ""
 "yang\n"
 "                   bisa menghapus paket yang sudah ada.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -931,32 +962,38 @@ msgstr ""
 "                   upgrade lebih banyak daripada yang diberikan,\n"
 "                   standarnya %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - panjang transaksi kecil, standarnya %d.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - lakukan pencarian fuzzy.\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s      - paket berikut adalah paket sumber.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - hanya  instal paket source (tanpa kode biner).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - hapus rpm dari cache sebelum hal-hal yg lain.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - jangan hapus rpm dari cache.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -964,7 +1001,8 @@ msgstr ""
 "  --allow-nodeps - izinkan meminta user untuk menginstal paket tanpa\n"
 "                   menguji ketergantungan.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -972,11 +1010,13 @@ msgstr ""
 "  --allow-force  - izinkan meminta user menginstal paket tanpa\n"
 "                   menguji ketergantungan dan integritas.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - gunakan root lain untuk installasi rpm.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -985,39 +1025,48 @@ msgstr ""
 "berguna\n"
 "                   untuk menginstall chroot dengan opsi --root.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - menggunakan wget untuk mengambil file jauh.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - menggunakan curl untuk mengambil file jauh.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla     - gunakan prozilla untuk mengambil file jauh.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - opsi tambahan untuk dikirimkan ke curl\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options - opsi tambahan untuk dikirimkan ke rsync\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - opsi tambahan untuk dikirimkan ke wget\n"
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - opsi tambahan untuk dikirimkan ke prozilla\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - batasi kecepatan download.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1025,7 +1074,8 @@ msgstr ""
 "  --resume       - lanjutkan transfer dari file yang sudah didownload\n"
 "                   (--no-resume menonaktifkannya, defaultnya nonaktif).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1033,7 +1083,8 @@ msgstr ""
 "  --proxy        - gunakan proxy HTTP tertentu, nomor port dianggap\n"
 "                   1080 secara standar (format <hostproxy[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1042,6 +1093,7 @@ msgstr ""
 "                   (format <user:katakunci>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1050,6 +1102,7 @@ msgstr ""
 "                   arg. berikut.\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1058,6 +1111,7 @@ msgstr ""
 "                   (--no-verify-rpm menonaktifkannya, defaultnya aktif).\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1066,40 +1120,39 @@ msgstr ""
 "dengan benar.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - path pengecualian, dipisah oleh koma.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - pengecualian untuk file dokumentasi.\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - jangan verifikasi ruang diask sebelum installasi.\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch          - ijinkan menginstall rpm dari arsitektur yang tidak "
 "sesuai.\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts   - tidak menjalankan script paket\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - nonaktifkan pengujian file MD5SUM.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - paksakan update pada kunci gpg.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - paket installasi yang harus dilewati\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1107,41 +1160,51 @@ msgstr ""
 "  --more-choices - ketika beberapa paket ditemukan, tampilkan pilihan lain\n"
 "                   dari nilai default.\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock      - jangan kunci database rpm.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - hanya upgrade paket dengan arsitektur yang sama.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - pilih semua yg cocok dengan perintah baris.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - izinkan pencarian pada provides untuk mencari paket.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - jangan cari pada provides untuk mencari paket.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - mode diam.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  nama atau file rpm yang tertera pada perintah baris akan diinstal.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Kesalahan: Tidak bisa menggunakan --auto-select bersama dengan daftar paket.\n"
+msgstr ""
+"Kesalahan: Tidak bisa menggunakan --auto-select bersama dengan daftar "
+"paket.\n"
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
@@ -1150,12 +1213,13 @@ msgstr ""
 "baris\n"
 "bersamaan dengan --bug.\n"
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 "Anda tidak bisa menginstall file rpm biner ketika menggunakan --install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1164,21 +1228,22 @@ msgstr ""
 "Direktori [%s] sudah ada, silahkan gunakan direktori lain untuk laporan bug "
 "atau hapus"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "gagal membuat direktori [%s] untuk laporan bug"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Penyalinan gagal"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "Direktori lingkungan %s tidak ada"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1187,52 +1252,59 @@ msgstr ""
 "Kesalahan: %s tampaknya di-mount sebagai read-only.\n"
 "Gunakan --allow-force untuk memaksa operasi."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "Mengupdate media...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (untuk upgrade)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (untuk upgrade)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (untuk menginstal)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (untuk menginstal)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Pilihan Anda? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Paket berikut tidak bisa diinstal karena mereka bergantung pada paket\n"
+"yang lebih lama dari yang terinstall:\n"
+"%s"
+msgstr[1] ""
 "Paket berikut tidak bisa diinstal karena mereka bergantung pada paket\n"
 "yang lebih lama dari yang terinstall:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1240,58 +1312,80 @@ msgstr ""
 "\n"
 "Lanjutkan installasi?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (Y/t) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Beberapa paket yang diminta tidak dapat diinstall:\n"
+"%s"
+msgstr[1] ""
 "Beberapa paket yang diminta tidak dapat diinstall:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Instalasi tidak dapat dilanjutkan sebab paket berikut harus dihapus\n"
+"agar yang lain dapat di-upgrade:\n"
+"%s\n"
+msgstr[1] ""
 "Instalasi tidak dapat dilanjutkan sebab paket berikut harus dihapus\n"
 "agar yang lain dapat di-upgrade:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
+"%s"
+msgstr[1] ""
 "Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(hanya pengujian, penghapusan tidak akan dilakukan)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "Untuk memenuhi ketergantungan, paket berikut juga akan diinstal"
-
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Untuk memenuhi ketergantungan, paket berikut akan diinstall"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] "Untuk memenuhi ketergantungan, paket berikut juga akan diinstal"
+msgstr[1] "Untuk memenuhi ketergantungan, paket berikut juga akan diinstal"
 
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d paket, %d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1300,88 +1394,106 @@ msgstr ""
 "Anda perlu jadi root untuk menginstall ketergantungan berikut:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(hanya pengujian, installasi tidak akan dilakukan)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "Lanjutkan dengan installasi paket %d? (%d MB)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "Lanjutkan dengan installasi paket %d? (%d MB)"
+msgstr[1] "Lanjutkan dengan installasi paket %d? (%d MB)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Tekan [Enter] jika siap.."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Paket berikut memiliki tandatangan yang cacat"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Paket berikut memiliki tandatangan yang cacat"
+msgstr[1] "Paket berikut memiliki tandatangan yang cacat"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Apakah Anda hendak melanjutkan instalasi ?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "sebarkan %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "menginstall %s dari %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "menginstall %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "Instalasi gagal:"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Mencoba installasi tanpa menguji ketergantungan? (y/T) "
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Mencoba installasi lebih keras (--force)? (y/T) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "transaksi installasi %d gagal"
 
-#: ../urpmi:824
-msgid "Packages are up to date"
-msgstr "Paket-paket sudah update"
-
-#: ../urpmi:827
+#: ../urpmi:828
 #, c-format
-msgid "Packages %s are already installed"
-msgstr "Paket-paket %s telah terinstal"
+msgid "Installation is possible"
+msgstr "Installasi dimungkinkan"
 
-#: ../urpmi:828
+#: ../urpmi:833
 #, c-format
+msgid "Packages are up to date"
+msgstr "Paket-paket sudah update"
+
+#: ../urpmi:840
+#, fuzzy, c-format
 msgid "Package %s is already installed"
-msgstr "Paket %s telah terinstal"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Paket %s telah terinstal"
+msgstr[1] "Paket %s telah terinstal"
+
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Paket-paket %s telah terinstal"
+msgstr[1] "Paket-paket %s telah terinstal"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "jalankan ulang urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1404,44 +1516,54 @@ msgstr ""
 "dan [opsi] dari\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - buat media update.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - coba cari dan gunakan file sintesa.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
+msgstr "    --probe-synthesis - gunakan file sintesa.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - coba cari dan gunakan file hdlist.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
+msgstr "    --probe-hdlist - gunakan file hdlist.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - jangan coba cari file hdlist / sintesa.\n"
 "\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 "  --distrib      - buat semua media dari media instalasi secara otomatis.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - dengan --distrib, menanyakan konfirmasi untuk setiap "
 "media\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 "  --all-media    - dengan --distrib, menambahkan semua media yang terdaftar\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1451,7 +1573,8 @@ msgstr ""
 "defaultnya\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1459,48 +1582,69 @@ msgstr ""
 "  --virtual      - buat media maya yg selalu up-to-date,\n"
 "                   hanya protokol file:// yg diizinkan.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - nonaktifkan pengujian file MD5SUM.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 "  --nopubkey     - jangan import kunci publik dari media yang ditambahkan\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - tambahkan media pada konfigurasi, tetapi jangan update.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - bersihkan direktori cache header.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - paksa pembuatan file hdlist.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mode diam.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - mode verbose.\n"
+
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "gagal mengupdate media \"%s\"\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Hanya superuser yang diijinkan menambahkan media"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Akan menulis file konfigurasi [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Tidak bisa menulis file konfigurasi [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "tidak perlu memberikan <path relatif hdlist> dengan --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1509,16 +1653,17 @@ msgstr ""
 "\n"
 "Apakah Anda hendak menambahkan media '%s'"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<path relatif hdlist> hilang\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "`with' tidak tercantum untuk media jaringan\n"
+#: ../urpmi.addmedia:169
+#, fuzzy, c-format
+msgid "Can't use %s with remote medium"
+msgstr "Tidak bisa menggunakan %s tanpa %s"
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "gagal membuat media \"%s\"\n"
@@ -1541,29 +1686,35 @@ msgstr ""
 "pemakaian:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - tentukan pemaketan ulang dimulai sekarang\n"
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - jangan hapus direktori repackage pada checkpoint\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - mendata transaksi semenjak argumen data/durasi yang "
 "diberikan\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-all   - daftar semua transaksi pada rpmdb (panjang)\n"
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-safe   - daftar semua transaksi semenjak checkpoint\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
@@ -1571,123 +1722,126 @@ msgstr ""
 "  --rollback     - mundur hingga tanggal yang ditentukan,\n"
 "                   atau mundur sejumlah nomor transaksi\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - menonaktifkan pemaketan ulang\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "Tanggal atau durasi [%s] yang tidak valid\n"
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr "Direktori repackage tidak didefinisikan\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "Tidak bisa menulis pada direktori repackage [%s]\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "Membersihkan direktori repackage [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "%d file dihapus\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "Argumen perintah-baris [%s]\n"
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 "Anda tidak bisa menentukan --checkpoint dan --rollback pada waktu yang "
 "bersamaan\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 "Anda tidak bisa menentukan --checkpoint dan --list pada waktu yang "
 "bersamaan\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 "Anda tidak bisa menentukan --rollback dan --list pada waktu yang bersamaan\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "Anda tidak bisa menentukan --disable bersama dengan opsi lain"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "Tidak ada transaksi yang ditemukan semenjak %s\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "Anda harus pengguna root untuk melakukan hal ini"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Menulis file makro rpm [%s] ...\n"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr "Tidak ada tanggal mundur yang ditemukan\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "Mundur hingga %s...\n"
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr "Menonaktifkan pemaketan ulang\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"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 yang akan dihapus.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - pilih semua media.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - pencocokan fuzzy pada nama media.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opsi tak dikenal '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Hanya superuser yang diijinkan menghapus media"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "tidak ada yang dihapus (gunakan urpmi.addmedia untuk menambah media)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1697,6 +1851,7 @@ msgstr ""
 "(satu dari %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1705,31 +1860,47 @@ msgstr ""
 "<nama> adalah media yan akan di-update.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - update hanya media update.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - paksakan update pada kunci gpg.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - jangan update, tandai media sebagai ignored.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - jangan update, tandai media sebagai enabled.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - pilih semua media non-removable.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - paksa pembuatan file hdlist.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Hanya superuser yang diijinkan mengupdate media"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "tidak ada yang diupdate (pakailah urpmi.addmedia untuk menambah media)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1738,21 +1909,21 @@ msgstr ""
 "masukan update hilang\n"
 "(satu dari %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "mengaktifkan media media %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "Mengabaikan media %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "mengaktifkan media media %s"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1771,6 +1942,7 @@ msgstr ""
 "pemakaian:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1779,52 +1951,63 @@ msgstr ""
 "paket yang dicari (atau update)\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - lakukan pencarian fuzzy (sama dengan -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - daftar paket tersedia.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - daftar media tersedia.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   - daftar media tersedia dan urlnya.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - daftar node tersedia saat menggunakan --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - daftar alias paralel.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - dump konfigurasi dalam bentuk argumen urpmi.addmedia.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - paket berikut adalah paket sumber (sama dg -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - beri semua paket source sebelum download (hanya only).\n"
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch          - ijinkan untuk query rpm untuk arsitektur yang "
 "tidak sesuai.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1832,104 +2015,201 @@ msgstr ""
 "  --use-distrib  - konfigurasikan urpmi secara langsung dari pohon distrib.\n"
 "                   Hal ini mengijinkan query distro.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - cetak changelog.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S       - cetak ringkasan.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - keluaran lengkap dengan paket yang akan dihapus.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - perluas pencarian ke ketergantungan paket.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - cetak grup dengan nama.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - cetak informasi dalam format yang mudah dibaca.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - daftar file pada paket.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - jangan cari di provides untuk mencari paket (default).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - cari di provides untuk mencari paket.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - cetak versi dan rrilis dengan nama.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 "  -R             - pencarian terbalik untuk mencari apa yang membutuhkan "
 "paket.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR             - pencarian terbalik yang diperluas (termasuk paket "
 "virtual).\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - paket berikut adalah paket sumber (sama dengan --src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "  -u             - hapus paket jika versi yang lebih baru telah terinstal.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - seperti -y, tetapi memaksa untuk mencocokan case-"
 "insensitif.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  nama atau file rpm yang diberikan pada perintah baris dikirimkan.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes hanya dapat dipakai dengan --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "mengabaikan media %s: tidak ada hdlist"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Tidak ada filelist yang ditemukan\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Changelog tidak ditemukan\n"
 
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "mput gagal, mungkin sebuah node tidak dapat dicapai"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr "node %s menggunakan urpmi versi lama, harap melakukan upgrade"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "rshp gagal, mungkin sebuah node tidak dapat dicapai"
+
+#~ msgid "on node %s"
+#~ msgstr "pada node %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Melakukan propaganda sintesis pada node..."
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "Mencari ketergantungan pada node..."
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Mendistribusikan file pada node..."
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Verifikasi jika install dimungkinkan pada node..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Installasi gagal pada node %s"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Menginstall paket pada node..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "scp gagal pada host %s (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "Melakukan propaganda sintesis pada %s"
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "Mencari ketergantungan pada %s..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "host %s tidak memiliki versi urpmi yang baik (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Mendistribusikan file pada %s..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "Verifikasi jika install dimungkinkan pada %s..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Melakukan installasi pada %s..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "Menginstall %s dari %s..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Mempersiapkan installasi pada %s..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "Untuk memenuhi ketergantungan, paket berikut akan diinstall"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - coba cari dan gunakan file sintesa.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - coba cari dan gunakan file hdlist.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "`with' tidak tercantum untuk media jaringan\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "opsi tak dikenal '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "protokol tidak dikenal didefinisikan untuk %s"
 
diff --git a/po/is.po b/po/is.po
index 658be431..693af1ae 100644
--- a/po/is.po
+++ b/po/is.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-08-18 01:19+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -19,7 +19,8 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "RPM innsetning"
 
@@ -28,7 +29,8 @@ msgstr "RPM innsetning"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Villa: finn ekki skrá %s, mun stöðva aðgerð"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "Í _lagi"
 
@@ -84,20 +86,23 @@ msgstr ""
 "\n"
 "Þú vilt kannski frekar aðeins vista pakkana. Hvað velur þú?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "Setja _upp"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "Vi_sta"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "Hætta _við"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Veldu stað til að vista skrá"
 
@@ -107,18 +112,21 @@ msgid "Unknown option %s"
 msgstr "óþekktur valkostur %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Engir pakkar tilgreindir"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Vinsamlega bíðið..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Verður að vera root"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -129,35 +137,42 @@ msgstr ""
 "%s\n"
 "Halda samt áfram með uppsetningu?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Í lagi"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Aðvörun"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Í lagi"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (til að uppfæra)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (til að setja inn)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Pakkaval"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Hætta við"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -168,7 +183,7 @@ msgstr ""
 "%s\n"
 "Halda samt áfram með uppsetningu?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -178,25 +193,27 @@ msgstr ""
 "Til að viðhalda samræmi verða eftirtaldir %d pakkar settir inn:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Pakka innsetning..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Get ekki sótt frumpakka, hætti við"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vinsamlega settu inn %s %s"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Sæki pakka `%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -209,8 +226,7 @@ msgstr ""
 "\n"
 "Viltu halda áfram innsetningu ?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -221,35 +237,38 @@ msgstr ""
 "%s\n"
 "Þú ættir sennilega að uppfæra urpmi gagnagrunninn"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "fjarlægi %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Undirbý..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Set inn pakka `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Innsetning brást"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Lokið"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Allt er nú þegar komið inn"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Innsetningu lokið"
 
@@ -263,19 +282,22 @@ msgstr ""
 "þar sem [valkostir] eru eftirfarandi\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - prenta þetta.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <path>  - nota uppgefna rót í stað /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [group]     - takmarka niðurstöður við ákveðinn hóp.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - prenta hópa með nafni líka.\n"
 
@@ -284,210 +306,127 @@ msgstr "  -g             - prenta hópa með nafni líka.\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    sjálfgefið er %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Aðeins kerfisstjóri hefur leyfi til að setja inn pakka"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Keyri urpmi í vernduðum ham..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "gat ekki opnað rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ógilt rpm skráarnafn [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "sæki rpm skrá [%s] ..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...niðurhali lokið"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...mistókst að sækja: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "get ekki lesið rpm skrá [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "get ekki unnið úr spec skrá %s [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "gat ekki skráð rpm skrá"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "ósamhæfður vélbúnaður fyrir rpm [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "villa við að skrá staðbundna pakka"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Þessi aðgerð er bönnuð þegar keyrt er í vernduðum ham"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "röng selskilgreining á skipanalínu\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
-#, fuzzy
+#: ../urpm/args.pm:133
+#, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Umhverfismappa %s er ekki til"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Þú verður að vera kerfisstjóri til að nota --use-distrib"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: get ekki lesið rpm skrá \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, c-format
+msgid "Can't use %s with %s"
+msgstr ""
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "Of mörg viðföng\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "Nn"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Slæmt val.  Reyndu aftur\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "tókst ekki að nota mput, kannski er hnútpuntur ekki tengdur"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "hnútpunktur %s er með gamla útgáfu af urpme, vinsamlega uppfærið"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "tókst ekki að nota rshp, kannski er hnútpuntur ekki tengdur"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "á hnútpunkti %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Flyt samantektar-skrá yfir á hnútpunkta..."
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "Athuga hvað er háð hverju á hnútpunktum..."
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Dreifi skrám til hnútpunkta..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Staðfesti að uppsetning sé möguleg á öllum hnútpunktum..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "Innsetning brást á hnútpunkti %s"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Innsetning er möguleg"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Set inn pakka á hnútpunktum..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "scp mistókst á vél %s (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "Flyt samantektar-skrá yfir á %s..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "Athuga hvað er háð hverju á %s..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "vél %s er ekki með nothæfa útgáfu af urpmi (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "Dreifi skrám til %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "Staðfesti að uppsetning sé möguleg á %s..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "Pakka innsetning á %s..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "Set inn %s á %s..."
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "Undirbý innsetningu á %s..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -504,41 +443,56 @@ msgstr ""
 "\n"
 "notkun:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - prenta þetta.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - velja sjálfvirkt pakka í vali.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - staðfesta að hægt sé að fjarlægja umbeðna pakka.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - þvinga uppsetningu þó sumir pakkar séu ekki til.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - dreifð urpmi yfir samnefndar vélar.\n"
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Endur-pakka skrám áður en eytt\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - nota aðra rót til að fjarlægja rpm.\n"
 
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - Nota aðra rót fyrir rpm uppsetningu.\n"
+
+#: ../urpme:52
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - ekki keyra uppsetninga-skriftur í pakka.\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
@@ -546,77 +500,80 @@ msgstr ""
 "  --use-distrib  - stilla urpme frá dreifingartrénu, gott að nota\n"
 "                   til að setja inn/fjarlægja chroot með --root valkostnum.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - reyna að finna og nota samantektar-skrá.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - reyna að finna og nota hdlist skrá.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - ítarlegri hamur.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - ítarlegri hamur.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - velja alla pakka sem passa við segð.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Aðeins kerfisstjóri hefur leyfi til að fjarlægja pakka"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "Óþekktur pakki"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "óþekktir pakkar"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "Óþekktur pakki"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Eftirfarandi pakkar innihalda %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "ef pakki %s er fjarlægður raskast uppsetning kerfisins"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Ekkert til að fjarlægja"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Forathugun við að fjarlægja eftirtalda pakka"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "Til að viðhalda samræmi, verða eftirtaldir %d pakkar fjarlægðir (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (J/n) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "Fjarlæga %d  pakka?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (J/n) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Mistókst að fjarlægja"
 
@@ -637,224 +594,272 @@ msgstr ""
 "notkun: urpmf [valkostir] mynstur\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - prenta útgáfunúmer þessa tóls.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - nota tiltekið umhverfi (yfirleitt vegna "
 "villutilkynninga).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - nota ekki uppgefna miðla, aðskildir með kommum.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 "  --literal, -l  - ekki leita að mynstrum, nota viðfang sem uppgefinn "
 "ákveðinn texta.\n"
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - nota aðeins uppgefna miðla, aðskildir með kommum.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - raða miðlum eftir undirstrengjum, aðskildir með kommum.\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - nota gefna samantektar-skrá í stað urpmi gagnagrunns.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - ekki prenta tvíteknar línur.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - nota aðeins uppfærslu-miðil.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - ítarlegri hamur.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - hunsa stafastærð í samanburði allra mynstra.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -I             - virða stafastærð í samanburði allra mynstra "
 "(sjálfgefið).\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - breyta svæðis-skila-staf (sjálfgefið ':').\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mynstursegðir:\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - allur texti er meðhöndlaður sem regluleg segð, nema -l sé "
 "notað.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - innifela perl kóða beint sem perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - tvíundarvirki OG.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - tvíundarvirki EÐA.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - formerki EKKI.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - vinstri og hægri svigar.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "Listi af tögum:\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - tilgreina printf-líkt úttakssnið\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   example: '%%nafn:%%skrár'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - vélbúnaðartegund\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - byggt á vél.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - hvenær byggt\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - uppsetningaskrár\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - ósamræmanleg tög\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - lýsing pakka.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - dreifing\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - tímapunktur.\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - skráarnafn pakka\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - listi af skrám sem eru í pakkanum\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - hópur.\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - pakkanafn.\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - úreldir\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - pakkað af\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - hvað er skaffað.\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - þarfnast\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - stærð.\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - frumrpm.\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - samantekt\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - slóð.\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - útgefandi\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - miðillinn sem innihélt pakkann\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - prenta útgáfu, undirnúmer og vélartegund með nafni.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Ógilt snið: þú mátt aðeins nota eitt fjölgildis-tag"
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "nota tilgreint umhverfi á %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr ""
 "Athugið: þar sem enginn miðill notar hdlist skrá, þá fann urpmf ekki neitt\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Þú vilt kannski nota --name til að leita að pakkanöfnum.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -870,14 +875,16 @@ msgstr ""
 "\n"
 "notkun:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - nota aðeins uppgefin miðil til að leita að umbeðnum "
 "pökkum.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
@@ -885,12 +892,29 @@ msgstr ""
 "  --auto         - ekki gagnvirkur hamur, gera ráðfyrir sjálfgefnum svörum "
 "við spurningum.\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - velja sjálfkrafa pakka til að uppfæra kerfið.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr "  --auto-select  - velja sjálfkrafa pakka til að uppfæra kerfið.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - aftengja MD5SUM skráarathugun.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - þvinga uppfærslu á gpg lykli.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -898,11 +922,13 @@ msgstr ""
 "  --no-uninstall - aldrei biðja um að eyða uppsettum pakka, hætta við "
 "uppsetningu.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - ekki setja inn pakka (aðeins sækja)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -911,7 +937,7 @@ msgstr ""
 "sem\n"
 "                   leiða til að núverandi pakkar séu fjarlægðir.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -922,33 +948,39 @@ msgstr ""
 "                   verður settur inn eða uppfærður,\n"
 "                   sjálfgefið er %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - litlar færslulengdir, sjálfgefið er %d.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - framkvæma loðna leit.\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src          - næsti pakki er frumkóða-pakki.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - setja aðeins inn frumkóða-pakka (engin forþýdd forrit).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - fjarlægja rpm úr biðminni áður en annað er gert.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - ekki hreinsa rpm pakka úr biðminni.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -956,7 +988,8 @@ msgstr ""
 "  --allow-nodeps - leyfa uppsetningu pakka án þess að athuga hvort\n"
 "                   það vanti tengda pakka eða pakkar rekist á.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -964,11 +997,13 @@ msgstr ""
 "  --allow-force  - leyfa notanda að setja upp pakka án þess að athuga\n"
 "                   tengda pakka eða staðfesta uppruna.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - Nota aðra rót fyrir rpm uppsetningu.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -976,41 +1011,48 @@ msgstr ""
 "  --use-distrib  - stilla urpmi frá dreifingartrénu, gott að nota\n"
 "                   til að setja inn chroot með --root valkostnum.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - nota wget til að sækja fjarlægar skrár.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - Nota curl til að ná í skrár.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - Nota curl til að ná í skrár.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - aukalegir valkostir fyrir curl forritið\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- aukalegir valkostir fyrir rsync forritið\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - aukalegir valkostir fyrir wget forritið\n"
 
 #: ../urpmi:127
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --curl-options - aukalegir valkostir fyrir curl forritið\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - takmarka hraða niðurhals.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1019,7 +1061,8 @@ msgstr ""
 "hluta\n"
 "                   (--no-resume - sem er sjálfgefið - aftengir þetta).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1027,7 +1070,8 @@ msgstr ""
 "  --proxy        - nota tilgreint HTTP sel, gáttin er sjálfgefin 1080\n"
 "                   (sniðið er <sel[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1036,6 +1080,7 @@ msgstr ""
 "                   að auðkenna (snið er <user:password>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1044,6 +1089,7 @@ msgstr ""
 "                   í næsta viðfangi.\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1053,46 +1099,46 @@ msgstr ""
 "pakka).\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - aðeins athuga hvort uppsetning muni takast.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - undanskilja slóðir, aðskildar með kommu.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - undanskilja doc skrár (handbækur).\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - ekki athuga með diskpláss fyrir uppsetningu.\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - leyfa uppsetningu á rpm pökkum fyrir aðra "
 "vélbúnaðartegund.\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - ekki keyra uppsetninga-skriftur í pakka\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - aftengja MD5SUM skráarathugun.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - þvinga uppfærslu á gpg lykli.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - pakkar sem ætti að sleppa uppsetningu\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1101,43 +1147,51 @@ msgstr ""
 "en\n"
 "                   venjulega.\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - ekki læsa rpm gagnagrunni.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - uppfæra aðeins pakka með sömu vélbúnaðartegund.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - velja allt sem passar á skipanalínu.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - leyfa leit í 'skaffar' (provides) til að finna pakka.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - ekki leita í 'skaffar (provides) til að finna pakka.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - hljóður hamur.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  nöfn eða rpm skrár sem eru tilgreindar á skipanalínunni verða sett inn.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
@@ -1146,11 +1200,12 @@ msgstr ""
 "skipanalínu\n"
 "ásamt --bug.\n"
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Þú getur ekki sett inn vélamáls-rpm pakka þegar notað er --install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1159,21 +1214,22 @@ msgstr ""
 "Mappan [%s] er þegar til, vinsamlega notið aðra möppu fyrir villutilkynningu "
 "eða eyðið möppunni"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Get ekki búið til möppu [%s] fyrir villu-tilkynningu"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Afritun brást"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "Umhverfismappa %s er ekki til"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1182,52 +1238,59 @@ msgstr ""
 "Villa: %s virðist vera tengt aðeins til lestrar.\n"
 "Notaðu --allow-force til að þvinga aðgerð."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "Uppfæri miðil...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (til að uppfæra)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (til að uppfæra)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (til að setja inn)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (til að setja inn)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Hvað velur þú? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Eftirfarandi pakka er ekki hægt að setja upp því þeir eru háðir pökkum\n"
+"sem eru eldri en þeir sem eru uppsettir:\n"
+"%s"
+msgstr[1] ""
 "Eftirfarandi pakka er ekki hægt að setja upp því þeir eru háðir pökkum\n"
 "sem eru eldri en þeir sem eru uppsettir:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1235,58 +1298,80 @@ msgstr ""
 "\n"
 "Halda samt áfram með uppsetningu?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Ekki er hægt að setja inn suma umbeðna pakka:\n"
+"%s"
+msgstr[1] ""
 "Ekki er hægt að setja inn suma umbeðna pakka:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Uppsetningin getur ekki haldið áfram því að eftirfarandi pakka þarf\n"
+"að fjarlægja til að uppfæra aðra:\n"
+"%s\n"
+msgstr[1] ""
 "Uppsetningin getur ekki haldið áfram því að eftirfarandi pakka þarf\n"
 "að fjarlægja til að uppfæra aðra:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\n"
+"%s"
+msgstr[1] ""
 "Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(aðeins prófun, ekkert verður í raun fjarlægt)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "Til að viðhalda samræmi, verða eftirtaldir pakkar settir inn"
-
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Til að viðhalda samræmi, verður eftirfarandi pakki settur inn"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] "Til að viðhalda samræmi, verða eftirtaldir pakkar settir inn"
+msgstr[1] "Til að viðhalda samræmi, verða eftirtaldir pakkar settir inn"
 
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d pakkar, %d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1296,89 +1381,106 @@ msgstr ""
 "pakka:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(aðeins prófun, ekkert verður sett inn í raun)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "Halda áfram með uppsetningu á pökkunum %d? (%d MB)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "Halda áfram með uppsetningu á pökkunum %d? (%d MB)"
+msgstr[1] "Halda áfram með uppsetningu á pökkunum %d? (%d MB)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Sláðu á ENTER þegar tilbúinn..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Eftirfarandi pakkar eru með gallaðar undirskriftir"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Eftirfarandi pakkar eru með gallaðar undirskriftir"
+msgstr[1] "Eftirfarandi pakkar eru með gallaðar undirskriftir"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Viltu halda áfram með uppsetningu ?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "miðla %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "set inn %s frá %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "Set inn %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "Innsetning brást:"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Prófa innsetningu án þess að athuga hvaða skrár þarf? (j/N) "
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Prófa sterkari innsetningu (--force)? (j/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d Innsetningarfærslur brugðust"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "Innsetning er möguleg"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Allt er nú þegar komið inn"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Allt er nú þegar komið inn"
+msgstr[1] "Allt er nú þegar komið inn"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Allt er nú þegar komið inn"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Allt er nú þegar komið inn"
+msgstr[1] "Allt er nú þegar komið inn"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "endurræsi urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1401,42 +1503,52 @@ msgstr ""
 "og [valkostir] eru\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - búa til uppfærslumiðil.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - reyna að finna og nota samantektar-skrá.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - reyna að finna og nota hdlist skrá.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - ekki reyna að finna né nota neina hdlist eða\n"
 "                   samantektar-skrá.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 "  --distrib      - sjálfvirkt búa til alla miðla frá dreifingarmiðli.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - með --distrib, biðja um staðfestingu fyrir hvern miðil\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media     - með --distrib, bæta við öllum listuðum miðlum.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1446,7 +1558,8 @@ msgstr ""
 "slóð er\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1454,48 +1567,69 @@ msgstr ""
 "  --virtual      - búa til sýndarmiðil sem þarf aldrei að uppfæra,\n"
 "                   aðeins file:// reglan er leyfð.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - aftengja MD5SUM skráarathugun.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 "  --nopubkey     - ekki flytja inn dulritunar-lykil fyrir viðbættan miðil\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - bæta miðlinum við uppsetningu, en ekki uppfæra hann.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - hreinsa hausa í biðminnis-möppu.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - þvinga gerð hdlist skráa.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - hljóður hamur.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - ítarlegri hamur.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "gat ekki uppfært miðil \"%s\"\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Aðeins kerfisstjóra (root) er heimilt að bæta við miðli"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Bý til uppsetningarskrá [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Get ekki búið til uppsetningaskrá [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "engin þörf á að gefa upp <slóð að hdlist> með --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1504,16 +1638,17 @@ msgstr ""
 "\n"
 "Viltu bæta við miðli '%s'"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<slóð að hdlist> vantar\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "`with' vantar fyrir net-miðil\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "gat ekki búið til miðil \"%s\"\n"
@@ -1535,28 +1670,34 @@ msgstr ""
 "notkun:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - setja endurpökkunar ræsipunkt hér\n"
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - ekki hreinsa endurpökkunar-möppu við mörkun.\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - lista færslur síðan uppgefin dagsetning eða tímabil\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-all     - lista allar færslur í rpmdb (langur listi).\n"
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-all     - lista allar færslur síðan mörkun.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
@@ -1564,119 +1705,122 @@ msgstr ""
 "  --rollback     - snúa til baka til ákveðinnar dagsetningar\n"
 "                   eða snúa til baka ákveðin fjölda færslna\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - slökkva á endurpökkun\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "Ógild dagsetning eða tímabil [%s]\n"
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr "Endurpökkunarmappa ekki skilgreind\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "Get ekki skrifað í endurpökkunarmöppu [%s]\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "Hreinsa upp endurpökkunarmöppu [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "%d skrár fjarlægðar\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "Aukaleg viðföng í skipanalínu [%s]\n"
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr "Þú getur ekki tilgreint --checkpoint og --rollback á sama tíma\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr "Þú getur ekki tilgreint --checkpoint og --list á sama tíma\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "Þú getur ekki tilgreint --rollback og --list á sama tíma\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "Þú getur ekki tilgreint --disable með öðrum valkostum"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "Engin færsla fundin síðan %s\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "Þú verður að vera kerfisstjóri til að gera þetta"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Skrifa rpm skriftu-skrá [%s] ...\n"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr "Engin dagsetning fannst sem hægt er að snúa til\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "Snúa til baka að %s...\n"
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr "Aftengja endurpökkun\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "notkun: urpmi.removemedia [-a] <nafn> ...\n"
 "þar sem  <nafn> er nafn á miðli sem á að fjarlægja.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - velja alla miðla.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - loðið val á nöfnum miðla.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"óþekktir valkostir '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Aðeins kerfisstjórar hafa leyfi til að fjarlægja miðil"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "ekkert til að fjarlægja (notaðu urpmi.addmedia til að bæta við miðli)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1686,6 +1830,7 @@ msgstr ""
 "(ein af %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1694,30 +1839,46 @@ msgstr ""
 "þar sem  <nafn> er nafn á miðli sem á að uppfæra.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - uppfæra aðeins uppfærslumiðil.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - þvinga uppfærslu á gpg lykli.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - ekki uppfæra, merkja miðilinn sem hunsaðann.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - ekki uppfæra, merkja miðilinn sem virkan.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - velja alla óútskiptanlega miðla.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - þvinga gerð hdlist skráa.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Aðeins kerfisstjórar mega bæta við miðli"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ekkert til að uppfæra (notaðu urpmi.addmedia til að bæta við miðli)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1726,21 +1887,21 @@ msgstr ""
 "færsluna sem á að uppfæra vantar\n"
 "(ein af %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "virkja miðil %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "hunsa miðil %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "virkja miðil %s"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1758,6 +1919,7 @@ msgstr ""
 "notkun:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1766,40 +1928,49 @@ msgstr ""
 "uppfærðum) pakka.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - framkvæma loðna leit (sama og -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - lista tiltæka pakka.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - lista tiltæka miðla.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - lista tiltæka miðla og slóðir að þeim.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - lista tiltæka hnútpunkta þegar notað er --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - lista tiltæk samhliða samheiti.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - sýna uppsetninguna sem urpmi.addmedia viðfang.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - næsti pakki er frumkóða-pakki (sama og -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
@@ -1807,11 +1978,13 @@ msgstr ""
 "kerfisstjóri - root).\n"
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - leyfa fyrirspurn eftir rpm pökkum fyrir annan vélbúnað.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1819,100 +1992,197 @@ msgstr ""
 "  --use-distrib  - stilla urpmi eftir dreifingartré.\n"
 "                   Þetta leyfir fyrirspurnir í dreifingar.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - prenta breytingasögu.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - prenta samantekt.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - heildarúttak með pökkum sem á að fjarlægja.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - útvíkka fyrirspurn til pakka sem eru háðir.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - prenta hópa með nafni líka.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - prenta nytsamar upplýsingar á læsilegu sniði.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - lista skrár í pakka.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - ekki leita í 'skaffar' (provides) til að finna pakka "
 "(sjálfgefið).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - leita í 'skaffar' (provides) til að finna pakka.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - prenta útgáfu og undirnúmer líka með nafni.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 "  -R             - snúa við skilgreindum leitarskilyrðum um hvaða pakka er "
 "þörf.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -RR            - öflugri öfug leit (innifelur sýndarpakka).\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - næsti pakki er frumkóða-pakki (sama og --src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "  -u             - fjarlægja pakka aðeins ef nýrri útgáfa er þegar uppsett.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - framkvæma loðna leit (sama og --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - eins og -y, en þvingar leit óháð stafastærð.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  leitað er að nöfnum eða rpm skrám sem skrifaðar eru á skipanalínu.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes er aðeins hægt að nota með --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "sleppi miðli %s: engin hdlist skrá"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Engir skráarlistar fundust\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Enginn breytilisti fannst\n"
 
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "tókst ekki að nota mput, kannski er hnútpuntur ekki tengdur"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr "hnútpunktur %s er með gamla útgáfu af urpme, vinsamlega uppfærið"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "tókst ekki að nota rshp, kannski er hnútpuntur ekki tengdur"
+
+#~ msgid "on node %s"
+#~ msgstr "á hnútpunkti %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Flyt samantektar-skrá yfir á hnútpunkta..."
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "Athuga hvað er háð hverju á hnútpunktum..."
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Dreifi skrám til hnútpunkta..."
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Staðfesti að uppsetning sé möguleg á öllum hnútpunktum..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Innsetning brást á hnútpunkti %s"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Set inn pakka á hnútpunktum..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "scp mistókst á vél %s (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "Flyt samantektar-skrá yfir á %s..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "Athuga hvað er háð hverju á %s..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "vél %s er ekki með nothæfa útgáfu af urpmi (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Dreifi skrám til %s..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "Staðfesti að uppsetning sé möguleg á %s..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Pakka innsetning á %s..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "Set inn %s á %s..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Undirbý innsetningu á %s..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "Til að viðhalda samræmi, verður eftirfarandi pakki settur inn"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - reyna að finna og nota samantektar-skrá.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - reyna að finna og nota hdlist skrá.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "`with' vantar fyrir net-miðil\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "óþekktir valkostir '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "óþekkt samskiptaregla skilgreind fyrir %s"
 
diff --git a/po/it.po b/po/it.po
index 3334b2c5..2489212d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-11-12 11:03+0100\n"
 "Last-Translator: Andrea Celli <a.celli@caltanet.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -25,7 +25,8 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "Installazione RPM"
 
@@ -34,7 +35,8 @@ msgstr "Installazione RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Errore: non riesco a trovare %s, annullo l'operazione"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
@@ -89,20 +91,23 @@ msgstr ""
 "\n"
 "Potresti preferire salvarlo. Qual è la tua scelta? "
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Installa"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Salva"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Cancella"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Scegli dove salvare i file"
 
@@ -112,18 +117,21 @@ msgid "Unknown option %s"
 msgstr "Opzione sconosciuta %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Nessun pacchetto selezionato"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Per favore attendi..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Devi essere root"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -134,35 +142,42 @@ msgstr ""
 "%s\n"
 "Continuare?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Attenzione"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr "(da aggiornare)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (da installare)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Scelta dei pacchetti..."
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "È richiesto uno dei seguenti pacchetti:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Interrompi"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -173,7 +188,7 @@ msgstr ""
 "%s\n"
 "Continuare?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -183,26 +198,28 @@ msgstr ""
 "Per soddisfare le dipendenze, saranno installati i seguenti %d pacchetti :\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Installazione dei pacchetti..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "non riesco a recuperare il pacchetto sorgente, interrompo"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 "Per favore inserisci il supporto denominato \"%s\" nel dispositivo [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Download del pacchetto `%s'..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -215,8 +232,7 @@ msgstr ""
 "\n"
 "Vuoi proseguire con l'installazione?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -227,35 +243,38 @@ msgstr ""
 "%s\n"
 "Potresti voler aggiornare il tuo database di urpmi"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "rimozione di %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "In preparazione..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Installazione fallita"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Fatto"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "È già tutto installato"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Installazione completata"
 
@@ -269,19 +288,22 @@ msgstr ""
 "dove le [opzioni] sono\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - stampa questo messaggio di aiuto.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <percorso>  - utilizza la root specificata invece di /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "  -g [gruppo]     - restringe i risultati ad un determinato gruppo.\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - stampa i gruppi anche col nome.\n"
 
@@ -290,210 +312,127 @@ msgstr "  -g             - stampa i gruppi anche col nome.\n"
 msgid "                    defaults to %s.\n"
 msgstr "           predefinito: %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Solo superuser è abilitato ad installare pacchetti"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Eseguo urpmi in modalità \"restricted\""
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "non riesco ad aprire il database rpm"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nome del file rpm non valido [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "recupero il file rpm [%s] ..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...recupero terminato"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...recupero fallito: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "non riesco ad accedere al file rpm [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "non riesco ad effettuare il parsing di \"%s\" nel file [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "impossibile registrare il file rpm"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Architettura incompatibile per il file rpm [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "errore durante la registrazione dei pacchetti locali"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Quest'operazione non è consentita in modalità \"restricted\""
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "errata dichiarazione di proxy usando la linea di comando\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
-#, fuzzy
+#: ../urpm/args.pm:133
+#, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "La directory %s, specificata nelle variabili d'ambiente, non esiste"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Devi essere root per usare --use-distrib"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: non posso leggere il file rpm \"%s\"\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, c-format
+msgid "Can't use %s with %s"
+msgstr ""
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "Troppi argomenti\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "Nn"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "SsYy"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Spiacente, scelta errata, prova di nuovo\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "mput è fallito, probabilmente il nodo non è raggiungibile"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "il nodo %s ha una versione vecchia di urpme; aggiornala per favore"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "rshp è fallito, probabilmente il nodo non è raggiungibile"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "sul nodo %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Mando sysnthesis ai nodi"
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "Risolvo le dipendenze sui nodi"
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Distribuisco i file ai nodi"
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Verifico se è possibile l'installazione sui nodi..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "Installazione fallita sul nodo %s"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "L'installazione è possibile"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Sto installando i pacchetti sui nodi..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "scp fallito sull'host %s(%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "Mando sysnthesis al nodo %s"
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "Risolvo le dipendenze su %s"
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "l'host %s non ha una versione valida di urpmi (%d"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "Distribuisco i file a %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "Verifico se l'installazione è possibile su %s..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "Installazione su %s..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "installazione di %s da %s"
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "Preparo l'installazione su %s..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -511,45 +450,62 @@ msgstr ""
 "\n"
 "utilizzo:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - stampa questo messaggio di aiuto.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - include automaticamente un pacchetto nelle scelte.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - verifica se la rimozione possa avvenire correttamente.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - forza l'esecuzione anche se alcuni pacchetti non "
 "esistono.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi distribuito fra varie macchine.\n"
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage     - Ri-pacchetta i file prima della cancellazione.\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - usa un'altra root per rimuovere i file rpm. \n"
 
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - cambia la directory di root per installare i file rpm "
+"\"chrooted\".\n"
+
+#: ../urpme:52
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts   - non esegue gli script presenti nei pacchetti.\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
@@ -559,79 +515,82 @@ msgstr ""
 "                   per (dis)installare un pacchetto chroot con l'opzione --"
 "root.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - cerca e usa il file synthesis.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - prova ad usare un altro file hdlist.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modalità prolissa.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - modalità prolissa.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - seleziona tutti i pacchetti che soddisfano "
 "l'espressione.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Solo superuser è abilitato a rimuovere pacchetti"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "pacchetto sconosciuto"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "pacchetti sconosciuti"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pacchetto sconosciuto"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "I seguenti pacchetti contengono %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "la rimozione del pacchetto %s comprometterà il sistema"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Niente da rimuovere"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Controllo la rimozione dei seguenti pacchetti"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "Per soddisfare le dipendenze, saranno rimossi i seguenti pacchetti %d (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "Rimuovo il pacchetto %d?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Rimozione fallita"
 
@@ -653,214 +612,261 @@ msgstr ""
 "uso:\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version         - stampa la versione di questo tool.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - usa un ambiente specifico (tipicamente un bug report).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - non usa i supporti elencati, separati da virgole.\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 "--literal, -l  - non confronta i pattern, usa l'argomento come stringa "
 "letterale.\n"
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - usa solo i supporti nella lista, separati da virgole.\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - ordina i supporti in base alle sottostringhe separate da "
 "virgole\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - utilizza la synthesis specificata invece del db urpmi.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - non stampa le linee uguali.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "--update       - usa solo supporti di aggiornamento.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modalità prolissa.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - ignora la distinzione tra maiuscole/minuscole in "
 "qualsiasi pattern.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -I             - confronta i pattern distinguendo maiuscole/minuscole .\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "-F<str>       - cambia il separatore di campo (default ':').\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "Pattern expressions:\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "-text        - il testo è usato come regexp, se non viene specificato -l.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - include il codice perl direttamente come perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operatore binario AND.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operatore binario OR.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - NOT unario.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "(  )              - parentesi destra e sinistra.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "Elenco dei tag\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf            - specifica un formato di output simile a printf\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "           esempio: '%%name:%%files'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch          - architettura.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - mostra il nome dell'host\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "--buildtime     - data di compilazione\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "--conffiles    - file di configurazione\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - conflitti\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - descrizione del pacchetto.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "--distribution - distribuzione\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch          - epoca di compilazione.\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename           - nome dei pacchetti.\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "--files         - elenca i file presenti in un pacchetto.\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - gruppo \n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name           -  nome dei pacchetti.\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - lista di quanto reso obsoleto dal pacchetto.\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - curatore del pacchetto.\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - elementi forniti dal pacchetto.\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - requisiti necessari per installare il pacchetto.\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          -  dimensione del pacchetto installato.\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - nome dei pacchetti rpm con sorgenti.\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - sommario del pacchetto.\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url di riferimento del pacchetto.\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - distributore\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m         - il supporto dov'è stato trovato il pacchetto\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - stampa versione, release e architettura con il nome.\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "formato non corretto, puoi usare un solo tag "
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "uso le variabili d'ambiente su %s\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -868,11 +874,12 @@ msgstr ""
 "Nota: siccome nessuno dei supporti utilizzati usa hdlist, urpmf non può "
 "restituire nessun risultato\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Potresti usare --name per cercare tra i nomi dei pacchetti.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -889,14 +896,16 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia        - usa solo i supporti indicati per cercare i "
 "pacchetti richiesti\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
@@ -904,14 +913,33 @@ msgstr ""
 "--auto       - modalità automatica, prevede la risposta di default \" a "
 "tutte le domande\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - seleziona automaticamente i pacchetti per aggiornare il "
 "sistema.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr ""
+"  --auto-select  - seleziona automaticamente i pacchetti per aggiornare il "
+"sistema.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - disabilita il controllo MD5SUM sui file.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - forza l'aggiornamento della chiave gpg.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -919,11 +947,13 @@ msgstr ""
 "  --no-uninstall - non chiedere mai di rimuovere un pacchetto, ferma "
 "l'installazione\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install  - non installa i pacchetti, esegue solo il download\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -931,7 +961,7 @@ msgstr ""
 "  --keep         - usa i pacchetti esistenti se possibile, rifiuta\n"
 "                   i pacchetti richiesti se sono da rimuovere.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -942,38 +972,44 @@ msgstr ""
 "                   un pacchetto sta per essere installato o\n"
 "                   aggiornato, il valore predefinito è %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 "  --split-length - per avere transazione più corte, il valore predefinito è %"
 "d.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y        - impone una ricerca fuzzy.\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr ""
 "  --src, -s          - il prossimo pacchetto è un pacchetto sorgente.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - installa solo il pacchetto dei sorgenti (non i binari).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - rimuove gli rpm dalla cache prima di fare qualsiasi altra "
 "cosa.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - tieni in cache gli rpm inutilizzati.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -981,7 +1017,8 @@ msgstr ""
 "  --allow-nodeps - permette di chiedere all'utente se desidera installare\n"
 "                   dei pacchetti senza controllare le dipendenze.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -989,13 +1026,15 @@ msgstr ""
 "  --allow-force  - permette di chiedere all'utente se desidera installare\n"
 "                   dei pacchetti senza controllare dipendenze e integrità.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --root         - cambia la directory di root per installare i file rpm "
 "\"chrooted\".\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -1005,41 +1044,48 @@ msgstr ""
 "                       per installare un pacchetto chroot con l'opzione --"
 "root.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - usa wget per recuperare file remoti.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - usa curl per recuperare i file remoti.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - usa curl per recuperare i file remoti.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "--curl-options - opzioni da passare a curl\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "--rsync-options - opzioni da passare ad rsync\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "--wget-options - opzioni da passare a wget\n"
 
 #: ../urpmi:127
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "--curl-options - opzioni da passare a curl\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limita la velocità del download.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1049,7 +1095,8 @@ msgstr ""
 "                     (--no-resume lo disabilita, solitamente è "
 "disabilitato).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1057,7 +1104,8 @@ msgstr ""
 "  --proxy        - usa il proxy HTTP specificato, il numero di porta\n"
 "                    predefinito è1080 (formato: <proxyhost[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1066,6 +1114,7 @@ msgstr ""
 "                   l'autenticazione col proxy (formato: <utente:password>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1074,6 +1123,7 @@ msgstr ""
 "                   l'argomento successivo.\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1083,6 +1133,7 @@ msgstr ""
 "abilitata).\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1091,40 +1142,39 @@ msgstr ""
 "correttamente.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - percorsi da escludere, separati da virgole.\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - esclude i file di documentazione.\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --ignoresize -non verifica lo spazio disponibile prima dell'installazione\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr ""
 "--ignore-arch...- permette di installare pacchetti di altre architetture.\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "--noscripts    - non esegue gli script contenuti nei pacchetti\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - disabilita il controllo MD5SUM sui file.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - forza l'aggiornamento della chiave gpg.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - pacchetti da saltare durante l'installazione.\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1132,43 +1182,51 @@ msgstr ""
 "  --more-choices - qualora si trovassero più pacchetti propone più scelte\n"
 "                     che quelle predefinite.\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "--nolock       - non bloccare il db degli rpm\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 "  --strict-arch  - aggiorna solo i pacchetti della stessa architettura.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - seleziona tutte le corrispondenze da riga di comando.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - abilita la ricerca tra i provides del pacchetto.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - non cercare tra i provides per trovare il pacchetto.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - modalità silenziosa.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  i nomi o file rpm passati da riga di comando verranno installati.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
@@ -1177,11 +1235,12 @@ msgstr ""
 "commando\n"
 "--bug.\n"
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Non puoi installare rpm binari rpm quando viene usato --install-src"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1190,21 +1249,22 @@ msgstr ""
 "La directory [%s] esiste già. Usa un'altra directory per i bug report o "
 "cancellala"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Impossibile creare una directory [%s] per un bug report"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Copia fallita"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "La directory %s, specificata nelle variabili d'ambiente, non esiste"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1213,53 +1273,61 @@ msgstr ""
 "Errore: %s sembra montato in sola lettura.\n"
 "Usa --allow-force per forzare l'operazione."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "Aggiorno il supporto...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "(da aggiornare)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "(da aggiornare)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (da installare)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (da installare)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Qual è la tua scelta? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"I seguenti pacchetti non possono essere installati perché dipendono da altri "
+"pacchetti,\n"
+" più vecchi di quelli già installati:\n"
+"%s"
+msgstr[1] ""
 "I seguenti pacchetti non possono essere installati perché dipendono da altri "
 "pacchetti,\n"
 " più vecchi di quelli già installati:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1267,58 +1335,82 @@ msgstr ""
 "\n"
 "Continuo comunque?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Alcuni dei pacchetti richiesti non possono essere installati:\n"
+"%s"
+msgstr[1] ""
 "Alcuni dei pacchetti richiesti non possono essere installati:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"L'installazione non può proseguire perché i pacchetti elencati\n"
+"devono essere rimossi per poterne aggiornare altri:\n"
+"%s\n"
+msgstr[1] ""
 "L'installazione non può proseguire perché i pacchetti elencati\n"
 "devono essere rimossi per poterne aggiornare altri:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"I pacchetti elencati devono essere rimossi per poterne aggiornare altri:\n"
+"%s"
+msgstr[1] ""
 "I pacchetti elencati devono essere rimossi per poterne aggiornare altri:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(è solo un test), la rimozione non verrà effettuata)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "Per soddisfare le dipendenze, saranno installati i seguenti pacchetti"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] ""
+"Per soddisfare le dipendenze, saranno installati i seguenti pacchetti"
+msgstr[1] ""
+"Per soddisfare le dipendenze, saranno installati i seguenti pacchetti"
 
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Per soddisfare le dipendenze, saranno installati i seguenti pacchetti "
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d pacchetti, %d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1327,89 +1419,106 @@ msgstr ""
 "Dovete essere root per installare le seguenti dipendenze:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(è solo un test, l'installazione non verrà fatta)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "Procedo con l'installazione dei pacchetti %d? (%d MB)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "Procedo con l'installazione dei pacchetti %d? (%d MB)"
+msgstr[1] "Procedo con l'installazione dei pacchetti %d? (%d MB)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Premi Invio quando sei pronto..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "I seguenti pacchetti hanno delle firme errate"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "I seguenti pacchetti hanno delle firme errate"
+msgstr[1] "I seguenti pacchetti hanno delle firme errate"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Vuoi proseguire con l'installazione?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "distribuzione di %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "installazione di %s da %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "installazione di %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "Installazione fallita:"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Provo l'installazione senza controllare le dipendenze? (s/N) "
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Provo l'installazione in modo ancora più forzato (--force)? (s/N) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transazioni dell'installazione fallite"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "L'installazione è possibile"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "È già tutto installato"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "È già tutto installato"
+msgstr[1] "È già tutto installato"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "È già tutto installato"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "È già tutto installato"
+msgstr[1] "È già tutto installato"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "Riavvio urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1433,24 +1542,32 @@ msgstr ""
 "e le [opzioni] una combinazione di\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - crea un supporto di aggiornamento.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - cerca e usa il file synthesis.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - prova ad usare un altro file hdlist.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe     - non cerca nessun file synthesis o hdlist.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
 
 #: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
+msgstr "  --no-probe     - non cerca nessun file synthesis o hdlist.\n"
+
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1458,16 +1575,18 @@ msgstr ""
 "  --distrib      - crea automaticamente tutti i supporti da quelli di\n"
 "                   installazione.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "--interactive  - con   --distrib, chiede conferma per ogni sorgente\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 "  --all-media   - with  --distrib, aggiunge tutti supporti disponibili.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1476,7 +1595,8 @@ msgstr ""
 "  --from         - usa l'url specificata per ottenere la lista dei mirror, \n"
 "                   quella predefinita è%s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1484,49 +1604,70 @@ msgstr ""
 "  --virtual      - crea supporti virtuali che sono sempre aggiornati,\n"
 "                   è permesso soltanto il protocollo file://.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - disabilita il controllo MD5SUM sui file.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 "--nopubkey     - non importa la chiave pubblica dei supporti aggiunti\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "--raw       - aggiunge il supporto alla configurazione ma non lo aggiorna.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 "  -c             - ripulisci le intestazioni dalle directory in cache.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - forza la generazione dei file hdlist.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modalità silenziosa.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modalità prolissa.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "non riesco ad aggiornare il supporto \"%s\"\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Solo superuser è abilitato ad aggiungere supporti"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Creerà il file di configurazione [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Non riesco a creare il file di configurazione [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "non c'è bisogno di fornire <percorso relativo di hdlist> con --distrib"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1535,16 +1676,17 @@ msgstr ""
 "\n"
 "Vuoi aggiungere il supporto '%s'"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "manca <percorso relativo di hdlist>\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "`with` assente per il supporto in rete\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "non riesco a creare il supporto \"%s\"\n"
@@ -1567,29 +1709,35 @@ msgstr ""
 "utilizzo:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "--checkpoint  - inizia la ripacchettizzazione adesso\n"
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 "  --noclean      - non svuotare la directory usata per la "
 "ripacchettizzazione.\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr "--list         - elenca le transizioni dalla data/durata specificata\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-url   - elenca tutte le transazioni nel db rpm (prolisso)\n"
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-safe   - elenca le transizione dal checkpoint\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
@@ -1597,122 +1745,125 @@ msgstr ""
 "--rollback     - torna alla data specificata.\n"
 "                 o di un numero specificato di transazioni\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "--disable      - disabilita la ripacchettizazione.\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "Data o durata non valide [%s]\n"
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr "La directory per la ripacchettizazione non è stata specificata\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "Non posso scrivere nella directory [%s]\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "Cancello i file nella directory [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "%d file rimossi\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "argomenti non completi sulla riga di comando [%s]\n"
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 "Non puoi specificare --checkpoint e --rollback allo stesso tempo\n"
 "stesso tempo\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 "Non puoi specificare --checkpoint e --list allo stesso tempo\n"
 "stesso tempo\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "Non puoi specificare --rollback e --list allo stesso tempo\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "Non puoi specificare --disable con un altra opzione"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "Nessuna transazione trovata da %s\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "Devi essere ROOT per fare questo"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Scrivo le macro rpm su [%s] ...\n"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr "Non ho trovato nessuna data per il rollback\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "Ritorno a %s...\n"
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr "Disabilito la ripacchettizzazione\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "uso: urpmi.removemedia [-a] <nome> ...\n"
 "dove <nome> è il nome del supporto da rimuovere.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - seleziona tutti i supporti.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - imponi una ricerca fuzzy sul nome dei supporti.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opzioni sconosciute '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Solo superuser è abilitato a rimuovere i supporti"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "niente da rimuovere (usa urpmi.addmedia per aggiungere un supporto)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1722,6 +1873,7 @@ msgstr ""
 "(uno di %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1730,31 +1882,47 @@ msgstr ""
 "dove <nome> è il nome del supporto da aggiornare.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "--update       - usa solo supporti di aggiornamento.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - forza l'aggiornamento della chiave gpg.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - non aggiornare, segna il supporto come ignorato.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 "  --no-ignore       - non aggiornare, segna il supporto come disponibile.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - seleziona tutti i supporti non rimovibili.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - forza la generazione dei file hdlist.\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Solo superuser è abilitato ad aggiornare i supporti"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "niente da aggiornare (usa urpmi.addmedia per aggiungere un supporto)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1763,21 +1931,21 @@ msgstr ""
 "la voce da aggiornare non è presente\n"
 "(uno di %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "rendo disponibile il supporto %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "Ignoro il supporto %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "rendo disponibile il supporto %s"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1796,6 +1964,7 @@ msgstr ""
 "uso:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1804,31 +1973,38 @@ msgstr ""
 "pacchetti richiesti (o aggiornati)\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - impone una ricerca fuzzy (uguale a -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - elenca i pacchetti disponibili.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - elenca i supporti disponibili.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   - elenca i supporti disponibili e la loro url.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - elenca i nodi disponibili quando si utilizza --parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - elenca gli alias paralleli disponibili.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
@@ -1836,12 +2012,14 @@ msgstr ""
 "addmedia\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - il prossimo pacchetto è un pacchetto sorgente (uguale a -"
 "s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
@@ -1849,11 +2027,13 @@ msgstr ""
 "(solo root).\n"
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch    - permette di cercare rpm per un'altra architettura.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1861,67 +2041,81 @@ msgstr ""
 "  --use-distrib  - configura urpmi \"al volo\" da un albero distribuito.\n"
 "                   Permette di interrogare una distribuzione.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - mostra la lista delle modifiche.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S   - stampa il sommario.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - risultati completi con i pacchetti da rimuovere.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - estende la ricerca alle dipendenze del pacchetto.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - stampa i gruppi anche col nome.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - stampa informazioni utili in forma leggibile.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l         - elenca i file presenti in un pacchetto.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - non cercare tra i provides per trovare il pacchetto "
 "(opzione predefinita).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - cerca tra i provides per trovare pacchetto.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - stampa versione e release anche col nome.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - ricerca a ritroso sui requisiti del pacchetto.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR             - ricerca estesa a ritroso (anche sui pacchetti "
 "virtuali).\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - il prossimo pacchetto è un pacchetto sorgente (uguale a --"
 "src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
@@ -1929,36 +2123,120 @@ msgstr ""
 "  -u             - rimuove il pacchetto se una versione più recente è già "
 "installata.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - impone una ricerca fuzzy (uguale a --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - come -y, ma non riconosce maiuscole e minuscole.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes può essere usato solo con --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "ignoro il supporto %s: nessuna hdlist present"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Nessuna lista di file trovata\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Nessun changelog trovato\n"
 
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "mput è fallito, probabilmente il nodo non è raggiungibile"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr "il nodo %s ha una versione vecchia di urpme; aggiornala per favore"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "rshp è fallito, probabilmente il nodo non è raggiungibile"
+
+#~ msgid "on node %s"
+#~ msgstr "sul nodo %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Mando sysnthesis ai nodi"
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "Risolvo le dipendenze sui nodi"
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Distribuisco i file ai nodi"
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Verifico se è possibile l'installazione sui nodi..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Installazione fallita sul nodo %s"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Sto installando i pacchetti sui nodi..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "scp fallito sull'host %s(%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "Mando sysnthesis al nodo %s"
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "Risolvo le dipendenze su %s"
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "l'host %s non ha una versione valida di urpmi (%d"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Distribuisco i file a %s..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "Verifico se l'installazione è possibile su %s..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Installazione su %s..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "installazione di %s da %s"
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Preparo l'installazione su %s..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr ""
+#~ "Per soddisfare le dipendenze, saranno installati i seguenti pacchetti "
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - cerca e usa il file synthesis.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - prova ad usare un altro file hdlist.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "`with` assente per il supporto in rete\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "opzioni sconosciute '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "protocollo definito per %s sconosciuto"
 
diff --git a/po/ja.po b/po/ja.po
index c407d5a2..24b497e2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-12-02 23+0900\n"
 "Last-Translator: BANDO Yukiko <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese\n"
@@ -22,7 +22,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "RPM のインストール"
 
@@ -31,7 +32,8 @@ msgstr "RPM のインストール"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "エラー: ファイル %s が見つかりません。操作をキャンセルします。"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_OK"
 
@@ -86,20 +88,23 @@ msgstr ""
 "\n"
 "インストールせずに保存することもできます。どうしますか？"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "インストール(_I)"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "ファイルを保存する場所を選んでください"
 
@@ -109,18 +114,21 @@ msgid "Unknown option %s"
 msgstr "不明なオプション %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "パッケージが指定されていません"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "お待ちください..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "root 権限が必要です"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -131,35 +139,42 @@ msgstr ""
 "%s\n"
 "このままインストールを続けますか？"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "OK"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (アップグレードするため)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (インストールするため)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "パッケージの選択"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "以下のパッケージのいずれかが必要です:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -170,7 +185,7 @@ msgstr ""
 "%s\n"
 "このままインストールを続けますか？"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -180,25 +195,27 @@ msgstr ""
 "依存を満たすために以下の %d 個のパッケージをインストールします:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "パッケージをインストール..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ソースパッケージを取得できませんでした。中止します。"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "メディア %s を デバイス [%s] に挿入してください"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "パッケージ %s をダウンロード.."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -211,8 +228,7 @@ msgstr ""
 "\n"
 "インストールを続けますか？"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -223,35 +239,38 @@ msgstr ""
 "%s\n"
 "urpmi データベースを更新してください"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "%s を削除"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "パッケージ %s (%s/%s) をインストール..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "インストールに失敗"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "完了(_D)"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "パッケージは既にインストールされています"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "インストールが完了しました"
 
@@ -265,18 +284,22 @@ msgstr ""
 "[オプション] には以下を選択\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - このヘルプを表示\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <パス>  - / の代わりに指定したルートディレクトリを使う\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [グループ名]     - 指定したグループの検索結果だけを表示\n"
 
 #: ../rpm-find-leaves:19
+#, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f             - RPM の完全な名前を表示 (NVRA)\n"
 
@@ -285,209 +308,127 @@ msgstr "  -f             - RPM の完全な名前を表示 (NVRA)\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    デフォルトは %s\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "パッケージのインストールはスーパーユーザにしかできません"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "urpmi を制限モードで実行中..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb を開けません"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr "キャッシュに %d RPM ヘッダを検出、古い %d ヘッダを削除"
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "RPM ファイル名 [%s] が無効です"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM ファイル [%s] を取得中..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...取得完了"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...取得に失敗: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "RPM ファイル [%s] にアクセスできません"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "スペックファイル %s [%s] を分析できません"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "RPM ファイルを登録できません"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM とアーキテクチャが一致していません [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "ローカルパッケージの登録中にエラーが発生"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "この操作は制限モードでは禁止されています"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "コマンドラインのプロキシ宣言が間違っています\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot ディレクトリが存在しません"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "--use-distrib を使用するには root 権限が必要です。"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPM ファイル %s を読み込めません\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%2$s なしで %1$s は使えません"
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, fuzzy, c-format
+msgid "Can't use %s with %s"
+msgstr "%2$s なしで %1$s は使えません"
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "引数が多すぎます\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "NnＮｎいイ"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "YyＹｙはハ"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "有効な選択ではありません。やり直してください\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "mput 失敗。恐らくノードが接続不可能です。"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "ノード %s の urpme のバージョンが古いのでアップグレードしてください。"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "rshp 失敗。恐らくノードが接続不可能です。"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "ノード %s で"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "ノードに synthesis を伝送中..."
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "ノードで依存を解決中..."
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "ノードにファイルを配信中..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "ノードでインストール可能かどうかを確認中..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "ノード %s でインストールに失敗"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "インストール可能です"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "ノードでパッケージをインストール中..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "ホスト %s で scp 失敗 (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "synthesis を %s に伝送中..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "%s で依存を解決中..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "ホスト %s の urpmi のバージョンが不正です (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "%s にファイルを配信中..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "%s でインストール可能かどうか確認中..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "%s でインストールを実行中..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "%s を %s にインストール中..."
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "%s でインストール準備中..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -504,41 +445,56 @@ msgstr ""
 "\n"
 "使い方:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - このヘルプを表示\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 複数の選択肢から自動的にパッケージを選択\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 問題なく削除できるかどうかテストする\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 足りないパッケージがあっても強制的に実行する\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi をエイリアスの複数のマシンに使う\n"
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - ファイルを削除する前に再パッケージ化する\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - RPM の削除に他のルートを使う\n"
 
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - RPM のインストールに他のルートを使う\n"
+
+#: ../urpme:52
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - パッケージのスクリプトを実行しない\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
@@ -547,74 +503,79 @@ msgstr ""
 "                   で設定。chroot を --root オプション付きでインストール/\n"
 "                   アンインストールする際に使用。\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - synthesis ファイルを使う\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - hdlist ファイルを使う\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - 詳細モード。\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - 詳細モード\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 指定した表現を含むすべてのパッケージを選択\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "パッケージの削除はスーパーユーザにしかできません"
 
 #: ../urpme:106
-msgid "unknown package"
+#, c-format
+msgid "unknown packages"
 msgstr "不明なパッケージ"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
 #: ../urpme:106
-msgid "unknown packages"
+#, c-format
+msgid "unknown package"
 msgstr "不明なパッケージ"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "以下のパッケージが %s を含んでいます: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s を削除するとシステムが壊れます"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "削除するものはありません"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "以下のパッケージを削除するために調査しています"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "依存を満たすために以下の %d 個のパッケージを削除します (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (y/N)[デフォルトはN] "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "%d パッケージを削除しますか？"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N)[デフォルトはN] "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "削除に失敗"
 
@@ -635,204 +596,251 @@ msgstr ""
 "使い方: urpmf [オプション] パターン表現\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - このツールのバージョンを表示\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 特定の環境を使う (バグレポートなどのため)\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 指定したメディアは使わない (コンマで区切る)\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - パターンで検索せずに引数を普通の文字列とみなす\n"
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 指定したメディアのみを使う (コンマで区切る)\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - カンマ区切りで指定したメディアごとにソートする\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - urpmi のデータベースではなく指定した synthesis を使う\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 全く同じ行は表示しない\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 更新メディアのみを使う\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - 詳細モード\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - パターンの大文字小文字を区別しない\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - パターンの大文字小文字を区別する (デフォルト)\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - 区切り文字を <str> に変更 (デフォルトは ':')\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "パターン表現:\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - テキストを正規表現とみなす (-l が使われていない限り)\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - Perl コードをそのまま表示\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binary AND operator\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binary OR operator\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr " !               - unary NOT\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - 左右括弧\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "タグのリスト:\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf            - printf 風の出力形式を指定\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   例: '%%name:%%files'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - アーキテクチャ\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - ビルドホスト\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - ビルド日時\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - 設定ファイル\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - conflict (衝突) タグ\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - パッケージの説明\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - ディストリビューション\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - エポック\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - パッケージのファイル名\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - パッケージに含まれるファイルのリスト\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - グループ\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - パッケージ名\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - obsolete (廃止) タグ\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - パッケージ作成者\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - provide (提供) タグ\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - require (要求) タグ\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - インストール後のサイズ\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - ソース RPM の名前\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - 要約\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - ベンダー\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - パッケージのあるメディア\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - バージョン, リリース番号, アーキテクチャを表示\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "不正な形式: 多値タグはひとつしか使えません"
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s に特定の環境を使用\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -840,11 +848,12 @@ msgstr ""
 "注: どのメディアにも hdlist がないので urpmf は検索結果を返すことができません"
 "でした\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "パッケージ名を探すには --name オプションを使うと便利です\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -860,24 +869,43 @@ msgstr ""
 "\n"
 "使い方:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia   - 指定したメディアのみを要求したパッケージの検索に使う\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr "  --auto\t  - 非対話モード、質問に対する答えはデフォルトとみなす\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自動的にパッケージを選択してシステムを更新\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr "  --auto-select  - 自動的にパッケージを選択してシステムを更新\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - MD5SUM ファイルをチェックしない\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gpg キーの更新を強制する\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -885,17 +913,19 @@ msgstr ""
 "  --no-uninstall - パッケージを削除する必要があるときは自動的にインストールを"
 "中止\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install  - パッケージをインストールしない (ダウンロードのみ)\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
 msgstr "  --keep         - 既存のパッケージを維持し、削除要求は拒否する\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -905,32 +935,38 @@ msgstr ""
 "  --split-level  - 一定数以上のパッケージがインストールまたは更新される\n"
 "                    ときは分割して行う。デフォルトは %d\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 分割する最低パッケージ数。デフォルトは %d\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - ファジー検索\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s      - ソースパッケージを指定\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - ソースのみをインストール (バイナリなし)\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - 最初にキャッシュから RPM を削除する\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - RPM をキャッシュに残す\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -938,7 +974,8 @@ msgstr ""
 "  --allow-nodeps - 依存関係に問題が発生した時に、自動的に終了せずに\n"
 "                   --nodeps でインストールするかどうか質問する\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -946,11 +983,13 @@ msgstr ""
 "  --allow-force  - 依存関係に問題が発生した時に、自動的に終了せずに\n"
 "                   --force でインストールするかどうか質問する\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - RPM のインストールに他のルートを使う\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -959,39 +998,48 @@ msgstr ""
 "                   で設定。chroot を --root オプション付きでインストール/\n"
 "                   アンインストールする際に使用。\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - リモートファイルの取得に wget を使う\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - リモートファイルの取得に curl を使う\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla     - リモートファイルの取得に prozilla を使う\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - curl に渡す追加オプション\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options - rsync に渡す追加オプション\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - wget に渡す追加オプション\n"
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - prozilla に渡す追加オプション\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - ダウンロード速度を制限\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -999,7 +1047,8 @@ msgstr ""
 "  --resume       - 不完全なファイルのダウンロードを再開する\n"
 "                   (--no-resume で無効化、デフォルトで無効)\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1007,7 +1056,8 @@ msgstr ""
 "  --proxy        - 指定した HTTP プロキシを使う。デフォルトのポート番号は\n"
 "                   1080。(形式: <proxyhost[:port]>)\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1016,12 +1066,14 @@ msgstr ""
 "                   指定する。(形式: <user:password>)\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr "  --bug          - 指定したディレクトリにバグレポートを出力\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1030,44 +1082,44 @@ msgstr ""
 "                   (デフォルトで有効。--no-verify-rpm で無効)\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - 正しくインストールされるかどうかテストする\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 除外するパスを指定 (カンマで区切る)\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - doc ファイルを除外する\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - インストールする前にディスク容量を確認しない\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 別のアーキテクチャの RPM のインストールを許可する\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - パッケージのスクリプトを実行しない\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - MD5SUM ファイルをチェックしない\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - gpg キーの更新を強制する\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - インストールをスキップするパッケージ\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1075,41 +1127,49 @@ msgstr ""
 "  --more-choices - 複数のパッケージがある場合に、デフォルト以外の選択肢を\n"
 "                   表示する\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - RPM データベースをロックしない\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 同じアーキテクチャのパッケージのみを更新\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 指定した表現を含むすべてのパッケージを選択する\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - provide (提供) タグも検索対象に含める\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - provide (提供) タグは検索の対象にしない\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - 詳細を表示しない\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  コマンドラインで指定したパッケージ名/RPM ファイルをインストールします\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "エラー: --auto-select はパッケージリストと一緒には使えません。\n"
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
@@ -1117,12 +1177,13 @@ msgstr ""
 "エラー: バグレポートを生成するには、通常のコマンドライン引数に加えて\n"
 "--bug を指定してください。\n"
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 "バイナリ RPM は --install-src オプション使用時にはインストールできません"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1131,21 +1192,22 @@ msgstr ""
 "ディレクトリ [%s] は既に存在します。バグレポートには他のディレクトリを使う"
 "か、既存のディレクトリを削除してください。"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "バグレポート用のディレクトリ [%s] を作成できません"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "コピーに失敗"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "環境ディレクトリ %s が存在しません"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1154,52 +1216,55 @@ msgstr ""
 "エラー: %s は読み取り専用でマウントされているようです。\n"
 "操作を強制するには --allow-force を使ってください。"
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "メディアを更新...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (アップグレードするため)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (アップグレードするため)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (インストールするため)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (インストールするため)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "どれを選びますか？ (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
 "以下のパッケージは既にインストールされているものよりも古いバージョンの\n"
 "パッケージに依存しているため、インストールできません:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1207,58 +1272,69 @@ msgstr ""
 "\n"
 "このままインストールを続けますか？"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (Y/n)[デフォルトはY] "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
 "インストールできないパッケージがあります:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
 "インストールを続けられません。\n"
 "更新するには以下のパッケージを削除しなければなりません:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
 "更新するには以下のパッケージを削除しなければなりません:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(テストのみ、実際には削除されません)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "依存を満たすために以下のパッケージをインストールします"
-
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "依存を満たすために以下のパッケージをインストールします"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] "依存を満たすために以下のパッケージをインストールします"
 
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d 個のパッケージ, %d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1267,88 +1343,102 @@ msgstr ""
 "以下の依存パッケージをインストールするには root 権限が必要です:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(テストのみ、実際にはインストールされません)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "%d 個のパッケージ (%d MB) のインストールを開始しますか？"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "%d 個のパッケージ (%d MB) のインストールを開始しますか？"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "準備ができたら Enter を押してください"
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "以下のパッケージは署名が間違っています"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "以下のパッケージは署名が間違っています"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "インストールを続けますか？"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "%s を配信中"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s を %s からインストール"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "%s をインストール"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "インストール失敗:"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "依存を確認せずにインストールしますか？ (y/N)[デフォルトはN] "
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "インストールを強行 (--force) してみますか？(y/N)[デフォルトはN]"
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 件のインストールトランザクションが失敗しました"
 
-#: ../urpmi:824
-msgid "Packages are up to date"
-msgstr "パッケージは最新です"
-
-#: ../urpmi:827
+#: ../urpmi:828
 #, c-format
-msgid "Packages %s are already installed"
-msgstr "パッケージ %s は既にインストールされています"
+msgid "Installation is possible"
+msgstr "インストール可能です"
 
-#: ../urpmi:828
+#: ../urpmi:833
 #, c-format
+msgid "Packages are up to date"
+msgstr "パッケージは最新です"
+
+#: ../urpmi:840
+#, fuzzy, c-format
 msgid "Package %s is already installed"
-msgstr "パッケージ %s は既にインストールされています"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "パッケージ %s は既にインストールされています"
+
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "パッケージ %s は既にインストールされています"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "urpmi を再スタートします"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1371,24 +1461,32 @@ msgstr ""
 "[オプション] は以下を選択\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 更新メディアを作成\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - 既存の synthesis ファイルを使う\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
+msgstr "  --probe-synthesis - synthesis ファイルを使う\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - 既存の hdlist ファイルを使う\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
+msgstr "  --probe-hdlist - hdlist ファイルを使う\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe     - 既存の synthesis/hdlist ファイルを使わない\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
 
 #: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
+msgstr "  --no-probe     - 既存の synthesis/hdlist ファイルを使わない\n"
+
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1396,17 +1494,19 @@ msgstr ""
 "  --distrib      - インストールに使用したすべてのメディアを自動的に追加\n"
 "                    する\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive -  --distrib と併用して、各メディアについて確認を求める\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 "  --all-media   - --distrib と併用して、リストのすべてのメディアを追加\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1415,7 +1515,8 @@ msgstr ""
 "  --from         - ミラーリストの取得に指定した URL を使う。デフォルトは\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1423,46 +1524,67 @@ msgstr ""
 "  --virtual      - 常に最新状態に更新されている仮想メディアを作成\n"
 "                   'file://' プロトコルのみ使用可\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - MD5SUM ファイルをチェックしない\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - 追加したメディアの公開鍵をインポートしない\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 設定ファイルにメディアを追加、更新はしない\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - キャッシュディレクトリのヘッダを削除\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - hdlist ファイルを強制的に生成\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - 詳細を表示しない\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - 詳細モード。\n"
+
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "メディア %s を更新できません\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "メディアの追加はスーパーユーザにしかできません"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "設定ファイル [%s] を作成します"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "設定ファイル [%s] を作成できません"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "--distrib に <hdlistの相対パス> は必要ありません"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1471,16 +1593,17 @@ msgstr ""
 "\n"
 "メディア '%s' を追加しますか？"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlistの相対パス> の指定がありません\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "ネットワークメディアの 'with' 以下がありません\n"
+#: ../urpmi.addmedia:169
+#, fuzzy, c-format
+msgid "Can't use %s with remote medium"
+msgstr "%2$s なしで %1$s は使えません"
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "メディア %s を作成できません\n"
@@ -1502,29 +1625,35 @@ msgstr ""
 "使い方:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - repackaging の開始を設定\n"
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 "  --noclean      - checkpoint で repackage ディレクトリをクリアしない\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - 指定した日付以降または期間のトランザクションを表示\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-all     - rpmdb のすべてのトランザクションを表示 (長い)\n"
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-safe     - checkpoint 以降のトランザクションを表示\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
@@ -1532,118 +1661,121 @@ msgstr ""
 "  --rollback     - 指定した日付まで、または\n"
 "                   指定した数のトランザクションをロールバック\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - repackaging を無効にする\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "無効な日付または期間 [%s]\n"
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr "repackage ディレクトリが指定されていません\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "repackage ディレクトリに書き込めません [%s]\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "repackage ディレクトリをクリーンアップ [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "%d 個のファイルを削除しました\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "コマンドラインの引数が誤っています [%s]\n"
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr "--checkpoint と --rollback は同時に指定できません\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr "--checkpoint と --list は同時に指定できません\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "--rollback と --list は同時に指定できません\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "--disable は他のオプションと同時に指定できません"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "%s 以降のトランザクションはありません\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "これはスーパーユーザにしかできません"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "RPM マクロファイルを書き込み [%s]...\n"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr "ロールバックの日付が見つかりません\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "%s までロールバック...\n"
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr "repackaging を無効にします\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "使い方: urpmi.removemedia [-a] <メディア名> ...\n"
 "<メディア名>は削除するメディア名\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 全メディアを選択\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - メディア名をファジー検索\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"不明なオプション '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "メディアの削除はスーパーユーザにしかできません"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "削除するものがありません (urpmi.addmedia でメディアを追加できます)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1653,6 +1785,7 @@ msgstr ""
 "(%s の中のいずれか)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1661,30 +1794,46 @@ msgstr ""
 "<メディア名> は更新するメディア名\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - 更新メディアのみ更新する\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gpg キーの更新を強制する\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - 更新せずにメディアを無効とする\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - 更新せずにメディアを有効とする\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - リムーバブルメディア以外のすべてを選択\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - hdlist ファイルを強制的に生成\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "メディアの更新はスーパーユーザにしかできません"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "更新するものがありません (urpmi.addmedia でメディアを追加できます)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1693,21 +1842,21 @@ msgstr ""
 "更新対象が見つかりません\n"
 "(%s の中のいずれか)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "「%s」"
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "メディア %s を有効にしています"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "メディア %s を無視しています"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "メディア %s を有効にしています"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1725,6 +1874,7 @@ msgstr ""
 "使い方:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1733,40 +1883,49 @@ msgstr ""
 "ケージの検索に使う\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - ファジー検索 (-y と同じ)\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - 利用できるパッケージを表示\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - 利用できるメディアを表示\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - 利用できるメディアと URL を表示\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - --parallel に利用できるノードを表示\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - 利用できるパラレルエイリアスを表示\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - メディアの設定を urpmi.addmedia の引数の形式で表示\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - ソースパッケージを指定 (-s と同じ)\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
@@ -1774,10 +1933,12 @@ msgstr ""
 "のみ)\n"
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 別のアーキテクチャの RPM も検索に含める\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1785,92 +1946,190 @@ msgstr ""
 "  --use-distrib  - ディストリビューションのツリーから urpmi をオンザフライ\n"
 "                   で設定。ディストリビューションの検索を可能にする。\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 変更ログを表示\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - 要約を表示\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 削除されるパッケージを表示\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - 依存するパッケージも検索して表示\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - グループと名前を表示\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 読みやすい形で情報を表示\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - パッケージに含まれるファイルを表示\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - provide (提供) タグを検索しない (デフォルト)\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - パッケージを探すために provide (提供) タグを検索\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 名前, バージョン, リリース番号を表示\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - 指定したパッケージに依存するパッケージを逆検索\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -RR            - 拡張逆検索 (仮想パッケージを含める)\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - ソースパッケージを指定 (--src と同じ)\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "  -u             - 新しい版がインストールされているときはパッケージを削除\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - ファジー検索 (--fuzzy と同じ)\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - 大文字/小文字を区別しない [-y] (ファジー検索)\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  指定したパッケージ名/RPM ファイルがあるか調べる\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes は --parallel と一緒にしか使えません"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "メディア %s をスキップ: hdlist がありません"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "ファイルリストがありません\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "変更ログはありません\n"
+
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "mput 失敗。恐らくノードが接続不可能です。"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr ""
+#~ "ノード %s の urpme のバージョンが古いのでアップグレードしてください。"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "rshp 失敗。恐らくノードが接続不可能です。"
+
+#~ msgid "on node %s"
+#~ msgstr "ノード %s で"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "ノードに synthesis を伝送中..."
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "ノードで依存を解決中..."
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "ノードにファイルを配信中..."
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "ノードでインストール可能かどうかを確認中..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "ノード %s でインストールに失敗"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "ノードでパッケージをインストール中..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "ホスト %s で scp 失敗 (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "synthesis を %s に伝送中..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "%s で依存を解決中..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "ホスト %s の urpmi のバージョンが不正です (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "%s にファイルを配信中..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "%s でインストール可能かどうか確認中..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "%s でインストールを実行中..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "%s を %s にインストール中..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "%s でインストール準備中..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "依存を満たすために以下のパッケージをインストールします"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - 既存の synthesis ファイルを使う\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - 既存の hdlist ファイルを使う\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "ネットワークメディアの 'with' 以下がありません\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "不明なオプション '%s'\n"
diff --git a/po/ka.po b/po/ka.po
index 24a25874..7e4352b9 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2003-01-29 23:47+0400\n"
 "Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
 "Language-Team: Georgian\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
-#, fuzzy
+#: ../gurpmi:30 ../gurpmi2:63
+#, fuzzy, c-format
 msgid "RPM installation"
 msgstr "ინსტალაცია ჩაიშალა"
 
@@ -28,7 +28,8 @@ msgstr "ინსტალაცია ჩაიშალა"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
@@ -65,22 +66,23 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#. - buttons
 #: ../gurpmi:97
-#, fuzzy
+#, fuzzy, c-format
 msgid "_Install"
 msgstr "ინსტალირება"
 
 #: ../gurpmi:98
-#, fuzzy
+#, fuzzy, c-format
 msgid "_Save"
 msgstr "დამახსოვრება"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_გაუქმება"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr ""
 
@@ -90,20 +92,21 @@ msgid "Unknown option %s"
 msgstr "უცნობი ტიპის ფაილი %s-სთვის"
 
 #: ../gurpmi.pm:89
-#, fuzzy
+#, fuzzy, c-format
 msgid "No packages specified"
 msgstr "ბრძანება არ იქნა მითითებული"
 
 #: ../gurpmi2:43
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please wait..."
 msgstr "გთხოვთ იქონიოთ მოთმინება"
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr ""
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -111,37 +114,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "ო-ქეი"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "გაფრთხილება"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "ო-ქეი"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:147
-#, fuzzy
+#: ../gurpmi2:149
+#, fuzzy, c-format
 msgid " (to install)"
 msgstr "ავტომატური ინსტალირება"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
 
-#: ../gurpmi2:174
-#, fuzzy
+#: ../gurpmi2:176
+#, fuzzy, c-format
 msgid "_Abort"
 msgstr "შესახებ..."
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -149,7 +157,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "%s შედმეგ პაკეტებშია: %s\n"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -157,27 +165,27 @@ msgid ""
 "%s\n"
 msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
-#: ../gurpmi2:215
-#, fuzzy
+#: ../gurpmi2:217
+#, fuzzy, c-format
 msgid "Package installation..."
 msgstr "ინსტალაციისათვის საჭირო ramdisk იმიჯები"
 
-#: ../gurpmi2:217 ../urpmi:602
-#, fuzzy
+#: ../gurpmi2:219 ../urpmi:608
+#, fuzzy, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ვერ ვიყენებ პარალელურ პარამეტრს \"%s\""
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "გთხოვთ ჩადოთ: %s სახელით: %s"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -186,8 +194,7 @@ msgid ""
 "Do you want to continue installation ?"
 msgstr "%s შედმეგ პაკეტებშია: %s\n"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -195,37 +202,38 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "მომხმარებლის წაშლა : %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../gurpmi2:329
-#, fuzzy
+#: ../gurpmi2:331
+#, fuzzy, c-format
 msgid "_Done"
 msgstr "დასრულდა"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../gurpmi2:339
-#, fuzzy
+#: ../gurpmi2:341
+#, fuzzy, c-format
 msgid "Installation finished"
 msgstr "ინსტალაცია ჩაიშალა"
 
@@ -237,20 +245,22 @@ msgid ""
 msgstr ""
 
 #: ../rpm-find-leaves:16
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr ""
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr ""
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
 
@@ -259,216 +269,128 @@ msgstr "  --help         - აჩვენე ეს დამხმარე �
 msgid "                    defaults to %s.\n"
 msgstr ""
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
-#, fuzzy
+#: ../rurpmi:11 ../urpmi:265
+#, fuzzy, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:73
-#, fuzzy
+#: ../urpm.pm:93
+#, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "ვერ ვიძახებ ფაილს %s\n"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "ვიძახებ hdlists ფაილს..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...გამოძახება დასრულდა"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...გამოძახება ჩაიშალა: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, fuzzy, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
 
-#: ../urpm.pm:139
-#, fuzzy
+#: ../urpm.pm:159
+#, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
 #: ../urpm/args.pm:242
-#, fuzzy
+#, fuzzy, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "თქვენ უჯრის გაზიარების უფლება უნდა გაგაჩნდეთ"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, fuzzy, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "ვერ წავიკითხე მენიუს ფაილი:%s"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
-msgid "Too many arguments\n"
-msgstr ""
-
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
-msgid "Nn"
-msgstr "nNaAა"
-
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
-msgid "Yy"
-msgstr "yYkKxXხ"
-
-#: ../urpm/msg.pm:98
-msgid "Sorry, bad choice, try again\n"
-msgstr "ცუდი არჩევანია, კიდევ სცადეთ\n"
-
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
+#: ../urpm/args.pm:426
 #, c-format
-msgid "on node %s"
-msgstr ""
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr ""
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
+msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr ""
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "ინსტალაცია ჩაიშალა"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-#, fuzzy
-msgid "Installation is possible"
-msgstr "ინსტალაცია ჩაიშალა"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-#, fuzzy
-msgid "Installing packages on nodes..."
-msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
+#: ../urpm/args.pm:440
 #, c-format
-msgid "scp failed on host %s (%d)"
+msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/parallel_ssh.pm:130
-#, fuzzy, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "ვამოწმებ synthesis ფაილს [%s]"
-
-#: ../urpm/parallel_ssh.pm:183
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
 #, c-format
-msgid "Resolving dependencies on %s..."
-msgstr ""
+msgid "Nn"
+msgstr "nNaAა"
 
-#: ../urpm/parallel_ssh.pm:213
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
 #, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:229
-#, fuzzy, c-format
-msgid "Distributing files to %s..."
-msgstr "ვაინსტალირებ: %s\n"
+msgid "Yy"
+msgstr "yYkKxXხ"
 
-#: ../urpm/parallel_ssh.pm:243
+#: ../urpm/msg.pm:104
 #, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr ""
-
-#: ../urpm/parallel_ssh.pm:267
-#, fuzzy, c-format
-msgid "Performing install on %s..."
-msgstr "ინსტალაციისათვის საჭირო ramdisk იმიჯები"
-
-#: ../urpm/parallel_ssh.pm:281
-#, fuzzy, c-format
-msgid "Installing %s on %s..."
-msgstr "ვაინსტალირებ: %s\n"
-
-#: ../urpm/parallel_ssh.pm:282
-#, fuzzy, c-format
-msgid "Preparing install on %s..."
-msgstr "ინსტალაციისათვის საჭირო ramdisk იმიჯები"
+msgid "Sorry, bad choice, try again\n"
+msgstr "ცუდი არჩევანია, კიდევ სცადეთ\n"
 
 #: ../urpme:39
 #, fuzzy, c-format
@@ -487,124 +409,136 @@ msgstr ""
 "\n"
 "გამოყენება:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
author	Pablo Saratxaga <pablo@mandriva.com>	2004-07-20 07:20:33 +0000
committer	Pablo Saratxaga <pablo@mandriva.com>	2004-07-20 07:20:33 +0000
commit	7e039dd29386d497d168e96a62fd681d3bddee44 (patch)
tree	ee659f9e8d196daa745380b48ac5812dbcd11e2b /perl-install/share/po/translation_size.pl
parent	fafa7b82d182c93045da035bd99e9c1dc6959540 (diff)
download	drakx-7e039dd29386d497d168e96a62fd681d3bddee44.tar drakx-7e039dd29386d497d168e96a62fd681d3bddee44.tar.gz drakx-7e039dd29386d497d168e96a62fd681d3bddee44.tar.bz2 drakx-7e039dd29386d497d168e96a62fd681d3bddee44.tar.xz drakx-7e039dd29386d497d168e96a62fd681d3bddee44.zip