updated Spanish and Norwegian files

4 files changed, 1289 insertions, 1682 deletions

diff --git a/po/es.po b/po/es.po
index 6f71428e..b92419b6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,17 +3,19 @@
 # Copyright (C) 1999 MandrakeSoft
 # Pablo Saratxaga <pablo@mandrakesoft.com>, 1999-2000
 # Fabian Mandelbaum <fabman@mandrakesoft.com>, 2001
+# Juan Manuel García Molina <juanmagm@mandrakesoft.com>, 2001.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.5\n"
-"POT-Creation-Date: 2001-07-19 16:38+0200\n"
-"PO-Revision-Date: 2001-04-24 08:52-0300\n"
-"Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
-"Language-Team: Spanish\n"
+"POT-Creation-Date: 2001-07-28 04:12+0200\n"
+"PO-Revision-Date: 2001-07-23 21:31GMT\n"
+"Last-Translator: Juan Manuel García Molina <juanmagm@mail.com>\n"
+"Language-Team: Spanish <cooker-i18n@linux-mandrake.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.8\n"
 
 #: _irpm:21
 msgid "installing $rpm\n"
@@ -27,27 +29,27 @@ msgstr ""
 "Instalación automática de paquetes...\n"
 "Pidió la instalación del paquete $rpm\n"
 
-#: _irpm:31 po/placeholder.h:150 urpmi:239
+#: _irpm:31 urpmi:239
 msgid "Is it ok?"
 msgstr "¿Está todo bien?"
 
-#: _irpm:33 po/placeholder.h:156 urpmi:242 urpmi:272
+#: _irpm:33 urpmi:242 urpmi:272
 msgid "Ok"
 msgstr "Aceptar"
 
-#: _irpm:34 po/placeholder.h:120 urpmi:243 urpmi:273
+#: _irpm:34 urpmi:243 urpmi:273
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: _irpm:40 po/placeholder.h:157 urpmi:247 urpmi:305
+#: _irpm:40 urpmi:247 urpmi:305
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:151 urpmi:248 urpmi:306
+#: _irpm:41 urpmi:248 urpmi:306
 msgid "Yy"
 msgstr "SsYy"
 
-#: _irpm:42 po/placeholder.h:122 urpmi:249
+#: _irpm:42 urpmi:249
 msgid " (Y/n) "
 msgstr " (S/n) "
 
@@ -56,526 +58,455 @@ msgid "$rpm: command not found\n"
 msgstr "$rpm: comando no encontrado\n"
 
 #: po/placeholder.h:6
-#, fuzzy, c-format
+#, c-format
 msgid "urpmf version %s"
-msgstr "urpmi versión %s"
+msgstr "urpmf versión %s"
 
 #: po/placeholder.h:7
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
-msgstr ""
+msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
 #: po/placeholder.h:8
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
+"Este software es libre y se puede redistribuir bajo los términos de la "
+"licencia GNU GPL."
 
 #: po/placeholder.h:9 po/placeholder.h:26
-#, fuzzy
 msgid "usage: urpmf [options] <file>"
-msgstr "uso: rpmf [<archivo>]"
+msgstr "utilización: urpmf [opciones] <archivo>"
 
 #: po/placeholder.h:10
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
+"  --quiet         - no imprimir el nombre de la etiqueta (por defecto si no "
+"se da etiqueta"
 
 #: po/placeholder.h:11
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
+"                    en la línea de comando, incompatible con modo "
+"interactivo)."
 
 #: po/placeholder.h:12
 msgid "  --all           - print all tags."
-msgstr ""
+msgstr "  --all           - imprimir todas las etiquetas."
 
 #: po/placeholder.h:13
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
+"  --name          - imprimir nombre de etiqueta: nombre de archivo rpm (se "
+"asume si no"
 
 #: po/placeholder.h:14
 msgid "                    command line but without package name)."
 msgstr ""
+"                    se da etiqueta en la línea de comando pero sin nombre de "
+"paquete)."
 
 #: po/placeholder.h:15
 msgid "  --group         - print tag group: group."
-msgstr ""
+msgstr "  --group         - imprimir etiqueta de grupo: group."
 
 #: po/placeholder.h:16
 msgid "  --size          - print tag size: size."
-msgstr ""
+msgstr "  --size          - imprimir etiqueta de tamaño: size."
 
 #: po/placeholder.h:17
 msgid "  --serial        - print tag serial: serial."
-msgstr ""
+msgstr "  --serial        - imprimir etiqueta de serie: serial."
 
 #: po/placeholder.h:18
 msgid "  --summary       - print tag summary: summary."
-msgstr ""
+msgstr "  --summary       - imprimir etiqueta resumen: summary."
 
 #: po/placeholder.h:19
 msgid "  --description   - print tag description: description."
-msgstr ""
+msgstr "  --description   - imprimir etiqueta de descripción: description."
 
 #: po/placeholder.h:20
 msgid "  --provides      - print tag provides: all provides (mutliple lines)."
 msgstr ""
+"  --provides      - imprimir etiqueta provides: todo lo que proporciona "
+"(líneas múltiples)."
 
 #: po/placeholder.h:21
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
+"  --requires      - imprimir etiqueta precisa: todo lo que precisa (líneas "
+"múltiples)."
 
 #: po/placeholder.h:22
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
+"  --files         - imprimir etiqueta archivos: todos los archivo (líneas "
+"múltiples)."
 
 #: po/placeholder.h:23
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
+"  --conflicts     - imprimir etiqueta conflictos: todos los conflictos "
+"(líneas múltiples)."
 
 #: po/placeholder.h:24
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
+"  --obsoletes     - imprimir etiqueta obsoleto: todo lo obsoleto (líneas "
+"múltiples)."
 
 #: po/placeholder.h:25
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
+"  --prereqs       - imprimir etiqueta prereqs: todos los prereqs (líneas "
+"múltiples)."
 
 #: po/placeholder.h:27
 msgid "try urpmf --help for more options"
-msgstr ""
+msgstr "prueba urpmf --help para más opciones"
 
 #: po/placeholder.h:28
 msgid "urpmi is not installed"
 msgstr "urpmi no está instlado"
 
-#: po/placeholder.h:29 urpm.pm:231
+#: urpm.pm:122 urpm.pm:134
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr ""
+msgid "syntax error in config file at line %s"
+msgstr "error de sintaxis en archivo de configuración, en la línea %s"
 
-#: po/placeholder.h:30 urpm.pm:894
+#: urpm.pm:143
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
+msgid "medium \"%s\" try to use an already used hdlist, medium ignored"
+msgstr "soporte \"%s\" intenta utilizar un hdlist utilizado, soporte ignorado"
 
-#: po/placeholder.h:31
+#: urpm.pm:146
 #, c-format
-msgid "copy of [%s] failed"
-msgstr ""
-
-#: po/placeholder.h:32 urpm.pm:1583
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "no se puede crear soporte \"%s\"\n"
+msgid "medium \"%s\" try to use an already used list, medium ignored"
+msgstr "soporte \"%s\" intenta utilizar una lista ya usada, soporte ignorado"
 
-#: po/placeholder.h:33 urpm.pm:906
+#: urpm.pm:161
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"no se puede utilizar el soporte \"%s\" como archivo de lista que ya utiliza "
+"otro soporte"
 
-#: po/placeholder.h:34
+#: urpm.pm:167
 #, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "unable to use name \"%s\" for unamed medium because it is already used"
 msgstr ""
+"no se puede utilizar el nombre \"%s\" para un soporte sin denominar porque "
+"ya se está utilizando"
 
-#: po/placeholder.h:35 urpm.pm:795
-#, fuzzy, c-format
-msgid "unable to write compss file [%s]"
-msgstr "no se puede crear soporte \"%s\"\n"
-
-#: po/placeholder.h:36 urpm.pm:1719
+#: urpm.pm:174
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
+"no se puede tener en cuenta el soporte \"%s\", porque no existe archivo de "
+"lista [%s]"
 
-#: po/placeholder.h:37 urpm.pm:738
+#: urpm.pm:178
 #, c-format
-msgid "unmounting %s"
-msgstr ""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "no se puede determinar el soporte de este archivo hdlist [%s]"
 
-#: po/placeholder.h:38 urpm.pm:191
+#: urpm.pm:189
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "no se puede acceder al archivo hdlist de \"%s\", soporte ignorado"
 
-#: po/placeholder.h:39 urpm.pm:798
+#: urpm.pm:191
 #, c-format
-msgid "write compss file [%s]"
-msgstr ""
-
-#: po/placeholder.h:40
-#, fuzzy, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "no se puede crear soporte \"%s\"\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "no se puede acceder al archivo de la lista de \"%s\", soporte ignorado"
 
-#: po/placeholder.h:41 urpm.pm:1595
+#: urpm.pm:205
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr ""
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "intentando pasar al soporte existente \"%s\", evitando"
 
-#: po/placeholder.h:42 urpm.pm:752
+#: urpm.pm:211
 #, c-format
-msgid "read depslist file [%s]"
-msgstr ""
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "no se puede encontrar el archivo hdlist para \"%s\", soporte ignorado"
 
-#: po/placeholder.h:43
+#: urpm.pm:216
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
+"no se puede encontrar el archivo de lista para \"%s\", soporte ignorado"
 
-#: po/placeholder.h:44 urpm.pm:764
+#: urpm.pm:231
 #, c-format
-msgid "read provides file [%s]"
-msgstr ""
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "archivo de lista no coherente para \"%s\", soporte ignorado"
 
-#: po/placeholder.h:45 urpm.pm:161
+#: urpm.pm:239
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
+"no se puede inspeccionar el archivo de lista para \"%s\", soporte ignorado"
 
-#: po/placeholder.h:46
+#: urpm.pm:256
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:47 urpm.pm:785
-#, fuzzy, c-format
-msgid "unable to write depslist file [%s]"
-msgstr "no se puede crear soporte \"%s\"\n"
-
-#: po/placeholder.h:48
-msgid "computing dependencies"
-msgstr ""
-
-#: po/placeholder.h:49 urpm.pm:790
-#, fuzzy, c-format
-msgid "unable to write provides file [%s]"
-msgstr "no se puede crear soporte \"%s\"\n"
+msgid "unable to write config file [%s]"
+msgstr "no se puede escribir el archivo de configuración [%s]"
 
-#: po/placeholder.h:50 urpm.pm:1656
+#: urpm.pm:268
 #, c-format
-msgid "wget of [%s] failed"
-msgstr ""
+msgid "write config file [%s]"
+msgstr "escrito archivo de configuración [%s]"
 
-#: po/placeholder.h:51 urpm.pm:1599
+#: urpm.pm:284
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
+msgid "medium \"%s\" already exists"
+msgstr "ya existe el soporte \"%s\""
 
-#: po/placeholder.h:52 urpm.pm:788
+#: urpm.pm:300 urpm.pm:1607
 #, c-format
-msgid "write depslist file [%s]"
-msgstr ""
-
-#: po/placeholder.h:53
-msgid "keeping only provides files"
-msgstr ""
-
-#: po/placeholder.h:54
-#, fuzzy, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "no se puede crear soporte \"%s\"\n"
+msgid "unable to access medium \"%s\""
+msgstr "no se puede acceder al soporte \"%s\""
 
-#: po/placeholder.h:55
+#: urpm.pm:738
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:56 urpm.pm:1013
-#, fuzzy, c-format
-msgid "no package named %s"
-msgstr "ningún paquete llamado %s\n"
-
-#: po/placeholder.h:57 urpm.pm:1016
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Los paquetes siguientes contienen %s: %s\n"
+msgid "mounting %s"
+msgstr "montando %s"
 
-#: po/placeholder.h:58 urpm.pm:793
+#: urpm.pm:738
 #, c-format
-msgid "write provides file [%s]"
-msgstr ""
+msgid "unmounting %s"
+msgstr "desmontando %s"
 
-#: po/placeholder.h:59 urpm.pm:143
+#: urpm.pm:749
 #, c-format
-msgid "medium \"%s\" try to use an already used hdlist, medium ignored"
-msgstr ""
+msgid "unable to read depslist file [%s]"
+msgstr "no se puede leer archivo de lista de dependencias [%s]"
 
-#: po/placeholder.h:60 urpm.pm:1830
+#: urpm.pm:752
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
+msgid "read depslist file [%s]"
+msgstr "leído archivo de lista de dependencias [%s]"
 
-#: po/placeholder.h:61
+#: urpm.pm:761
 #, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-
-#: po/placeholder.h:62 urpm.pm:914
-msgid "mismatch arch for registering rpm file"
-msgstr ""
-
-#: po/placeholder.h:63
-#, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "no se puede crear soporte \"%s\"\n"
+msgid "unable to read provides file [%s]"
+msgstr "no se puede leer archivo de provides [%s]"
 
-#: po/placeholder.h:64
+#: urpm.pm:764
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr ""
-
-#: po/placeholder.h:65 urpm.pm:921
-msgid "error registering local packages"
-msgstr ""
+msgid "read provides file [%s]"
+msgstr "leído archivo de provides [%s]"
 
-#: po/placeholder.h:66 urpm.pm:205
+#: urpm.pm:773
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr ""
-
-#: po/placeholder.h:67
-#, fuzzy, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "no se puede actualizar soporte \"%s\"\n"
+msgid "unable to read compss file [%s]"
+msgstr "no se puede leer el archivo de compss [%s]"
 
-#: po/placeholder.h:68 urpm.pm:1742
+#: urpm.pm:776
 #, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not be updated otherwise"
-msgstr ""
+msgid "read compss file [%s]"
+msgstr "leído archivo compss [%s]"
 
-#: po/placeholder.h:72
+#: urpm.pm:785
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr ""
+msgid "unable to write depslist file [%s]"
+msgstr "no se puede escribir el archivo de la lista de dependencias [%s]"
 
-#: po/placeholder.h:73 urpm.pm:776
+#: urpm.pm:788
 #, c-format
-msgid "read compss file [%s]"
-msgstr ""
+msgid "write depslist file [%s]"
+msgstr "escrito archivo de lista de dependencias [%s]"
 
-#: po/placeholder.h:74 urpm.pm:239
+#: urpm.pm:790
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr ""
-
-#: po/placeholder.h:75
-#, fuzzy, c-format
-msgid "unable to build hdlist: %s"
-msgstr "no se puede actualizar soporte \"%s\"\n"
+msgid "unable to write provides file [%s]"
+msgstr "no se puede escribir el archivo de provides [%s]"
 
-#: po/placeholder.h:76 urpm.pm:1827
+#: urpm.pm:793
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr ""
+msgid "write provides file [%s]"
+msgstr "escrito el archivo de provides [%s]"
 
-#: po/placeholder.h:77 urpm.pm:256
+#: urpm.pm:795
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr ""
+msgid "unable to write compss file [%s]"
+msgstr "no se puede escribir el archivo compss [%s]"
 
-#: po/placeholder.h:78
+#: urpm.pm:798
 #, c-format
-msgid "found %d headers in cache"
-msgstr ""
-
-#: po/placeholder.h:79 urpm.pm:749
-#, fuzzy, c-format
-msgid "unable to read depslist file [%s]"
-msgstr "no se puede crear soporte \"%s\"\n"
+msgid "write compss file [%s]"
+msgstr "escrito archivo compss [%s]"
 
-#: po/placeholder.h:80
+#: urpm.pm:822 urpm.pm:1480
 #, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr ""
+msgid "unable to parse correctly [%s]"
+msgstr "no se puede analizar correctamente [%s]"
 
-#: po/placeholder.h:81 urpm.pm:1649
+#: urpm.pm:829 urpm.pm:1486 urpm.pm:1528
 #, c-format
-msgid "malformed input: [%s]"
-msgstr ""
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "no se puede analizar correctamente [%s] sobre el valor \"%s\""
 
-#: po/placeholder.h:82 urpm.pm:268
+#: urpm.pm:899
 #, c-format
-msgid "write config file [%s]"
-msgstr ""
+msgid "relocated %s entries in depslist"
+msgstr "relocalizadas %s entradas en la lista de dependencias"
 
-#: po/placeholder.h:83 urpm.pm:761
-#, fuzzy, c-format
-msgid "unable to read provides file [%s]"
-msgstr "no se puede crear soporte \"%s\"\n"
+#: urpm.pm:911
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "nombre de archivo rpm no válido [%s]"
 
-#: po/placeholder.h:84 urpm.pm:122 urpm.pm:134
+#: urpm.pm:912
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr ""
+msgid "unable to access rpm file [%s]"
+msgstr "no se puede acceder al archivo rpm [%s]"
 
-#: po/placeholder.h:85 urpm.pm:1576
-msgid "removable medium not selected"
-msgstr ""
+#: urpm.pm:916
+#, fuzzy
+msgid "unable to register rpm file"
+msgstr "no se puede acceder al archivo rpm [%s]"
 
-#: po/placeholder.h:86 urpm.pm:189
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr ""
+#: urpm.pm:920
+msgid "error registering local packages"
+msgstr "error registrando paquetes locales"
 
-#: po/placeholder.h:87 urpm.pm:1543
+#: urpm.pm:1012
 #, c-format
-msgid "package %s is not found."
-msgstr ""
+msgid "no package named %s"
+msgstr "ningún paquete llamado %s"
 
-#: po/placeholder.h:88 urpm.pm:178
+#: urpm.pm:1015
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Los siguientes paquetes contienen %s: %s"
+
+#: urpm.pm:1208
+msgid "unable to find all synthesis file, using parsehdlist server"
 msgstr ""
+"no se puede encontrar todos los archivos de síntesis, utilizando servidor "
+"parsehdlist"
 
-#: po/placeholder.h:89 urpm.pm:1239
+#: urpm.pm:1239
 #, c-format
 msgid "unknown data associated with %s"
-msgstr ""
+msgstr "datos desconocidos asociados a %s"
 
-#: po/placeholder.h:90 urpm.pm:146
+#: urpm.pm:1497 urpm.pm:1519
 #, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
+msgid "there are multiples packages with the same rpm filename \"%s\""
+msgstr "hay muchos paquetes con el mismo nombre de archivo rpm \"%s\""
 
-#: po/placeholder.h:91 urpm.pm:174
+#: urpm.pm:1540
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
+msgid "package %s is not found."
+msgstr "no se encontró el paquete %s."
 
-#: po/placeholder.h:92 urpm.pm:918
-msgid "rpmtools package is too old, please upgrade it"
-msgstr ""
+#: urpm.pm:1573
+msgid "removable medium not selected"
+msgstr "soporte extraíble no seleccionado"
 
-#: po/placeholder.h:93
+#: urpm.pm:1580
 #, c-format
-msgid "building hdlist [%s]"
-msgstr ""
-
-#: po/placeholder.h:94 urpm.pm:300 urpm.pm:1610
-#, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "no se puede actualizar soporte \"%s\"\n"
-
-#: po/placeholder.h:95 urpm.pm:738
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "instalando %s\n"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "no se puede leer el archivo rpm [%s] del soporte \"%s\""
 
-#: po/placeholder.h:96 urpm.pm:167
+#: urpm.pm:1592
 #, c-format
-msgid "unable to use name \"%s\" for unamed medium because it is already used"
-msgstr ""
-
-#: po/placeholder.h:97 urpm.pm:1208
-msgid "unable to find all synthesis file, using parsehdlist server"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:907
-#, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "no se puede crear soporte \"%s\"\n"
+msgid "medium \"%s\" is not selected"
+msgstr "el soporte \"%s\" no está seleccionado"
 
-#: po/placeholder.h:99 urpm.pm:1820
+#: urpm.pm:1596
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
-msgstr ""
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "soporte no coherente \"%s\" marcado como borrable, pero no borrado"
 
-#: po/placeholder.h:100
-#, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "no se puede actualizar soporte \"%s\"\n"
+#: urpm.pm:1646
+#, c-format
+msgid "malformed input: [%s]"
+msgstr "entrada mal formada [%s]"
 
-#: po/placeholder.h:101 urpm.pm:1654
+#: urpm.pm:1651
 #, c-format
 msgid "retrieving [%s]"
-msgstr ""
+msgstr "obteniendo [%s]"
 
-#: po/placeholder.h:102 urpm.pm:216
+#: urpm.pm:1653
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
+msgid "wget of [%s] failed"
+msgstr "wget de [%s] falló"
 
-#: po/placeholder.h:103 urpm.pm:913
-msgid "mismatch release for registering rpm file"
-msgstr ""
+#: urpm.pm:1716
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "seleccionar %s utilizando obsoletos"
 
-#: po/placeholder.h:104 urpm.pm:1750
+#: urpm.pm:1739
 #, c-format
 msgid ""
 "removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:108
-#, c-format
-msgid "reading hdlist file [%s]"
+" to %s since it will not be updated otherwise"
 msgstr ""
+"borrando %s para actualizar ...\n"
+" a %s ya que no se podrá actualizar de otra manera"
 
-#: po/placeholder.h:109 urpm.pm:829 urpm.pm:1489 urpm.pm:1531
+#: urpm.pm:1747
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr ""
-
-#: po/placeholder.h:110 urpm.pm:912
-msgid "mismatch version for registering rpm file"
+msgid ""
+"removing %s to upgrade ...\n"
+" to %s since it will not upgrade correctly!"
 msgstr ""
+"borrando %s para actualizar ...\n"
+" a %s ¡porque no actualizaría correctamente!"
 
-#: po/placeholder.h:111
+#: urpm.pm:1817
 #, c-format
-msgid "nothing to write in list file for \"%s\""
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
+"evitar seleccionar %s porque no hay suficientes archivos que serán "
+"actualizados"
 
-#: po/placeholder.h:112 urpm.pm:211
+#: urpm.pm:1824
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr ""
-
-#: po/placeholder.h:113 urpm.pm:773
-#, fuzzy, c-format
-msgid "unable to read compss file [%s]"
-msgstr "no se puede crear soporte \"%s\"\n"
-
-#: po/placeholder.h:114 urpm.pm:822 urpm.pm:1483
-#, fuzzy, c-format
-msgid "unable to parse correctly [%s]"
-msgstr "no se puede actualizar soporte \"%s\"\n"
+msgid "selecting %s by selection on files"
+msgstr "seleccionando %s por la selección de archivos"
 
-#: po/placeholder.h:115 urpm.pm:1500 urpm.pm:1522
+#: urpm.pm:1827
 #, c-format
-msgid "there are multiples packages with the same rpm filename \"%s\""
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
+"evitar seleccionar %s como sus locales. El lenguaje no está seleccionado aún."
 
-#: po/placeholder.h:116 urpm.pm:284
+#: urpmi:48
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr ""
+msgid "urpmi version %s"
+msgstr "urpmi versión %s"
 
-#: po/placeholder.h:117 urpmi:190
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "¿Qué elige? (1-%d)"
+#: urpmi:144
+msgid "Only superuser is allowed to install local packages"
+msgstr "Sólo el superusuario puede instalar paquetes locales"
 
-#: po/placeholder.h:118 urpmi:182
+#: urpmi:182
 msgid "One of the following packages is needed:"
 msgstr "Uno de los paquetes siguientes es necesario:"
 
-#: po/placeholder.h:119 urpmi:270
-msgid "Press enter when it's done..."
-msgstr "Pulse «Intro» cuando esté hecho..."
+#: urpmi:190
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "¿Qué elige? (1-%d)"
 
-#: po/placeholder.h:121 urpmi:284
-msgid "everything already installed"
-msgstr "ya está todo instalado"
+#: urpmi:193
+msgid "Sorry, bad choice, try again\n"
+msgstr "Disculpe, elección incorrecta, reinténtelo\n"
 
-#: po/placeholder.h:123 urpmi:238
+#: urpmi:238
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -584,104 +515,54 @@ msgstr ""
 "De manera a resolver las dependencias, se instalarán los paquetes siguientes "
 "(%d MB)"
 
-#: po/placeholder.h:124 po/placeholder.h:236 urpmi:259 urpmq:154
+#: urpmi:259 urpmq:154
 msgid "unable to get source packages, aborting"
 msgstr "no se pueden obtener los paquetes fuente, abortando"
 
-#: po/placeholder.h:125 urpmi:307
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "¿Intentar de instalar sin verificar las dependencias? (s/N) "
-
-#: po/placeholder.h:126 urpmi:269
+#: urpmi:269
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Por favor, inserte el soporte denominado \"%s\" en el dispositivo [%s]"
 
-#: po/placeholder.h:127
-#, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-"  --help           - print this help message.\n"
-"  --update         - use only update media.\n"
-"  --auto           - automatically select a good package in choices.\n"
-"  --auto-select    - automatically select packages for upgrading the "
-"system.\n"
-"  --force          - force invocation even if some package do not exist.\n"
-"  --X              - use X interface.\n"
-"  --best-output    - choose best interface according to the environment:\n"
-"                     X or text mode.\n"
-"  -a               - select all matches on command line.\n"
-"  -m               - choose minimum closure of requires (default).\n"
-"  -M               - choose maximun closure of requires.\n"
-"  -c               - choose complete method for resolving requires closure.\n"
-"  -p               - allow search in provides to find package.\n"
-"  -q               - quiet mode.\n"
-"  -v               - verbose mode.\n"
-"  names or rpm files (only for root) given on command line are installed.\n"
-msgstr ""
-"urpmi versión %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Este es un software libre y puede redistribuirse bajo los términos de la GNU "
-"GPL.\n"
-"uso:\n"
-"  --help        - imprimir este mensaje de ayuda.\n"
-"  --auto        - selección automática de un paquete bueno en las opciones.\n"
-"  --auto-select - selección automática de paquetes para actualizar el "
-"sistema.\n"
-"  --force       - forzar la llamada incluso si algún paquete no existe.\n"
-"  --X           - usar interfaz X.\n"
-"  --best-output - elegir la mejor interfaz de acuerdo al entorno:\n"
-"                  X o modo texto.\n"
-"  -a            - selección de todas las coincidencias de línea de "
-"comandos.\n"
-"  -m            - elegir requisitos mínimos (predeterminado).\n"
-"  -M            - elegir requisitos máximos.\n"
-"  -c            - elegir método completo para resolver los requisitos.\n"
-"  -q            - modo silencioso.\n"
-"  -v            - modo verboso.\n"
-" los nombres o archivos rpm de la línea de comandos se instalan (sólo "
-"root).\n"
-
-#: po/placeholder.h:149 urpmi:193
-msgid "Sorry, bad choice, try again\n"
-msgstr "Disculpe, elección incorrecta, reinténtelo\n"
+#: urpmi:270
+msgid "Press enter when it's done..."
+msgstr "Pulse «Intro» cuando esté hecho..."
 
-#: po/placeholder.h:152 urpmi:315
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "¿Intentar aún más fuerte la instalación (--force)? (s/N) "
+#: urpmi:284
+msgid "everything already installed"
+msgstr "ya está todo instalado"
 
-#: po/placeholder.h:153 urpmi:295
+#: urpmi:295
 #, c-format
 msgid "installing %s\n"
 msgstr "instalando %s\n"
 
-#: po/placeholder.h:154 urpmi:300 urpmi:314
+#: urpmi:300 urpmi:314
 msgid "Installation failed"
 msgstr "Falló la instalación"
 
-#: po/placeholder.h:155 urpmi:144
-msgid "Only superuser is allowed to install local packages"
-msgstr "Sólo el superusuario puede instalar paquetes locales"
+#: urpmi:307
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "¿Intentar de instalar sin verificar las dependencias? (s/N) "
 
-#: po/placeholder.h:158 urpmi.addmedia:46
-#, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
-msgstr ""
-"%s\n"
-"falta `with' para soporte por FTP\n"
+#: urpmi:315
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "¿Intentar aún más fuerte la instalación (--force)? (s/N) "
 
-#: po/placeholder.h:162 urpmi.addmedia:58
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "no se puede actualizar soporte \"%s\"\n"
+#: urpmi.addmedia:30
+msgid "usage: urpmi.addmedia [--update] <name> <url>"
+msgstr "uso: urpmi.addmedia [--update] <nombre> <url>"
+
+#. <path>
+#. <login>:<password>@<host>/<path> with <relative filename of hdlist>
+#. <host>/<path> with <relative filename of hdlist>
+#. <host>/<path> with <relative filename of hdlist>
+#. <path>
+#: urpmi.addmedia:37
+msgid ");"
+msgstr ");"
 
-#: po/placeholder.h:163 urpmi.addmedia:42
+#: urpmi.addmedia:42
 #, c-format
 msgid ""
 "%s\n"
@@ -690,42 +571,43 @@ msgstr ""
 "%s\n"
 "no existe el dispositivo `%s'\n"
 
-#: po/placeholder.h:167 urpmi.addmedia:57
+#: urpmi.addmedia:44
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "no se puede crear soporte \"%s\"\n"
-
-#: po/placeholder.h:168
-#, fuzzy
 msgid ""
-"usage: urpmi.addmedia [--update] <name> <url>\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable_<device>://<path>\n"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"uso: urpmi.addmedia <nombre> <url>\n"
-"donde <url> es uno de\n"
-"      file://<ruta>\n"
-"      ftp://<usuario>:<contraseña>@<host>/<ruta> with <nombre relativo de "
-"hdlist>\n"
-"      ftp://<host>/<ruta> with <nombre relativo de hdlist>\n"
-"      http://<host>/<ruta> with <nombre relativo de hdlist>\n"
-"      dispositivo_removible://<ruta>\n"
+"%s\n"
+"falta <ruta relativa de hdlist>\n"
 
-#: po/placeholder.h:177 urpmi.addmedia:44
+#: urpmi.addmedia:46
 #, c-format
 msgid ""
 "%s\n"
-"<relative path of hdlist> missing\n"
+"`with' missing for ftp media\n"
 msgstr ""
 "%s\n"
-"falta <ruta relativa de hdlist>\n"
+"falta `with' para soporte por FTP\n"
 
-#: po/placeholder.h:181 urpmi.update:52
+#: urpmi.addmedia:57
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "no se puede crear soporte \"%s\"\n"
+
+#: urpmi.addmedia:58
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "no se puede actualizar soporte \"%s\"\n"
+
+#: urpmi.update:37
+msgid "usage: urpmi.update [-a] <name> ..."
+msgstr "uso: urpmi.update [-a] <nombre> ..."
+
+#: urpmi.update:50
+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:52
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -734,49 +616,19 @@ msgstr ""
 "falta la entrada a actualizar\n"
 "(una de %s)\n"
 
-#: po/placeholder.h:185 urpmi.update:50
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nada para actualizar (use urpmi.addmedia para agregar un soporte)\n"
-
-#: po/placeholder.h:186
-#, fuzzy, c-format
-msgid ""
-"usage: urpmi.update [-a] <name> ...\n"
-"where <name> is a medium name to update.\n"
-"   -a    select all non-removable media.\n"
-"   -c    clean headers cache directory.\n"
-"   -f    force generation of base files, use another -f for hdlist files.\n"
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"uso: urpmi.update [-a] <nombre> ...\n"
-"donde <nombre> es el nombre del soporte para actualizar.\n"
-"   -a    seleccionar todos los soportes no removibles.\n"
-"   -c    borrar encabezados del directorio de cache.\n"
-"   -f    forzar la generación de hdlist o de archivos base.\n"
-"\n"
-"opciones desconocidas '%s'\n"
+#: urpmi.removemedia:32
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "uso: urpmi.removemedia [-a] <nombre> ..."
 
-#: po/placeholder.h:195
-#, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-"   -a    select all media.\n"
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"uso: urpmi.removemedia [-a] <nombre> ...\n"
-"donde <nombre> es el nombre del soporte para quitar.\n"
-"   -a    seleccionar todos los soportes.\n"
-"\n"
-"opciones desconocidas '%s'\n"
+#: urpmi.removemedia:35
+msgid ", $_);"
+msgstr ", $_);"
 
-#: po/placeholder.h:202 urpmi.removemedia:44
+#: urpmi.removemedia:44
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "nada para quitar (use urpmi.addmedia para agregar un soporte)\n"
 
-#: po/placeholder.h:203 urpmi.removemedia:46
+#: urpmi.removemedia:46
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -785,42 +637,22 @@ msgstr ""
 "falta la entrada a quitar\n"
 "(una de %s)\n"
 
-#: po/placeholder.h:207 urpmq:85
-#, fuzzy, c-format
+#: urpmq:34
+#, c-format
+msgid "urpmq version %s"
+msgstr "urpmq versión %s"
+
+#: urpmq:85
+#, c-format
 msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opción desconocida \"-$1\", verifique el uso con --help\n"
+msgstr "urpmq: opción desconocida \"-%s\", verifique el uso con --help\n"
 
-#: po/placeholder.h:208
+#: urpmq:87
 #, c-format
-msgid ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-"  -h             - print this help message.\n"
-"  -v             - verbose mode.\n"
-"  -d             - extend query to package dependencies.\n"
-"  -u             - remove package if a better version is already installed.\n"
-"  -m             - extend query to package dependencies, remove already\n"
-"                   installed package that provide what is necessary, add\n"
-"                   packages that may be block the upgrade.\n"
-"  -M             - extend query to package dependencies and remove already\n"
-"                   installed package only if they are newer or the same.\n"
-"  -c             - choose complete method for resolving requires closure.\n"
-"  -p             - allow search in provides to find package.\n"
-"  -g             - print groups too with name.\n"
-"  -r             - print version and release too with name.\n"
-"  --update       - use only update media.\n"
-"  --auto-select  - automatically select packages for upgrading the system.\n"
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-"  --sources      - give all source packages before downloading (root only).\n"
-"  --force        - force invocation even if some package do not exist.\n"
-"  names or rpm files given on command line are queried.\n"
-msgstr ""
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: no se puede leer el archivo rpm \"%s\"\n"
 
-#: po/placeholder.h:234 urpmq:132
+#: urpmq:132
 msgid ""
 "some package have to be removed for being upgraded, this is not supported "
 "yet\n"
@@ -828,68 +660,247 @@ msgstr ""
 "se tiene que quitar algún paquete para poder actualizarlo, todavía esto no "
 "está soportado\n"
 
-#: po/placeholder.h:235 urpmq:87
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: no se puede leer el archivo rpm \"$_\"\n"
+#~ msgid "copy of [%s] failed"
+#~ msgstr "falló la copia de [%s]"
 
-#: urpmi:48
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi versión %s"
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "fuente de [%s] no encontrada como [%s]"
 
-#: urpmi.addmedia:30
-#, fuzzy
-msgid "usage: urpmi.addmedia [--update] <name> <url>"
-msgstr "uso: urpmi.addmedia <nombre> <url>"
+#~ msgid "trying to remove inexistant medium \"%s\""
+#~ msgstr "intentando borrar soporte no existente \"%s\""
 
-#. <path>
-#. <login>:<password>@<host>/<path> with <relative filename of hdlist>
-#. <host>/<path> with <relative filename of hdlist>
-#. <host>/<path> with <relative filename of hdlist>
-#. <path>
-#: urpmi.addmedia:37
-msgid ");"
-msgstr ");"
+#~ msgid "built hdlist synthesis file for medium \"%s\""
+#~ msgstr "construída síntesis de archivo hdlist para el soporte \"%s\""
 
-#: urpmi.update:37
-msgid "usage: urpmi.update [-a] <name> ..."
-msgstr "uso: urpmi.update [-a] <nombre> ..."
+#~ msgid "nothing written in list file for \"%s\""
+#~ msgstr "no se escribió nada en el archivo de lista para \"%s\""
 
-#: urpmi.removemedia:32
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "uso: urpmi.removemedia [-a] <nombre> ..."
+#~ msgid "computing dependencies"
+#~ msgstr "calculando dependencias"
 
-#: urpmi.removemedia:35
-msgid ", $_);"
-msgstr ", $_);"
+#~ msgid "keeping only provides files"
+#~ msgstr "guardando sólo archivos de provides"
 
-#: urpmq:34
-#, c-format
-msgid "urpmq version %s"
-msgstr "urpmq versión %s"
+#~ msgid "trying to select inexistant medium \"%s\""
+#~ msgstr "intentando seleccionar soporte no existente \"%s\""
+
+#~ msgid "no hdlist file found for medium \"%s\""
+#~ msgstr "no se encontró el archivo hdlist para el soporte \"%s\""
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget de [%s] falló (¿puede que no se encuentre wget?)"
+
+#~ msgid "mismatch arch for registering rpm file"
+#~ msgstr "arquitectura incorrecta al registrar  archivo rpm"
+
+#~ msgid "unable to write list file of \"%s\""
+#~ msgstr "no se puede escribir archivo de lista para \"%s\""
+
+#~ msgid "removing %d obsolete headers in cache"
+#~ msgstr "borrando %d cabeceras obsoletas de caché"
+
+#~ msgid "unable to build synthesis file for medium \"%s\""
+#~ msgstr "no se puede construir archivo de síntesis para el soporte \"%s\""
+
+#~ msgid "no rpm files found from [%s]"
+#~ msgstr "no se encontraron archivos rpm desde [%s]"
+
+#~ msgid "unable to build hdlist: %s"
+#~ msgstr "no se puede construir hdlist %s"
+
+#~ msgid "found %d headers in cache"
+#~ msgstr "encontradas %d cabeceras en caché"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "no se puede copiar el fuente de [%s] desde [%s]"
+
+#~ msgid "rpmtools package is too old, please upgrade it"
+#~ msgstr "el paquete rpmtools es demasiado antiguo, actualícelo, por favor"
 
-#~ msgid "));"
-#~ msgstr "));"
+#~ msgid "building hdlist [%s]"
+#~ msgstr "construyendo hdlist [%s]"
 
-#~ msgid "), $_);"
-#~ msgstr "), $_);"
+#~ msgid "unable to parse hdlist file of \"%s\""
+#~ msgstr "no se puede analizar el archivo hdlist de \"%s\""
 
-#~ msgid "unknown options \"%s\"\n"
-#~ msgstr "opciones desconocidas: \"%s\"\n"
+#~ msgid "mismatch release for registering rpm file"
+#~ msgstr "liberación no coincide al registrar archivo rpm"
+
+#~ msgid "reading hdlist file [%s]"
+#~ msgstr "leyendo archivo hdlist [%s]"
+
+#~ msgid "mismatch version for registering rpm file"
+#~ msgstr "versión errónea al registrar archivo rpm"
+
+#~ msgid "nothing to write in list file for \"%s\""
+#~ msgstr "nada que escribir en el archivo de lista para \"%s\""
+
+#~ msgid ""
+#~ "urpmi version %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "usage:\n"
+#~ "  --help           - print this help message.\n"
+#~ "  --update         - use only update media.\n"
+#~ "  --auto           - automatically select a good package in choices.\n"
+#~ "  --auto-select    - automatically select packages for upgrading the "
+#~ "system.\n"
+#~ "  --force          - force invocation even if some package do not exist.\n"
+#~ "  --X              - use X interface.\n"
+#~ "  --best-output    - choose best interface according to the environment:\n"
+#~ "                     X or text mode.\n"
+#~ "  -a               - select all matches on command line.\n"
+#~ "  -m               - choose minimum closure of requires (default).\n"
+#~ "  -M               - choose maximun closure of requires.\n"
+#~ "  -c               - choose complete method for resolving requires "
+#~ "closure.\n"
+#~ "  -p               - allow search in provides to find package.\n"
+#~ "  -q               - quiet mode.\n"
+#~ "  -v               - verbose mode.\n"
+#~ "  names or rpm files (only for root) given on command line are "
+#~ "installed.\n"
+#~ msgstr ""
+#~ "urpmi versión %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Este es un software libre y puede redistribuirse bajo los términos de la "
+#~ "GNU GPL.\n"
+#~ "uso:\n"
+#~ "  --help        - mostrar este mensaje de ayuda.\n"
+#~ "  --update      - utilizar sólo soporte de actualización.\n"
+#~ "  --auto        - selección automática de un paquete bueno en las "
+#~ "opciones.\n"
+#~ "  --auto-select - selección automática de paquetes para actualizar el "
+#~ "sistema.\n"
+#~ "  --force       - forzar la llamada incluso si algún paquete no existe.\n"
+#~ "  --X           - usar interfaz X.\n"
+#~ "  --best-output - elegir la mejor interfaz de acuerdo al entorno:\n"
+#~ "                  X o modo texto.\n"
+#~ "  -a            - selección de todas las coincidencias de línea de "
+#~ "comandos.\n"
+#~ "  -m            - elegir requisitos mínimos (predeterminado).\n"
+#~ "  -M            - elegir requisitos máximos.\n"
+#~ "  -c            - elegir método completo para resolver los requisitos.\n"
+#~ "  -p            - permitir buscar in lo que proporciona para encontrar "
+#~ "paquete.\n"
+#~ "  -q            - modo silencioso.\n"
+#~ "  -v            - modo informativo.\n"
+#~ " los nombres o archivos rpm de la línea de comandos se instalan (sólo "
+#~ "root).\n"
 
 #~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
+#~ "usage: urpmi.addmedia [--update] <name> <url>\n"
+#~ "where <url> is one of\n"
+#~ "       file://<path>\n"
+#~ "       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+#~ "hdlist>\n"
+#~ "       ftp://<host>/<path> with <relative filename of hdlist>\n"
+#~ "       http://<host>/<path> with <relative filename of hdlist>\n"
+#~ "       removable_<device>://<path>\n"
 #~ msgstr ""
-#~ "uso: urpmi [-h] [--auto] [--force] [-a] nombre_de_paquete "
-#~ "[nombres_de_paquetes...]\n"
+#~ "utilización: urpmi.addmedia [--update] <nombre> <url>\n"
+#~ "donde <url> es uno de\n"
+#~ "      file://<ruta>\n"
+#~ "      ftp://<usuario>:<contraseña>@<host>/<ruta> with <nombre relativo de "
+#~ "hdlist>\n"
+#~ "      ftp://<host>/<ruta> with <nombre relativo de hdlist>\n"
+#~ "      http://<host>/<ruta> with <nombre relativo de hdlist>\n"
+#~ "      dispositivo_extraíble://<ruta>\n"
 
-#~ msgid "rpm database query failed\n"
-#~ msgstr "falló el pedido a la base de datos de rpm\n"
+#~ msgid ""
+#~ "usage: urpmi.update [-a] <name> ...\n"
+#~ "where <name> is a medium name to update.\n"
+#~ "   -a    select all non-removable media.\n"
+#~ "   -c    clean headers cache directory.\n"
+#~ "   -f    force generation of base files, use another -f for hdlist "
+#~ "files.\n"
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "utilización: urpmi.update [-a] <nombre> ...\n"
+#~ "donde <nombre> es el nombre del soporte para actualizar.\n"
+#~ "   -a    seleccionar todos los soportes no extraíbles.\n"
+#~ "   -c    borrar encabezados del directorio de cache.\n"
+#~ "   -f    forzar la generación de archivos base, utilice otro -f para "
+#~ "archivos de hdlist.\n"
+#~ "\n"
+#~ "opciones desconocidas '%s'\n"
 
-#~ msgid "Sorry can't find file %s, exiting"
-#~ msgstr "Disculpe, no puedo encontrar el archivo %s, saliendo"
+#~ msgid ""
+#~ "usage: urpmi.removemedia [-a] <name> ...\n"
+#~ "where <name> is a medium name to remove.\n"
+#~ "   -a    select all media.\n"
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "uso: urpmi.removemedia [-a] <nombre> ...\n"
+#~ "donde <nombre> es el nombre del soporte para quitar.\n"
+#~ "   -a    seleccionar todos los soportes.\n"
+#~ "\n"
+#~ "opciones desconocidas '%s'\n"
 
-#~ msgid "Failed dependencies: %s requires %s"
-#~ msgstr "Dependencias fallidas: %s requiere %s"
+#~ msgid ""
+#~ "urpmq version %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "usage:\n"
+#~ "  -h             - print this help message.\n"
+#~ "  -v             - verbose mode.\n"
+#~ "  -d             - extend query to package dependencies.\n"
+#~ "  -u             - remove package if a better version is already "
+#~ "installed.\n"
+#~ "  -m             - extend query to package dependencies, remove already\n"
+#~ "                   installed package that provide what is necessary, add\n"
+#~ "                   packages that may be block the upgrade.\n"
+#~ "  -M             - extend query to package dependencies and remove "
+#~ "already\n"
+#~ "                   installed package only if they are newer or the same.\n"
+#~ "  -c             - choose complete method for resolving requires "
+#~ "closure.\n"
+#~ "  -p             - allow search in provides to find package.\n"
+#~ "  -g             - print groups too with name.\n"
+#~ "  -r             - print version and release too with name.\n"
+#~ "  --update       - use only update media.\n"
+#~ "  --auto-select  - automatically select packages for upgrading the "
+#~ "system.\n"
+#~ "  --headers      - extract headers for package listed from urpmi db to\n"
+#~ "                   stdout (root only).\n"
+#~ "  --sources      - give all source packages before downloading (root "
+#~ "only).\n"
+#~ "  --force        - force invocation even if some package do not exist.\n"
+#~ "  names or rpm files given on command line are queried.\n"
+#~ msgstr ""
+#~ "urpmq versión %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "Esto es software libre y puede redistribuirse bajo los términos de la "
+#~ "licencia GNU GPL.utilización:\n"
+#~ "  -h             - muestra este mensaje de ayuda.\n"
+#~ "  -v             - modo informativo.\n"
+#~ "  -d             - extender consulta a las dependencias del paquete.\n"
+#~ "  -u             - borrar el paquete si hay instalada una versión mejor.\n"
+#~ "  -m             - extender la consulta a las dependencias del paquete\n"
+#~ "                   borrar paquetes ya instalados y proporcionar los "
+#~ "paquetes\n"
+#~ "                   necesarios que puede precisar la actualización.\n"
+#~ "  -M             - extender la consulta a las dependencias del paquete y "
+#~ "borrar\n"
+#~ "                   el paquete ya instalado sólo si son nuevas o la "
+#~ "misma.\n"
+#~ "  -c             - seleccionar método completo para resolver clausura de "
+#~ "requisitos.\n"
+#~ "  -p             - permitir buscar en lo que proporciona para encontrar "
+#~ "el paquete.\n"
+#~ "  -g             - mostrar grupos junto con nombre.\n"
+#~ "  -r             - mostrar versión y liberación junto con el nombre.\n"
+#~ "  --update       - utilizar sólo soporte de actualización.\n"
+#~ "  --auto-select  - seleccionar automáticamente paquetes para actualiza el "
+#~ "sistema.\n"
+#~ "  --headers      - extrae cabeceras para paquetes listados desde la BD "
+#~ "de\n"
+#~ "                   urpmi a la salida estándar (sólo root).\n"
+#~ "  --sources      - dar todos los paquetes fuente antes de bajar (sólo "
+#~ "root).\n"
+#~ "  --force        - forzar la invocación aun cuando no exista algún "
+#~ "paquete.\n"
+#~ "  se requieren los nombres o archivos rpm en la línea de comando.\n"
diff --git a/po/no.po b/po/no.po
index dd932645..e3ddff55 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.5\n"
-"POT-Creation-Date: 2001-07-19 16:38+0200\n"
+"POT-Creation-Date: 2001-07-28 04:12+0200\n"
 "PO-Revision-Date: 2001-03-13 13:28CET\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: Norsk\n"
@@ -26,27 +26,27 @@ msgstr ""
 "Automatisk installasjon av pakker...\n"
 "Du ba om installasjon av pakke $rpm\n"
 
-#: _irpm:31 po/placeholder.h:150 urpmi:239
+#: _irpm:31 urpmi:239
 msgid "Is it ok?"
 msgstr "Er det ok?"
 
-#: _irpm:33 po/placeholder.h:156 urpmi:242 urpmi:272
+#: _irpm:33 urpmi:242 urpmi:272
 msgid "Ok"
 msgstr "Ok"
 
-#: _irpm:34 po/placeholder.h:120 urpmi:243 urpmi:273
+#: _irpm:34 urpmi:243 urpmi:273
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: _irpm:40 po/placeholder.h:157 urpmi:247 urpmi:305
+#: _irpm:40 urpmi:247 urpmi:305
 msgid "Nn"
 msgstr "Nn"
 
-#: _irpm:41 po/placeholder.h:151 urpmi:248 urpmi:306
+#: _irpm:41 urpmi:248 urpmi:306
 msgid "Yy"
 msgstr "Jj"
 
-#: _irpm:42 po/placeholder.h:122 urpmi:249
+#: _irpm:42 urpmi:249
 msgid " (Y/n) "
 msgstr " (J/n) "
 
@@ -55,526 +55,428 @@ msgid "$rpm: command not found\n"
 msgstr "$rpm: kommando ikke funnet\n"
 
 #: po/placeholder.h:6
-#, fuzzy, c-format
+#, c-format
 msgid "urpmf version %s"
-msgstr "urpmi versjon %s"
+msgstr "urpmf versjon %s"
 
 #: po/placeholder.h:7
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
-msgstr ""
+msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
 #: po/placeholder.h:8
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
-msgstr ""
+msgstr "Dette er fri programvare og kan redistribueres uder vilkårene til GNU "
 
 #: po/placeholder.h:9 po/placeholder.h:26
-#, fuzzy
 msgid "usage: urpmf [options] <file>"
-msgstr "bruk: rpmf [<file>]"
+msgstr "bruk: urpmf [valg] <fil>"
 
 #: po/placeholder.h:10
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
+"  --quiet         - do not print tag name (default if no tag given on command"
 
 #: po/placeholder.h:11
 msgid "                    line, incompatible with interactive mode)."
-msgstr ""
+msgstr "                    linje, ikke kompatibel med interaktivt modus)."
 
 #: po/placeholder.h:12
 msgid "  --all           - print all tags."
-msgstr ""
+msgstr "  --all           - print all tags."
 
 #: po/placeholder.h:13
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
 
 #: po/placeholder.h:14
 msgid "                    command line but without package name)."
-msgstr ""
+msgstr "                    kommandolinje, men uten pakkenavn)."
 
 #: po/placeholder.h:15
 msgid "  --group         - print tag group: group."
-msgstr ""
+msgstr "  --group         - print tag group: group."
 
 #: po/placeholder.h:16
 msgid "  --size          - print tag size: size."
-msgstr ""
+msgstr "  --size          - print tag size: size."
 
 #: po/placeholder.h:17
 msgid "  --serial        - print tag serial: serial."
-msgstr ""
+msgstr "  --serial        - print tag serial: serial."
 
 #: po/placeholder.h:18
 msgid "  --summary       - print tag summary: summary."
-msgstr ""
+msgstr "  --summary       - print tag summary: summary."
 
 #: po/placeholder.h:19
 msgid "  --description   - print tag description: description."
-msgstr ""
+msgstr "  --description   - print tag description: description."
 
 #: po/placeholder.h:20
 msgid "  --provides      - print tag provides: all provides (mutliple lines)."
-msgstr ""
+msgstr "  --provides      - print tag provides: all provides (mutliple lines)."
 
 #: po/placeholder.h:21
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr ""
+msgstr "  --requires      - print tag requires: all requires (multiple lines)."
 
 #: po/placeholder.h:22
 msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
+msgstr "  --files         - print tag files: all files (multiple lines)."
 
 #: po/placeholder.h:23
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 
 #: po/placeholder.h:24
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 
 #: po/placeholder.h:25
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr ""
+msgstr "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 
 #: po/placeholder.h:27
 msgid "try urpmf --help for more options"
-msgstr ""
+msgstr "prøv urpmf --help for flere valg"
 
 #: po/placeholder.h:28
 msgid "urpmi is not installed"
 msgstr "urpmi er ikke installert"
 
-#: po/placeholder.h:29 urpm.pm:231
+#: urpm.pm:122 urpm.pm:134
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr ""
+msgid "syntax error in config file at line %s"
+msgstr "syntaks feil i config fil ved linje %s"
 
-#: po/placeholder.h:30 urpm.pm:894
+#: urpm.pm:143
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
+msgid "medium \"%s\" try to use an already used hdlist, medium ignored"
+msgstr "media \"%s\" prøver å bruke en allerede brukt hdlist, media ignorert"
 
-#: po/placeholder.h:31
+#: urpm.pm:146
 #, c-format
-msgid "copy of [%s] failed"
-msgstr ""
-
-#: po/placeholder.h:32 urpm.pm:1583
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "kunne ikke opprette medium \"%s\"\n"
+msgid "medium \"%s\" try to use an already used list, medium ignored"
+msgstr "media \"%s\" prøver å bruke en allerede brukt liste, media ignorert"
 
-#: po/placeholder.h:33 urpm.pm:906
+#: urpm.pm:161
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"kan ikke ta hånd om media \"%s\" da liste fil allerede blir brukt av et "
+"annet media"
 
-#: po/placeholder.h:34
+#: urpm.pm:167
 #, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "unable to use name \"%s\" for unamed medium because it is already used"
 msgstr ""
+"kunne ikke bruke navn \"%s\" for media uten navn da det allerede er brukt"
 
-#: po/placeholder.h:35 urpm.pm:795
-#, fuzzy, c-format
-msgid "unable to write compss file [%s]"
-msgstr "kunne ikke opprette medium \"%s\"\n"
-
-#: po/placeholder.h:36 urpm.pm:1719
+#: urpm.pm:174
 #, c-format
-msgid "selecting %s using obsoletes"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
+"kunne ikke ta media \"%s\" inn til konto da ingen liste fil [%s] eksisterer"
 
-#: po/placeholder.h:37 urpm.pm:738
+#: urpm.pm:178
 #, c-format
-msgid "unmounting %s"
-msgstr ""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "kunne ikke bestemme media av denne hdlist filen [%s]"
 
-#: po/placeholder.h:38 urpm.pm:191
+#: urpm.pm:189
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "kunne ikke nå hdlist fil av \"%s\", media ignorert"
 
-#: po/placeholder.h:39 urpm.pm:798
+#: urpm.pm:191
 #, c-format
-msgid "write compss file [%s]"
-msgstr ""
-
-#: po/placeholder.h:40
-#, fuzzy, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "kunne ikke opprette medium \"%s\"\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "kan ikke få tilgang til filen til \"%s\", media ignorert"
 
-#: po/placeholder.h:41 urpm.pm:1595
+#: urpm.pm:205
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr ""
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "prøver å gå forbi eksisterende media \"%s\", unngår"
 
-#: po/placeholder.h:42 urpm.pm:752
+#: urpm.pm:211
 #, c-format
-msgid "read depslist file [%s]"
-msgstr ""
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "kunne ikke finne hdlist fil for \"%s\", media ignorert"
 
-#: po/placeholder.h:43
+#: urpm.pm:216
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "kunne ikke finne liste fil for \"%s\", media ignorert"
 
-#: po/placeholder.h:44 urpm.pm:764
+#: urpm.pm:231
 #, c-format
-msgid "read provides file [%s]"
-msgstr ""
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "incoherent list file for \"%s\", medium ignored"
 
-#: po/placeholder.h:45 urpm.pm:161
+#: urpm.pm:239
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "kunne ikke inspisere liste fil for \"%s\", media ignorert"
 
-#: po/placeholder.h:46
+#: urpm.pm:256
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:47 urpm.pm:785
-#, fuzzy, c-format
-msgid "unable to write depslist file [%s]"
-msgstr "kunne ikke opprette medium \"%s\"\n"
-
-#: po/placeholder.h:48
-msgid "computing dependencies"
-msgstr ""
-
-#: po/placeholder.h:49 urpm.pm:790
-#, fuzzy, c-format
-msgid "unable to write provides file [%s]"
-msgstr "kunne ikke opprette medium \"%s\"\n"
+msgid "unable to write config file [%s]"
+msgstr "kunne ikke skrive config fil [%s]"
 
-#: po/placeholder.h:50 urpm.pm:1656
+#: urpm.pm:268
 #, c-format
-msgid "wget of [%s] failed"
-msgstr ""
+msgid "write config file [%s]"
+msgstr "skriv config fil [%s]"
 
-#: po/placeholder.h:51 urpm.pm:1599
+#: urpm.pm:284
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
+msgid "medium \"%s\" already exists"
+msgstr "media \"%s\" eksisterer allerede"
 
-#: po/placeholder.h:52 urpm.pm:788
+#: urpm.pm:300 urpm.pm:1607
 #, c-format
-msgid "write depslist file [%s]"
-msgstr ""
-
-#: po/placeholder.h:53
-msgid "keeping only provides files"
-msgstr ""
-
-#: po/placeholder.h:54
-#, fuzzy, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "kunne ikke opprette medium \"%s\"\n"
+msgid "unable to access medium \"%s\""
+msgstr "kunne ikke nå media \"%s\""
 
-#: po/placeholder.h:55
+#: urpm.pm:738
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr ""
+msgid "mounting %s"
+msgstr "monterer %s"
 
-#: po/placeholder.h:56 urpm.pm:1013
+#: urpm.pm:738
 #, c-format
-msgid "no package named %s"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1016
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "En av følgende pakker behøves:"
+msgid "unmounting %s"
+msgstr "demonterer %s"
 
-#: po/placeholder.h:58 urpm.pm:793
+#: urpm.pm:749
 #, c-format
-msgid "write provides file [%s]"
-msgstr ""
+msgid "unable to read depslist file [%s]"
+msgstr "kunne ikke lese depsliste fil [%s]"
 
-#: po/placeholder.h:59 urpm.pm:143
+#: urpm.pm:752
 #, c-format
-msgid "medium \"%s\" try to use an already used hdlist, medium ignored"
-msgstr ""
+msgid "read depslist file [%s]"
+msgstr "les depsliste fil [%s]"
 
-#: po/placeholder.h:60 urpm.pm:1830
+#: urpm.pm:761
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
+msgid "unable to read provides file [%s]"
+msgstr "kunne ikke lese provides fil [%s]"
 
-#: po/placeholder.h:61
+#: urpm.pm:764
 #, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-
-#: po/placeholder.h:62 urpm.pm:914
-msgid "mismatch arch for registering rpm file"
-msgstr ""
-
-#: po/placeholder.h:63
-#, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "kunne ikke opprette medium \"%s\"\n"
+msgid "read provides file [%s]"
+msgstr "les provides fil [%s]"
 
-#: po/placeholder.h:64
+#: urpm.pm:773
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr ""
-
-#: po/placeholder.h:65 urpm.pm:921
-msgid "error registering local packages"
-msgstr ""
+msgid "unable to read compss file [%s]"
+msgstr "kunne ikke lese compss fil [%s]"
 
-#: po/placeholder.h:66 urpm.pm:205
+#: urpm.pm:776
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr ""
-
-#: po/placeholder.h:67
-#, fuzzy, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "kunne ikke oppdatere medium \"%s\"\n"
+msgid "read compss file [%s]"
+msgstr "les compss fil [%s]"
 
-#: po/placeholder.h:68 urpm.pm:1742
+#: urpm.pm:785
 #, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not be updated otherwise"
-msgstr ""
+msgid "unable to write depslist file [%s]"
+msgstr "kunne ikke skrive depsliste fil [%s]"
 
-#: po/placeholder.h:72
+#: urpm.pm:788
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr ""
+msgid "write depslist file [%s]"
+msgstr "skriv depsliste fil [%s]"
 
-#: po/placeholder.h:73 urpm.pm:776
+#: urpm.pm:790
 #, c-format
-msgid "read compss file [%s]"
-msgstr ""
+msgid "unable to write provides file [%s]"
+msgstr "kunne ikke skrive provides fil [%s]"
 
-#: po/placeholder.h:74 urpm.pm:239
+#: urpm.pm:793
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr ""
-
-#: po/placeholder.h:75
-#, fuzzy, c-format
-msgid "unable to build hdlist: %s"
-msgstr "kunne ikke oppdatere medium \"%s\"\n"
+msgid "write provides file [%s]"
+msgstr "skriv provides fil [%s]"
 
-#: po/placeholder.h:76 urpm.pm:1827
+#: urpm.pm:795
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr ""
+msgid "unable to write compss file [%s]"
+msgstr "kunne ikke skrive compss fil [%s]"
 
-#: po/placeholder.h:77 urpm.pm:256
+#: urpm.pm:798
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr ""
+msgid "write compss file [%s]"
+msgstr "skriv compss fil [%s]"
 
-#: po/placeholder.h:78
+#: urpm.pm:822 urpm.pm:1480
 #, c-format
-msgid "found %d headers in cache"
-msgstr ""
-
-#: po/placeholder.h:79 urpm.pm:749
-#, fuzzy, c-format
-msgid "unable to read depslist file [%s]"
-msgstr "kunne ikke opprette medium \"%s\"\n"
+msgid "unable to parse correctly [%s]"
+msgstr "unable to parse correctly [%s]"
 
-#: po/placeholder.h:80
+#: urpm.pm:829 urpm.pm:1486 urpm.pm:1528
 #, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr ""
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "unable to parse correctly [%s] on value \"%s\""
 
-#: po/placeholder.h:81 urpm.pm:1649
+#: urpm.pm:899
 #, c-format
-msgid "malformed input: [%s]"
-msgstr ""
+msgid "relocated %s entries in depslist"
+msgstr "fant igjen %s innganger i depsliste"
 
-#: po/placeholder.h:82 urpm.pm:268
+#: urpm.pm:911
 #, c-format
-msgid "write config file [%s]"
-msgstr ""
-
-#: po/placeholder.h:83 urpm.pm:761
-#, fuzzy, c-format
-msgid "unable to read provides file [%s]"
-msgstr "kunne ikke opprette medium \"%s\"\n"
+msgid "invalid rpm file name [%s]"
+msgstr "invalid rpm filnavn [%s]"
 
-#: po/placeholder.h:84 urpm.pm:122 urpm.pm:134
+#: urpm.pm:912
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr ""
+msgid "unable to access rpm file [%s]"
+msgstr "kunne ikke nå rpm fil [%s]"
 
-#: po/placeholder.h:85 urpm.pm:1576
-msgid "removable medium not selected"
-msgstr ""
+#: urpm.pm:916
+#, fuzzy
+msgid "unable to register rpm file"
+msgstr "kunne ikke nå rpm fil [%s]"
 
-#: po/placeholder.h:86 urpm.pm:189
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr ""
+#: urpm.pm:920
+msgid "error registering local packages"
+msgstr "feil ved registrering av lokale pakker"
 
-#: po/placeholder.h:87 urpm.pm:1543
+#: urpm.pm:1012
 #, c-format
-msgid "package %s is not found."
-msgstr ""
+msgid "no package named %s"
+msgstr "ingen pakke kalt %s"
 
-#: po/placeholder.h:88 urpm.pm:178
+#: urpm.pm:1015
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr ""
+msgid "The following packages contain %s: %s"
+msgstr "Følgende pakker inneholder %s: %s"
+
+#: urpm.pm:1208
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "kunne ikke finne alle synthesis file, bruker parsehdlist tjener"
 
-#: po/placeholder.h:89 urpm.pm:1239
+#: urpm.pm:1239
 #, c-format
 msgid "unknown data associated with %s"
-msgstr ""
+msgstr "ukjent data assosiert med %s"
 
-#: po/placeholder.h:90 urpm.pm:146
+#: urpm.pm:1497 urpm.pm:1519
 #, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
+msgid "there are multiples packages with the same rpm filename \"%s\""
+msgstr "det er flere pakker med samme rpm filnavn \"%s\""
 
-#: po/placeholder.h:91 urpm.pm:174
+#: urpm.pm:1540
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
+msgid "package %s is not found."
+msgstr "pakke %s er ikke funnet."
 
-#: po/placeholder.h:92 urpm.pm:918
-msgid "rpmtools package is too old, please upgrade it"
-msgstr ""
+#: urpm.pm:1573
+msgid "removable medium not selected"
+msgstr "fjernbart media ikke valgt"
 
-#: po/placeholder.h:93
+#: urpm.pm:1580
 #, c-format
-msgid "building hdlist [%s]"
-msgstr ""
-
-#: po/placeholder.h:94 urpm.pm:300 urpm.pm:1610
-#, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "kunne ikke oppdatere medium \"%s\"\n"
-
-#: po/placeholder.h:95 urpm.pm:738
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "installerer %s\n"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "kunne ikke lese rpm fil [%s] fra media \"%s\""
 
-#: po/placeholder.h:96 urpm.pm:167
+#: urpm.pm:1592
 #, c-format
-msgid "unable to use name \"%s\" for unamed medium because it is already used"
-msgstr ""
-
-#: po/placeholder.h:97 urpm.pm:1208
-msgid "unable to find all synthesis file, using parsehdlist server"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:907
-#, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "kunne ikke opprette medium \"%s\"\n"
+msgid "medium \"%s\" is not selected"
+msgstr "media \"%s\" er ikke valgt"
 
-#: po/placeholder.h:99 urpm.pm:1820
+#: urpm.pm:1596
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
-msgstr ""
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "incoherent media \"%s\" merket fjernbart, men er det ikke"
 
-#: po/placeholder.h:100
-#, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "kunne ikke oppdatere medium \"%s\"\n"
+#: urpm.pm:1646
+#, c-format
+msgid "malformed input: [%s]"
+msgstr "malformed input: [%s]"
 
-#: po/placeholder.h:101 urpm.pm:1654
+#: urpm.pm:1651
 #, c-format
 msgid "retrieving [%s]"
-msgstr ""
+msgstr "mottar [%s]"
 
-#: po/placeholder.h:102 urpm.pm:216
+#: urpm.pm:1653
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
+msgid "wget of [%s] failed"
+msgstr "wget av [%s] mislykket"
 
-#: po/placeholder.h:103 urpm.pm:913
-msgid "mismatch release for registering rpm file"
-msgstr ""
+#: urpm.pm:1716
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "velger %s ved å bruke obsolete"
 
-#: po/placeholder.h:104 urpm.pm:1750
+#: urpm.pm:1739
 #, c-format
 msgid ""
 "removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:108
-#, c-format
-msgid "reading hdlist file [%s]"
+" to %s since it will not be updated otherwise"
 msgstr ""
+"fjerner %s for å oppgradere ...\n"
+" til %s siden den ikke vil bli oppdatert ellers"
 
-#: po/placeholder.h:109 urpm.pm:829 urpm.pm:1489 urpm.pm:1531
+#: urpm.pm:1747
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr ""
-
-#: po/placeholder.h:110 urpm.pm:912
-msgid "mismatch version for registering rpm file"
+msgid ""
+"removing %s to upgrade ...\n"
+" to %s since it will not upgrade correctly!"
 msgstr ""
+"fjerner %s fra å oppgradere ...\n"
+" til %s siden den ikke vil oppgradere korrekt!"
 
-#: po/placeholder.h:111
+#: urpm.pm:1817
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr ""
+msgid "avoid selecting %s as not enough files will be updated"
+msgstr "unngår å velge %s da ikke nok filer vil bli oppdatert"
 
-#: po/placeholder.h:112 urpm.pm:211
+#: urpm.pm:1824
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr ""
-
-#: po/placeholder.h:113 urpm.pm:773
-#, fuzzy, c-format
-msgid "unable to read compss file [%s]"
-msgstr "kunne ikke opprette medium \"%s\"\n"
-
-#: po/placeholder.h:114 urpm.pm:822 urpm.pm:1483
-#, fuzzy, c-format
-msgid "unable to parse correctly [%s]"
-msgstr "kunne ikke oppdatere medium \"%s\"\n"
+msgid "selecting %s by selection on files"
+msgstr "velger %s ved valg av filer"
 
-#: po/placeholder.h:115 urpm.pm:1500 urpm.pm:1522
+#: urpm.pm:1827
 #, c-format
-msgid "there are multiples packages with the same rpm filename \"%s\""
-msgstr ""
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr "ungå valg av %s da dens lokale språk ikke er valgt allerede"
 
-#: po/placeholder.h:116 urpm.pm:284
+#: urpmi:48
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr ""
+msgid "urpmi version %s"
+msgstr "urpmi versjon %s"
 
-#: po/placeholder.h:117 urpmi:190
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Hva er ditt valg? (1-%d) "
+#: urpmi:144
+msgid "Only superuser is allowed to install local packages"
+msgstr "Bare superbruker har adgang til å installere lokale pakker"
 
-#: po/placeholder.h:118 urpmi:182
+#: urpmi:182
 msgid "One of the following packages is needed:"
 msgstr "En av følgende pakker behøves:"
 
-#: po/placeholder.h:119 urpmi:270
-msgid "Press enter when it's done..."
-msgstr "Trykk enter når det er ferdig..."
+#: urpmi:190
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Hva er ditt valg? (1-%d) "
 
-#: po/placeholder.h:121 urpmi:284
-msgid "everything already installed"
-msgstr "alt er allerede installert"
+#: urpmi:193
+msgid "Sorry, bad choice, try again\n"
+msgstr "Beklager, dårlig valg, prøv igjen\n"
 
-#: po/placeholder.h:123 urpmi:238
+#: urpmi:238
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -582,102 +484,54 @@ msgid ""
 msgstr ""
 "Følgende pakker vil bli installert for å tilfredstille avhengigheter (%d MB)"
 
-#: po/placeholder.h:124 po/placeholder.h:236 urpmi:259 urpmq:154
+#: urpmi:259 urpmq:154
 msgid "unable to get source packages, aborting"
 msgstr "kunne ikke få tak i kildepakker, avslutter"
 
-#: po/placeholder.h:125 urpmi:307
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Prøve å installere uten å sjekke avhengigheter? (j/N) "
-
-#: po/placeholder.h:126 urpmi:269
+#: urpmi:269
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vennligst sett inn mediumet kalt \"%s\" på enhet [%s]"
 
-#: po/placeholder.h:127
-#, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-"  --help           - print this help message.\n"
-"  --update         - use only update media.\n"
-"  --auto           - automatically select a good package in choices.\n"
-"  --auto-select    - automatically select packages for upgrading the "
-"system.\n"
-"  --force          - force invocation even if some package do not exist.\n"
-"  --X              - use X interface.\n"
-"  --best-output    - choose best interface according to the environment:\n"
-"                     X or text mode.\n"
-"  -a               - select all matches on command line.\n"
-"  -m               - choose minimum closure of requires (default).\n"
-"  -M               - choose maximun closure of requires.\n"
-"  -c               - choose complete method for resolving requires closure.\n"
-"  -p               - allow search in provides to find package.\n"
-"  -q               - quiet mode.\n"
-"  -v               - verbose mode.\n"
-"  names or rpm files (only for root) given on command line are installed.\n"
-msgstr ""
-"urpmi versjon %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Dette er fri programvare og kan videredistribueres under betingelsene til "
-"GNU GPL.\n"
-"bruk:\n"
-"  --help           - vis denne hjelp meldingen.\n"
-"  --auto           - velg automatisk en god pakke i valg.\n"
-"  --auto-select    - velg automatisk pakker for oppgradering av systemet.\n"
-"  --force          - tving påkallelse selv om noen pakker ikke eksisterer.\n"
-"  --X              - bruk X grensesnitt.\n"
-"  --best-output    - velg beste grensesnitt som passer til miljøet:\n"
-"                     X eller tekstmodus.\n"
-"  -a               - velg alle som stemmer på kommandolinjen.\n"
-"  -m              - vekg minimal kreverreferanse (standard).\n"
-"  -M              -velg maksimal kravreferanse.\n"
-"  -c               - velg komplett metode som bestemt trenger lukking.\n"
-"  -q               - stille modus.\n"
-"  -v               - ordrikt modus.\n"
-"  navn eller rpm filer (bare for root) gitt på kommandolinjen er "
-"installert.\n"
-
-#: po/placeholder.h:149 urpmi:193
-msgid "Sorry, bad choice, try again\n"
-msgstr "Beklager, dårlig valg, prøv igjen\n"
+#: urpmi:270
+msgid "Press enter when it's done..."
+msgstr "Trykk enter når det er ferdig..."
 
-#: po/placeholder.h:152 urpmi:315
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Prøve å installere enda hardere (--force)? (j/N) "
+#: urpmi:284
+msgid "everything already installed"
+msgstr "alt er allerede installert"
 
-#: po/placeholder.h:153 urpmi:295
+#: urpmi:295
 #, c-format
 msgid "installing %s\n"
 msgstr "installerer %s\n"
 
-#: po/placeholder.h:154 urpmi:300 urpmi:314
+#: urpmi:300 urpmi:314
 msgid "Installation failed"
 msgstr "Installasjon mislykket"
 
-#: po/placeholder.h:155 urpmi:144
-msgid "Only superuser is allowed to install local packages"
-msgstr "Bare superbruker har adgang til å installere lokale pakker"
+#: urpmi:307
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Prøve å installere uten å sjekke avhengigheter? (j/N) "
 
-#: po/placeholder.h:158 urpmi.addmedia:46
-#, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
-msgstr ""
-"%s\n"
-"`with' mangler for ftp media\n"
+#: urpmi:315
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Prøve å installere enda hardere (--force)? (j/N) "
 
-#: po/placeholder.h:162 urpmi.addmedia:58
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "kunne ikke oppdatere medium \"%s\"\n"
+#: urpmi.addmedia:30
+msgid "usage: urpmi.addmedia [--update] <name> <url>"
+msgstr "bruk: urpmi.addmedia [--update] <navn> <url>"
 
-#: po/placeholder.h:163 urpmi.addmedia:42
+#. <path>
+#. <login>:<password>@<host>/<path> with <relative filename of hdlist>
+#. <host>/<path> with <relative filename of hdlist>
+#. <host>/<path> with <relative filename of hdlist>
+#. <path>
+#: urpmi.addmedia:37
+msgid ");"
+msgstr ");"
+
+#: urpmi.addmedia:42
 #, c-format
 msgid ""
 "%s\n"
@@ -686,42 +540,43 @@ msgstr ""
 "%s\n"
 "enhet `%s' finnes ikke\n"
 
-#: po/placeholder.h:167 urpmi.addmedia:57
+#: urpmi.addmedia:44
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "kunne ikke opprette medium \"%s\"\n"
-
-#: po/placeholder.h:168
-#, fuzzy
 msgid ""
-"usage: urpmi.addmedia [--update] <name> <url>\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable_<device>://<path>\n"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"bruk: urpmi.addmedia <name> <url>\n"
-"hvor <url> er en av\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> med <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> med <relative filename of hdlist>\n"
-"       http://<host>/<path> med <relative filename of hdlist>\n"
-"       removable_<device>://<path>\n"
+"%s\n"
+"<relative path of hdlist> mangler\n"
 
-#: po/placeholder.h:177 urpmi.addmedia:44
+#: urpmi.addmedia:46
 #, c-format
 msgid ""
 "%s\n"
-"<relative path of hdlist> missing\n"
+"`with' missing for ftp media\n"
 msgstr ""
 "%s\n"
-"<relative path of hdlist> mangler\n"
+"`with' mangler for ftp media\n"
 
-#: po/placeholder.h:181 urpmi.update:52
+#: urpmi.addmedia:57
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "kunne ikke opprette medium \"%s\"\n"
+
+#: urpmi.addmedia:58
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "kunne ikke oppdatere medium \"%s\"\n"
+
+#: urpmi.update:37
+msgid "usage: urpmi.update [-a] <name> ..."
+msgstr "bruk: urpmi.update [-a] <name> ..."
+
+#: urpmi.update:50
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ingenting å oppdatere (bruk urpmi.addmedia for å legge til et media)\n"
+
+#: urpmi.update:52
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -730,49 +585,19 @@ msgstr ""
 "inngangen til oppdatering mangler\n"
 "(en av %s)\n"
 
-#: po/placeholder.h:185 urpmi.update:50
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ingenting å oppdatere (bruk urpmi.addmedia for å legge til et media)\n"
-
-#: po/placeholder.h:186
-#, fuzzy, c-format
-msgid ""
-"usage: urpmi.update [-a] <name> ...\n"
-"where <name> is a medium name to update.\n"
-"   -a    select all non-removable media.\n"
-"   -c    clean headers cache directory.\n"
-"   -f    force generation of base files, use another -f for hdlist files.\n"
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"bruk: urpmi.update [-a] <name> ...\n"
-"hvor <name> er et medium navn å oppdatere.\n"
-"   -a    velg alle ikke-fjernbare medier.\n"
-"   -c    rens hoders cache katalog.\n"
-"   -f    tving generering av hdlist eller base filer.\n"
-"\n"
-"ukjente valg '%s'\n"
+#: urpmi.removemedia:32
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "bruk: urpmi.removemedia [-a] <name> ..."
 
-#: po/placeholder.h:195
-#, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-"   -a    select all media.\n"
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"bruk: urpmi.removemedia [-a] <name> ...\n"
-"hvor <name> er et medium navn å fjerne.\n"
-"   -a    velg alle medier.\n"
-"\n"
-"ukjente valg '%s'\n"
+#: urpmi.removemedia:35
+msgid ", $_);"
+msgstr ", $_);"
 
-#: po/placeholder.h:202 urpmi.removemedia:44
+#: urpmi.removemedia:44
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "ingenting å fjerne (bruk urpmi.addmedia for å legge til et media)\n"
 
-#: po/placeholder.h:203 urpmi.removemedia:46
+#: urpmi.removemedia:46
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -781,88 +606,268 @@ msgstr ""
 "inngangen til fjern mangler\n"
 "(en av %s)\n"
 
-#: po/placeholder.h:207 urpmq:85
-#, fuzzy, c-format
+#: urpmq:34
+#, c-format
+msgid "urpmq version %s"
+msgstr "urpmq versjon %s"
+
+#: urpmq:85
+#, c-format
 msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ukjent valg \"-$1\", sjekk bruk med --help\n"
+msgstr "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
 
-#: po/placeholder.h:208
+#: urpmq:87
 #, c-format
-msgid ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-"  -h             - print this help message.\n"
-"  -v             - verbose mode.\n"
-"  -d             - extend query to package dependencies.\n"
-"  -u             - remove package if a better version is already installed.\n"
-"  -m             - extend query to package dependencies, remove already\n"
-"                   installed package that provide what is necessary, add\n"
-"                   packages that may be block the upgrade.\n"
-"  -M             - extend query to package dependencies and remove already\n"
-"                   installed package only if they are newer or the same.\n"
-"  -c             - choose complete method for resolving requires closure.\n"
-"  -p             - allow search in provides to find package.\n"
-"  -g             - print groups too with name.\n"
-"  -r             - print version and release too with name.\n"
-"  --update       - use only update media.\n"
-"  --auto-select  - automatically select packages for upgrading the system.\n"
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-"  --sources      - give all source packages before downloading (root only).\n"
-"  --force        - force invocation even if some package do not exist.\n"
-"  names or rpm files given on command line are queried.\n"
-msgstr ""
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan ikke lese rpm fil \"%s\"\n"
 
-#: po/placeholder.h:234 urpmq:132
+#: urpmq:132
 msgid ""
 "some package have to be removed for being upgraded, this is not supported "
 "yet\n"
 msgstr ""
 "Noen pakker må fjernes for å bli oppgradert, dette er ikke støttet ennå\n"
 
-#: po/placeholder.h:235 urpmq:87
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kan ikke lese rpm fil \"$_\"\n"
-
-#: urpmi:48
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi versjon %s"
-
-#: urpmi.addmedia:30
-#, fuzzy
-msgid "usage: urpmi.addmedia [--update] <name> <url>"
-msgstr "bruk: urpmi.addmedia <name> <url>"
-
-#. <path>
-#. <login>:<password>@<host>/<path> with <relative filename of hdlist>
-#. <host>/<path> with <relative filename of hdlist>
-#. <host>/<path> with <relative filename of hdlist>
-#. <path>
-#: urpmi.addmedia:37
-msgid ");"
-msgstr ");"
-
-#: urpmi.update:37
-msgid "usage: urpmi.update [-a] <name> ..."
-msgstr "bruk: urpmi.update [-a] <name> ..."
-
-#: urpmi.removemedia:32
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "bruk: urpmi.removemedia [-a] <name> ..."
+#~ msgid "copy of [%s] failed"
+#~ msgstr "kopi av [%s] mislykket"
 
-#: urpmi.removemedia:35
-msgid ", $_);"
-msgstr ", $_);"
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "kilden til [%s] ikke funnet som [%s]"
 
-#: urpmq:34
-#, c-format
-msgid "urpmq version %s"
-msgstr "urpmq versjon %s"
+#~ msgid "trying to remove inexistant medium \"%s\""
+#~ msgstr "prøver å fjerne media \"%s\" som ikke eksisterer"
+
+#~ msgid "built hdlist synthesis file for medium \"%s\""
+#~ msgstr "bygd hdlist synthesis fil for media \"%s\""
+
+#~ msgid "nothing written in list file for \"%s\""
+#~ msgstr "ingenting skrevet i liste fil for \"%s\""
+
+#~ msgid "computing dependencies"
+#~ msgstr "beregner avhengigheter"
+
+#~ msgid "keeping only provides files"
+#~ msgstr "behold bare provides filer"
+
+#~ msgid "trying to select inexistant medium \"%s\""
+#~ msgstr "prøver å velge ikke eksisterende media \"%s\""
+
+#~ msgid "no hdlist file found for medium \"%s\""
+#~ msgstr "ingen hdlist fil funnet for media \"%s\""
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget av [%s] mislykket (kanskje wget mangler?)"
+
+#~ msgid "mismatch arch for registering rpm file"
+#~ msgstr "arch stemmer ikke for registrering av rpm fil"
+
+#~ msgid "unable to write list file of \"%s\""
+#~ msgstr "kunne ikke skrive liste fil av \"%s\""
+
+#~ msgid "removing %d obsolete headers in cache"
+#~ msgstr "fjerner %d obsolete hoder i cache"
+
+#~ msgid "unable to build synthesis file for medium \"%s\""
+#~ msgstr "kunne ikke bygge synthesis fil for media \"%s\""
+
+#~ msgid "no rpm files found from [%s]"
+#~ msgstr "ingen rpm filer funnet fra [%s]"
+
+#~ msgid "unable to build hdlist: %s"
+#~ msgstr "kunne ikke bygge hdlist: %s"
+
+#~ msgid "found %d headers in cache"
+#~ msgstr "fant %d hoder i cache"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "kunne ikke kopiere kilde av [%s] fra [%s]"
+
+#~ msgid "rpmtools package is too old, please upgrade it"
+#~ msgstr "rpmtools pakken er for gammel, vennligst oppgrader denne"
+
+#~ msgid "building hdlist [%s]"
+#~ msgstr "bygger hdlist [%s]"
+
+#~ msgid "unable to parse hdlist file of \"%s\""
+#~ msgstr "unable to parse hdlist file of \"%s\""
+
+#~ msgid "mismatch release for registering rpm file"
+#~ msgstr "mismatch release for registering rpm file"
+
+#~ msgid "reading hdlist file [%s]"
+#~ msgstr "leser hdlist fil [%s]"
+
+#~ msgid "mismatch version for registering rpm file"
+#~ msgstr "mismatch version for registering rpm file"
+
+#~ msgid "nothing to write in list file for \"%s\""
+#~ msgstr "ingenting å skrive i liste fil for \"%s\""
+
+#~ msgid ""
+#~ "urpmi version %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "usage:\n"
+#~ "  --help           - print this help message.\n"
+#~ "  --update         - use only update media.\n"
+#~ "  --auto           - automatically select a good package in choices.\n"
+#~ "  --auto-select    - automatically select packages for upgrading the "
+#~ "system.\n"
+#~ "  --force          - force invocation even if some package do not exist.\n"
+#~ "  --X              - use X interface.\n"
+#~ "  --best-output    - choose best interface according to the environment:\n"
+#~ "                     X or text mode.\n"
+#~ "  -a               - select all matches on command line.\n"
+#~ "  -m               - choose minimum closure of requires (default).\n"
+#~ "  -M               - choose maximun closure of requires.\n"
+#~ "  -c               - choose complete method for resolving requires "
+#~ "closure.\n"
+#~ "  -p               - allow search in provides to find package.\n"
+#~ "  -q               - quiet mode.\n"
+#~ "  -v               - verbose mode.\n"
+#~ "  names or rpm files (only for root) given on command line are "
+#~ "installed.\n"
+#~ msgstr ""
+#~ "urpmi versjon %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Dette er fri programvare og kan videredistribueres under betingelsene til "
+#~ "GNU GPL.\n"
+#~ "bruk:\n"
+#~ "  --help           - vis denne hjelp meldingen.\n"
+#~ "  --update         - bruk bare oppdater media.\n"
+#~ "  --auto           - velg automatisk en god pakke i valg.\n"
+#~ "  --auto-select    - velg automatisk pakker for oppgradering av "
+#~ "systemet.\n"
+#~ "  --force          - tving påkallelse selv om noen pakker ikke "
+#~ "eksisterer.\n"
+#~ "  --X              - bruk X grensesnitt.\n"
+#~ "  --best-output    - velg beste grensesnitt som passer til miljøet:\n"
+#~ "                     X eller tekstmodus.\n"
+#~ "  -a               - velg alle som stemmer på kommandolinjen.\n"
+#~ "  -m              - velg minimal kravreferanse (standard).\n"
+#~ "  -M              -velg maksimal kravreferanse.\n"
+#~ "  -c               - velg komplett metode som bestemt trenger lukking.\n"
+#~ "  -p               - tillat søk i provides for å finne pakker.\n"
+#~ "  -q               - stille modus.\n"
+#~ "  -v               - ordrikt modus.\n"
+#~ "  navn eller rpm filer (bare for root) gitt på kommandolinjen er "
+#~ "installert.\n"
+
+#~ msgid ""
+#~ "usage: urpmi.addmedia [--update] <name> <url>\n"
+#~ "where <url> is one of\n"
+#~ "       file://<path>\n"
+#~ "       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+#~ "hdlist>\n"
+#~ "       ftp://<host>/<path> with <relative filename of hdlist>\n"
+#~ "       http://<host>/<path> with <relative filename of hdlist>\n"
+#~ "       removable_<device>://<path>\n"
+#~ msgstr ""
+#~ "bruk: urpmi.addmedia [--update] <navn> <url>\n"
+#~ "hvor <url> er en av\n"
+#~ "       file://<sti>\n"
+#~ "       ftp://<login>:<passord>@<vert>/<sti> med <relative filename of "
+#~ "hdlist>\n"
+#~ "       ftp://<vert>/<sti> med <relative filename of hdlist>\n"
+#~ "       http://<vert>/<sti> med <relative filename of hdlist>\n"
+#~ "       removable_<enhet>://<sti>\n"
+
+#~ msgid ""
+#~ "usage: urpmi.update [-a] <name> ...\n"
+#~ "where <name> is a medium name to update.\n"
+#~ "   -a    select all non-removable media.\n"
+#~ "   -c    clean headers cache directory.\n"
+#~ "   -f    force generation of base files, use another -f for hdlist "
+#~ "files.\n"
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "bruk: urpmi.update [-a] <navn> ...\n"
+#~ "hvor <navn> er et media navn å oppdatere.\n"
+#~ "   -a    velg alle ikke-fjernbare medier.\n"
+#~ "   -c    rens hoders cache katalog.\n"
+#~ "   -f    tving generering av base filer, bruke en annen -f for hdlist "
+#~ "filer.\n"
+#~ "\n"
+#~ "ukjente valg '%s'\n"
+
+#~ msgid ""
+#~ "usage: urpmi.removemedia [-a] <name> ...\n"
+#~ "where <name> is a medium name to remove.\n"
+#~ "   -a    select all media.\n"
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "bruk: urpmi.removemedia [-a] <name> ...\n"
+#~ "hvor <name> er et medium navn å fjerne.\n"
+#~ "   -a    velg alle medier.\n"
+#~ "\n"
+#~ "ukjente valg '%s'\n"
+
+#~ msgid ""
+#~ "urpmq version %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "usage:\n"
+#~ "  -h             - print this help message.\n"
+#~ "  -v             - verbose mode.\n"
+#~ "  -d             - extend query to package dependencies.\n"
+#~ "  -u             - remove package if a better version is already "
+#~ "installed.\n"
+#~ "  -m             - extend query to package dependencies, remove already\n"
+#~ "                   installed package that provide what is necessary, add\n"
+#~ "                   packages that may be block the upgrade.\n"
+#~ "  -M             - extend query to package dependencies and remove "
+#~ "already\n"
+#~ "                   installed package only if they are newer or the same.\n"
+#~ "  -c             - choose complete method for resolving requires "
+#~ "closure.\n"
+#~ "  -p             - allow search in provides to find package.\n"
+#~ "  -g             - print groups too with name.\n"
+#~ "  -r             - print version and release too with name.\n"
+#~ "  --update       - use only update media.\n"
+#~ "  --auto-select  - automatically select packages for upgrading the "
+#~ "system.\n"
+#~ "  --headers      - extract headers for package listed from urpmi db to\n"
+#~ "                   stdout (root only).\n"
+#~ "  --sources      - give all source packages before downloading (root "
+#~ "only).\n"
+#~ "  --force        - force invocation even if some package do not exist.\n"
+#~ "  names or rpm files given on command line are queried.\n"
+#~ msgstr ""
+#~ "urpmq version %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "Dette er fri programvare og kan videredistribueres under vilkårende til "
+#~ "GNU GPL.\n"
+#~ "bruk:\n"
+#~ "  --help           - vis denne hjelp meldingen.\n"
+#~ "  -v               - ordrikt modus.\n"
+#~ "  -d             - utvid spørsmål ttil pakkeavhengigheter.\n"
+#~ "  -u             - fjern pakke hvis en bedre versjon allerede er "
+#~ "installert.\n"
+#~ "  -m             - utvid spørsmål til pakkeavhengigheter, fjern allerede\n"
+#~ "                   installerte pakker som inneholder det som er "
+#~ "nødvendig, legg\n"
+#~ "                   til pakker som muligens kan blokkere oppgradering.\n"
+#~ "  -M             - utvid spørsmål til pakkeavhengigheter og fjern "
+#~ "allerede\n"
+#~ "                   installerte pakker bare hvis de er nyere eller de "
+#~ "samme.\n"
+#~ "  -c             - velg komplett metode for som bestemt trenger lukking.\n"
+#~ "  -p               - tillat søk i provides for å finne pakker.\n"
+#~ "  -g             - vis grupper også med navn.\n"
+#~ "  -r             - vis versjon og utgivelse også med navn.\n"
+#~ "  --update         - bruk bare oppdater media.\n"
+#~ "  --auto-select    - velg automatisk pakker for oppgradering av "
+#~ "systemet.\n"
+#~ "  --headers      - pakk ut hoder for pakker listet fra urpmi db til\n"
+#~ "                   stdout (kun root).\n"
+#~ "  --sources      - gir alle kildepakker før nedlasting (kun root).\n"
+#~ "  --force          - tving påkallelse selv om noen pakker ikke "
+#~ "eksisterer.\n"
+#~ "  navn eller rpm filer gitt på kommandolinjen er forespurt.\n"
 
 #~ msgid "));"
 #~ msgstr "));"
diff --git a/po/placeholder.h b/po/placeholder.h
index ea75e39b..615147a5 100644
--- a/po/placeholder.h
+++ b/po/placeholder.h
@@ -26,211 +26,4 @@ N_("  --prereqs       - print tag prereqs: all prereqs (multiple lines)."),
 N_("usage: urpmf [options] <file>"),
 N_("try urpmf --help for more options"),
 N_("urpmi is not installed"),
-N_("incoherent list file for \"%s\", medium ignored"),
-N_("relocated %s entries in depslist"),
-N_("copy of [%s] failed"),
-N_("unable to read rpm file [%s] from medium \"%s\""),
-N_("invalid rpm file name [%s]"),
-N_("source of [%s] not found as [%s]"),
-N_("unable to write compss file [%s]"),
-N_("selecting %s using obsoletes"),
-N_("unmounting %s"),
-N_("unable to access list file of \"%s\", medium ignored"),
-N_("write compss file [%s]"),
-N_("trying to remove inexistant medium \"%s\""),
-N_("medium \"%s\" is not selected"),
-N_("read depslist file [%s]"),
-N_("built hdlist synthesis file for medium \"%s\""),
-N_("read provides file [%s]"),
-N_("unable to take care of medium \"%s\" as list file is already used by another medium"),
-N_("nothing written in list file for \"%s\""),
-N_("unable to write depslist file [%s]"),
-N_("computing dependencies"),
-N_("unable to write provides file [%s]"),
-N_("wget of [%s] failed"),
-N_("incoherent medium \"%s\" marked removable but not really"),
-N_("write depslist file [%s]"),
-N_("keeping only provides files"),
-N_("trying to select inexistant medium \"%s\""),
-N_("no hdlist file found for medium \"%s\""),
-N_("no package named %s"),
-N_("The following packages contain %s: %s"),
-N_("write provides file [%s]"),
-N_("medium \"%s\" try to use an already used hdlist, medium ignored"),
-N_("avoid selecting %s as its locales language is not already selected"),
-N_("wget of [%s] failed (maybe wget is missing?)"),
-N_("mismatch arch for registering rpm file"),
-N_("unable to write list file of \"%s\""),
-N_("removing %d obsolete headers in cache"),
-N_("error registering local packages"),
-N_("trying to bypass existing medium \"%s\", avoiding"),
-N_("unable to build synthesis file for medium \"%s\""),
-N_(""
-"removing %s to upgrade ...\n"
-" to %s since it will not be updated otherwise"
-""),
-N_("no rpm files found from [%s]"),
-N_("read compss file [%s]"),
-N_("unable to inspect list file for \"%s\", medium ignored"),
-N_("unable to build hdlist: %s"),
-N_("selecting %s by selection on files"),
-N_("unable to write config file [%s]"),
-N_("found %d headers in cache"),
-N_("unable to read depslist file [%s]"),
-N_("unable to copy source of [%s] from [%s]"),
-N_("malformed input: [%s]"),
-N_("write config file [%s]"),
-N_("unable to read provides file [%s]"),
-N_("syntax error in config file at line %s"),
-N_("removable medium not selected"),
-N_("unable to access hdlist file of \"%s\", medium ignored"),
-N_("package %s is not found."),
-N_("unable to determine medium of this hdlist file [%s]"),
-N_("unknown data associated with %s"),
-N_("medium \"%s\" try to use an already used list, medium ignored"),
-N_("unable to take medium \"%s\" into account as no list file [%s] exists"),
-N_("building hdlist [%s]"),
-N_("unable to access medium \"%s\""),
-N_("mounting %s"),
-N_("unable to use name \"%s\" for unamed medium because it is already used"),
-N_("unable to find all synthesis file, using parsehdlist server"),
-N_("unable to access rpm file [%s]"),
-N_("avoid selecting %s as not enough files will be updated"),
-N_("unable to parse hdlist file of \"%s\""),
-N_("retrieving [%s]"),
-N_("unable to find list file for \"%s\", medium ignored"),
-N_("mismatch release for registering rpm file"),
-N_(""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-""),
-N_("reading hdlist file [%s]"),
-N_("unable to parse correctly [%s] on value \"%s\""),
-N_("mismatch version for registering rpm file"),
-N_("nothing to write in list file for \"%s\""),
-N_("unable to find hdlist file for \"%s\", medium ignored"),
-N_("unable to read compss file [%s]"),
-N_("unable to parse correctly [%s]"),
-N_("there are multiples packages with the same rpm filename \"%s\""),
-N_("medium \"%s\" already exists"),
-N_("What is your choice? (1-%d) "),
-N_("One of the following packages is needed:"),
-N_("Press enter when it's done..."),
-N_("Cancel"),
-N_("everything already installed"),
-N_(" (Y/n) "),
-N_("To satisfy dependencies, the following packages are going to be installed (%d MB)"),
-N_("unable to get source packages, aborting"),
-N_("Try installation without checking dependencies? (y/N) "),
-N_("Please insert the medium named \"%s\" on device [%s]"),
-N_(""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"usage:\n"
-"  --help           - print this help message.\n"
-"  --update         - use only update media.\n"
-"  --auto           - automatically select a good package in choices.\n"
-"  --auto-select    - automatically select packages for upgrading the system.\n"
-"  --force          - force invocation even if some package do not exist.\n"
-"  --X              - use X interface.\n"
-"  --best-output    - choose best interface according to the environment:\n"
-"                     X or text mode.\n"
-"  -a               - select all matches on command line.\n"
-"  -m               - choose minimum closure of requires (default).\n"
-"  -M               - choose maximun closure of requires.\n"
-"  -c               - choose complete method for resolving requires closure.\n"
-"  -p               - allow search in provides to find package.\n"
-"  -q               - quiet mode.\n"
-"  -v               - verbose mode.\n"
-"  names or rpm files (only for root) given on command line are installed.\n"
-""),
-N_("Sorry, bad choice, try again\n"),
-N_("Is it ok?"),
-N_("Yy"),
-N_("Try installation even more strongly (--force)? (y/N) "),
-N_("installing %s\n"),
-N_("Installation failed"),
-N_("Only superuser is allowed to install local packages"),
-N_("Ok"),
-N_("Nn"),
-N_(""
-"%s\n"
-"`with' missing for ftp media\n"
-""),
-N_("unable to update medium \"%s\"\n"),
-N_(""
-"%s\n"
-"device `%s' do not exist\n"
-""),
-N_("unable to create medium \"%s\"\n"),
-N_(""
-"usage: urpmi.addmedia [--update] <name> <url>\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable_<device>://<path>\n"
-""),
-N_(""
-"%s\n"
-"<relative path of hdlist> missing\n"
-""),
-N_(""
-"the entry to update is missing\n"
-"(one of %s)\n"
-""),
-N_("nothing to update (use urpmi.addmedia to add a media)\n"),
-N_(""
-"usage: urpmi.update [-a] <name> ...\n"
-"where <name> is a medium name to update.\n"
-"   -a    select all non-removable media.\n"
-"   -c    clean headers cache directory.\n"
-"   -f    force generation of base files, use another -f for hdlist files.\n"
-"\n"
-"unknown options '%s'\n"
-""),
-N_(""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-"   -a    select all media.\n"
-"\n"
-"unknown options '%s'\n"
-""),
-N_("nothing to remove (use urpmi.addmedia to add a media)\n"),
-N_(""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-""),
-N_("urpmq: unknown option \"-%s\", check usage with --help\n"),
-N_(""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"usage:\n"
-"  -h             - print this help message.\n"
-"  -v             - verbose mode.\n"
-"  -d             - extend query to package dependencies.\n"
-"  -u             - remove package if a better version is already installed.\n"
-"  -m             - extend query to package dependencies, remove already\n"
-"                   installed package that provide what is necessary, add\n"
-"                   packages that may be block the upgrade.\n"
-"  -M             - extend query to package dependencies and remove already\n"
-"                   installed package only if they are newer or the same.\n"
-"  -c             - choose complete method for resolving requires closure.\n"
-"  -p             - allow search in provides to find package.\n"
-"  -g             - print groups too with name.\n"
-"  -r             - print version and release too with name.\n"
-"  --update       - use only update media.\n"
-"  --auto-select  - automatically select packages for upgrading the system.\n"
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-"  --sources      - give all source packages before downloading (root only).\n"
-"  --force        - force invocation even if some package do not exist.\n"
-"  names or rpm files given on command line are queried.\n"
-""),
-N_("some package have to be removed for being upgraded, this is not supported yet\n"),
-N_("urpmq: cannot read rpm file \"%s\"\n"),
-N_("unable to get source packages, aborting"),
 };
diff --git a/po/urpmi.pot b/po/urpmi.pot
index 8eada90d..2509e26d 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-07-23 22:17+0200\n"
+"POT-Creation-Date: 2001-07-28 04:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,27 +24,27 @@ msgid ""
 "You requested installation of package $rpm\n"
 msgstr ""
 
-#: _irpm:31 po/placeholder.h:149 urpmi:239
+#: _irpm:31 urpmi:239
 msgid "Is it ok?"
 msgstr ""
 
-#: _irpm:33 po/placeholder.h:155 urpmi:242 urpmi:272
+#: _irpm:33 urpmi:242 urpmi:272
 msgid "Ok"
 msgstr ""
 
-#: _irpm:34 po/placeholder.h:119 urpmi:243 urpmi:273
+#: _irpm:34 urpmi:243 urpmi:273
 msgid "Cancel"
 msgstr ""
 
-#: _irpm:40 po/placeholder.h:156 urpmi:247 urpmi:305
+#: _irpm:40 urpmi:247 urpmi:305
 msgid "Nn"
 msgstr ""
 
-#: _irpm:41 po/placeholder.h:150 urpmi:248 urpmi:306
+#: _irpm:41 urpmi:248 urpmi:306
 msgid "Yy"
 msgstr ""
 
-#: _irpm:42 po/placeholder.h:121 urpmi:249
+#: _irpm:42 urpmi:249
 msgid " (Y/n) "
 msgstr ""
 
@@ -147,658 +147,456 @@ msgstr ""
 msgid "urpmi is not installed"
 msgstr ""
 
-#: po/placeholder.h:29 urpm.pm:231
+#: urpm.pm:122 urpm.pm:134
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr ""
-
-#: po/placeholder.h:30 urpm.pm:899
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
-
-#: po/placeholder.h:31
-#, c-format
-msgid "copy of [%s] failed"
-msgstr ""
-
-#: po/placeholder.h:32 urpm.pm:1579
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:33 urpm.pm:911
-#, c-format
-msgid "invalid rpm file name [%s]"
-msgstr ""
-
-#: po/placeholder.h:34
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:795
-#, c-format
-msgid "unable to write compss file [%s]"
-msgstr ""
-
-#: po/placeholder.h:36 urpm.pm:1715
-#, c-format
-msgid "selecting %s using obsoletes"
-msgstr ""
-
-#: po/placeholder.h:37 urpm.pm:738
-#, c-format
-msgid "unmounting %s"
-msgstr ""
-
-#: po/placeholder.h:38 urpm.pm:191
-#, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:798
-#, c-format
-msgid "write compss file [%s]"
-msgstr ""
-
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:41 urpm.pm:1591
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr ""
-
-#: po/placeholder.h:42 urpm.pm:752
-#, c-format
-msgid "read depslist file [%s]"
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:43
+#: urpm.pm:143
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "medium \"%s\" try to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:764
+#: urpm.pm:146
 #, c-format
-msgid "read provides file [%s]"
+msgid "medium \"%s\" try to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:161
+#: urpm.pm:161
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: po/placeholder.h:46
+#: urpm.pm:167
 #, c-format
-msgid "nothing written in list file for \"%s\""
+msgid "unable to use name \"%s\" for unamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:785
+#: urpm.pm:174
 #, c-format
-msgid "unable to write depslist file [%s]"
-msgstr ""
-
-#: po/placeholder.h:48
-msgid "computing dependencies"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:790
+#: urpm.pm:178
 #, c-format
-msgid "unable to write provides file [%s]"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:50 urpm.pm:1652
+#: urpm.pm:189
 #, c-format
-msgid "wget of [%s] failed"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:51 urpm.pm:1595
+#: urpm.pm:191
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:52 urpm.pm:788
+#: urpm.pm:205
 #, c-format
-msgid "write depslist file [%s]"
-msgstr ""
-
-#: po/placeholder.h:53
-msgid "keeping only provides files"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:54
+#: urpm.pm:211
 #, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:55
+#: urpm.pm:216
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:56 urpm.pm:1014
+#: urpm.pm:231
 #, c-format
-msgid "no package named %s"
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:57 urpm.pm:1017
+#: urpm.pm:239
 #, c-format
-msgid "The following packages contain %s: %s"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:58 urpm.pm:793
+#: urpm.pm:256
 #, c-format
-msgid "write provides file [%s]"
+msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:59 urpm.pm:143
+#: urpm.pm:268
 #, c-format
-msgid "medium \"%s\" try to use an already used hdlist, medium ignored"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:60 urpm.pm:1826
+#: urpm.pm:284
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:61
+#: urpm.pm:300 urpm.pm:1607
 #, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-
-#: po/placeholder.h:62 urpm.pm:918
-msgid "mismatch arch for registering rpm file"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:63
+#: urpm.pm:738
 #, c-format
-msgid "unable to write list file of \"%s\""
+msgid "mounting %s"
 msgstr ""
 
-#: po/placeholder.h:64
+#: urpm.pm:738
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:922
-msgid "error registering local packages"
+#: urpm.pm:749
+#, c-format
+msgid "unable to read depslist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:66 urpm.pm:205
+#: urpm.pm:752
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "read depslist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:67
+#: urpm.pm:761
 #, c-format
-msgid "unable to build synthesis file for medium \"%s\""
+msgid "unable to read provides file [%s]"
 msgstr ""
 
-#: po/placeholder.h:68 urpm.pm:1738
+#: urpm.pm:764
 #, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not be updated otherwise"
+msgid "read provides file [%s]"
 msgstr ""
 
-#: po/placeholder.h:72
+#: urpm.pm:773
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "unable to read compss file [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:776
+#: urpm.pm:776
 #, c-format
 msgid "read compss file [%s]"
 msgstr ""
 
-#: po/placeholder.h:74 urpm.pm:239
+#: urpm.pm:785
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "unable to write depslist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:75
+#: urpm.pm:788
 #, c-format
-msgid "unable to build hdlist: %s"
+msgid "write depslist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:76 urpm.pm:1823
+#: urpm.pm:790
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "unable to write provides file [%s]"
 msgstr ""
 
-#: po/placeholder.h:77 urpm.pm:256
+#: urpm.pm:793
 #, c-format
-msgid "unable to write config file [%s]"
+msgid "write provides file [%s]"
 msgstr ""
 
-#: po/placeholder.h:78
+#: urpm.pm:795
 #, c-format
-msgid "found %d headers in cache"
+msgid "unable to write compss file [%s]"
 msgstr ""
 
-#: po/placeholder.h:79 urpm.pm:749
+#: urpm.pm:798
 #, c-format
-msgid "unable to read depslist file [%s]"
+msgid "write compss file [%s]"
 msgstr ""
 
-#: po/placeholder.h:80
+#: urpm.pm:822 urpm.pm:1480
 #, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unable to parse correctly [%s]"
 msgstr ""
 
-#: po/placeholder.h:81 urpm.pm:1645
+#: urpm.pm:829 urpm.pm:1486 urpm.pm:1528
 #, c-format
-msgid "malformed input: [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:82 urpm.pm:268
+#: urpm.pm:899
 #, c-format
-msgid "write config file [%s]"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:761
+#: urpm.pm:911
 #, c-format
-msgid "unable to read provides file [%s]"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:84 urpm.pm:122 urpm.pm:134
+#: urpm.pm:912
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr ""
-
-#: po/placeholder.h:85 urpm.pm:1572
-msgid "removable medium not selected"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:189
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: urpm.pm:916
+msgid "unable to register rpm file"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:1539
-#, c-format
-msgid "package %s is not found."
+#: urpm.pm:920
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:178
+#: urpm.pm:1012
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "no package named %s"
 msgstr ""
 
-#: po/placeholder.h:89 urpm.pm:1241
+#: urpm.pm:1015
 #, c-format
-msgid "unknown data associated with %s"
+msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: po/placeholder.h:90 urpm.pm:146
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
+#: urpm.pm:1208
+msgid "unable to find all synthesis file, using parsehdlist server"
 msgstr ""
 
-#: po/placeholder.h:91 urpm.pm:174
+#: urpm.pm:1239
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:92
+#: urpm.pm:1497 urpm.pm:1519
 #, c-format
-msgid "building hdlist [%s]"
+msgid "there are multiples packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:93 urpm.pm:300 urpm.pm:1606
+#: urpm.pm:1540
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:94 urpm.pm:738
-#, c-format
-msgid "mounting %s"
+#: urpm.pm:1573
+msgid "removable medium not selected"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:167
+#: urpm.pm:1580
 #, c-format
-msgid "unable to use name \"%s\" for unamed medium because it is already used"
-msgstr ""
-
-#: po/placeholder.h:96 urpm.pm:1210
-msgid "unable to find all synthesis file, using parsehdlist server"
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:97 urpm.pm:912
+#: urpm.pm:1592
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:1816
+#: urpm.pm:1596
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:99
+#: urpm.pm:1646
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1650
+#: urpm.pm:1651
 #, c-format
 msgid "retrieving [%s]"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:216
+#: urpm.pm:1653
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "wget of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:102 urpm.pm:917
-msgid "mismatch release for registering rpm file"
+#: urpm.pm:1716
+#, c-format
+msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:103 urpm.pm:1746
+#: urpm.pm:1739
 #, c-format
 msgid ""
 "removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:107
-#, c-format
-msgid "reading hdlist file [%s]"
+" to %s since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:108 urpm.pm:829 urpm.pm:1485 urpm.pm:1527
+#: urpm.pm:1747
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr ""
-
-#: po/placeholder.h:109 urpm.pm:916
-msgid "mismatch version for registering rpm file"
+msgid ""
+"removing %s to upgrade ...\n"
+" to %s since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:110
+#: urpm.pm:1817
 #, c-format
-msgid "nothing to write in list file for \"%s\""
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:111 urpm.pm:211
+#: urpm.pm:1824
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:112 urpm.pm:773
+#: urpm.pm:1827
 #, c-format
-msgid "unable to read compss file [%s]"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:113 urpm.pm:822 urpm.pm:1479
+#: urpmi:48
 #, c-format
-msgid "unable to parse correctly [%s]"
+msgid "urpmi version %s"
 msgstr ""
 
-#: po/placeholder.h:114 urpm.pm:1496 urpm.pm:1518
-#, c-format
-msgid "there are multiples packages with the same rpm filename \"%s\""
+#: urpmi:144
+msgid "Only superuser is allowed to install local packages"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:284
-#, c-format
-msgid "medium \"%s\" already exists"
+#: urpmi:182
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: po/placeholder.h:116 urpmi:190
+#: urpmi:190
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: po/placeholder.h:117 urpmi:182
-msgid "One of the following packages is needed:"
-msgstr ""
-
-#: po/placeholder.h:118 urpmi:270
-msgid "Press enter when it's done..."
-msgstr ""
-
-#: po/placeholder.h:120 urpmi:284
-msgid "everything already installed"
+#: urpmi:193
+msgid "Sorry, bad choice, try again\n"
 msgstr ""
 
-#: po/placeholder.h:122 urpmi:238
+#: urpmi:238
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr ""
 
-#: po/placeholder.h:123 po/placeholder.h:235 urpmi:259 urpmq:154
+#: urpmi:259 urpmq:154
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:124 urpmi:307
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr ""
-
-#: po/placeholder.h:125 urpmi:269
+#: urpmi:269
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: po/placeholder.h:126
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-"  --help           - print this help message.\n"
-"  --update         - use only update media.\n"
-"  --auto           - automatically select a good package in choices.\n"
-"  --auto-select    - automatically select packages for upgrading the "
-"system.\n"
-"  --force          - force invocation even if some package do not exist.\n"
-"  --X              - use X interface.\n"
-"  --best-output    - choose best interface according to the environment:\n"
-"                     X or text mode.\n"
-"  -a               - select all matches on command line.\n"
-"  -m               - choose minimum closure of requires (default).\n"
-"  -M               - choose maximun closure of requires.\n"
-"  -c               - choose complete method for resolving requires closure.\n"
-"  -p               - allow search in provides to find package.\n"
-"  -q               - quiet mode.\n"
-"  -v               - verbose mode.\n"
-"  names or rpm files (only for root) given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:148 urpmi:193
-msgid "Sorry, bad choice, try again\n"
+#: urpmi:270
+msgid "Press enter when it's done..."
 msgstr ""
 
-#: po/placeholder.h:151 urpmi:315
-msgid "Try installation even more strongly (--force)? (y/N) "
+#: urpmi:284
+msgid "everything already installed"
 msgstr ""
 
-#: po/placeholder.h:152 urpmi:295
+#: urpmi:295
 #, c-format
 msgid "installing %s\n"
 msgstr ""
 
-#: po/placeholder.h:153 urpmi:300 urpmi:314
+#: urpmi:300 urpmi:314
 msgid "Installation failed"
 msgstr ""
 
-#: po/placeholder.h:154 urpmi:144
-msgid "Only superuser is allowed to install local packages"
+#: urpmi:307
+msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: po/placeholder.h:157 urpmi.addmedia:46
-#, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+#: urpmi:315
+msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: po/placeholder.h:161 urpmi.addmedia:58
-#, c-format
-msgid "unable to update medium \"%s\"\n"
+#: urpmi.addmedia:30
+msgid "usage: urpmi.addmedia [--update] <name> <url>"
+msgstr ""
+
+#. <path>
+#. <login>:<password>@<host>/<path> with <relative filename of hdlist>
+#. <host>/<path> with <relative filename of hdlist>
+#. <host>/<path> with <relative filename of hdlist>
+#. <path>
+#: urpmi.addmedia:37
+msgid ");"
 msgstr ""
 
-#: po/placeholder.h:162 urpmi.addmedia:42
+#: urpmi.addmedia:42
 #, c-format
 msgid ""
 "%s\n"
 "device `%s' do not exist\n"
 msgstr ""
 
-#: po/placeholder.h:166 urpmi.addmedia:57
+#: urpmi.addmedia:44
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:167
 msgid ""
-"usage: urpmi.addmedia [--update] <name> <url>\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable_<device>://<path>\n"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi.addmedia:44
+#: urpmi.addmedia:46
 #, c-format
 msgid ""
 "%s\n"
-"<relative path of hdlist> missing\n"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: po/placeholder.h:180 urpmi.update:52
+#: urpmi.addmedia:57
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: po/placeholder.h:184 urpmi.update:50
+#: urpmi.addmedia:58
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr ""
+
+#: urpmi.update:37
+msgid "usage: urpmi.update [-a] <name> ..."
+msgstr ""
+
+#: urpmi.update:50
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:185
+#: urpmi.update:52
 #, c-format
 msgid ""
-"usage: urpmi.update [-a] <name> ...\n"
-"where <name> is a medium name to update.\n"
-"   -a    select all non-removable media.\n"
-"   -c    clean headers cache directory.\n"
-"   -f    force generation of base files, use another -f for hdlist files.\n"
-"\n"
-"unknown options '%s'\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:194
-#, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-"   -a    select all media.\n"
-"\n"
-"unknown options '%s'\n"
+#: urpmi.removemedia:32
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr ""
+
+#: urpmi.removemedia:35
+msgid ", $_);"
 msgstr ""
 
-#: po/placeholder.h:201 urpmi.removemedia:44
+#: urpmi.removemedia:44
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:202 urpmi.removemedia:46
+#: urpmi.removemedia:46
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:206 urpmq:85
+#: urpmq:34
 #, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgid "urpmq version %s"
 msgstr ""
 
-#: po/placeholder.h:207
+#: urpmq:85
 #, c-format
-msgid ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
-"  -h             - print this help message.\n"
-"  -v             - verbose mode.\n"
-"  -d             - extend query to package dependencies.\n"
-"  -u             - remove package if a better version is already installed.\n"
-"  -m             - extend query to package dependencies, remove already\n"
-"                   installed package that provide what is necessary, add\n"
-"                   packages that may be block the upgrade.\n"
-"  -M             - extend query to package dependencies and remove already\n"
-"                   installed package only if they are newer or the same.\n"
-"  -c             - choose complete method for resolving requires closure.\n"
-"  -p             - allow search in provides to find package.\n"
-"  -g             - print groups too with name.\n"
-"  -r             - print version and release too with name.\n"
-"  --update       - use only update media.\n"
-"  --auto-select  - automatically select packages for upgrading the system.\n"
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-"  --sources      - give all source packages before downloading (root only).\n"
-"  --force        - force invocation even if some package do not exist.\n"
-"  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:233 urpmq:132
-msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: po/placeholder.h:234 urpmq:87
+#: urpmq:87
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: urpmi:48
-#, c-format
-msgid "urpmi version %s"
-msgstr ""
-
-#: urpmi.addmedia:30
-msgid "usage: urpmi.addmedia [--update] <name> <url>"
-msgstr ""
-
-#. <path>
-#. <login>:<password>@<host>/<path> with <relative filename of hdlist>
-#. <host>/<path> with <relative filename of hdlist>
-#. <host>/<path> with <relative filename of hdlist>
-#. <path>
-#: urpmi.addmedia:37
-msgid ");"
-msgstr ""
-
-#: urpmi.update:37
-msgid "usage: urpmi.update [-a] <name> ..."
-msgstr ""
-
-#: urpmi.removemedia:32
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr ""
-
-#: urpmi.removemedia:35
-msgid ", $_);"
-msgstr ""
-
-#: urpmq:34
-#, c-format
-msgid "urpmq version %s"
+#: urpmq:132
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""