merge in new stuff

1 files changed, 156 insertions, 25 deletions

diff --git a/po/es.po b/po/es.po
index f22ae6e0..6839602d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1355,6 +1355,162 @@ msgstr "Inicializar servicio %s ¿(S)í/(N)o/(C)ontinuar? [S]"
 msgid "vncserver start"
 msgstr ""
 
+#: /etc/rc.d/init.d/smb:46
+#, fuzzy
+msgid "Shutting down SMB services: "
+msgstr "Cerrando los servicios %s :"
+
+#: /etc/rc.d/init.d/ups:26
+#, fuzzy
+msgid "Starting $MODEL: "
+msgstr "Iniciando %s:"
+
+#: /etc/rc.d/init.d/smb:50
+#, fuzzy
+msgid "Shutting down NMB services: "
+msgstr "Cerrando los servicios %s :"
+
+#: /etc/rc.d/init.d/netfs:108
+#, fuzzy
+msgid "Usage: $0 {start|stop|restart|reload|status}"
+msgstr "Uso: %s {start|stop|restart|reload|status}\n"
+
+#: /etc/sysconfig/network-scripts/ifup-ppp:62
+#, fuzzy
+msgid "/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist"
+msgstr "/etc/sysconfig/network-scripts/chat-%s no existe para %s"
+
+#: /etc/rc.d/init.d/ups:58
+#, fuzzy
+msgid "Shutting down $MODEL: "
+msgstr "Apagando %s :"
+
+#: /etc/rc.d/init.d/mars-nwe:23
+#, fuzzy
+msgid "Starting NetWare emulator-server: "
+msgstr "Inicializando el servidor %s :"
+
+#: /etc/rc.d/init.d/ups:92
+#, fuzzy
+msgid "Usage: ups {start|stop|restart|condrestart|status}"
+msgstr "Uso: %s {start|stop|restart|reload|status}\n"
+
+#: /etc/rc.d/init.d/isdn:557
+#, fuzzy
+msgid "Unloading ISDN modules"
+msgstr "Descargando módulo DRBD"
+
+#: /etc/rc.d/init.d/ups:48
+#, fuzzy
+msgid "Stopping UPS monitor: "
+msgstr "Parando el servidor %s :"
+
+#: /etc/rc.d/init.d/pppoe:45
+#, fuzzy
+msgid "Shutting down ADSL link"
+msgstr "Apagando %s :"
+
+#: /etc/rc.d/init.d/iptables:96
+msgid "Changing target policies to DROP: "
+msgstr ""
+
+#: /etc/rc.d/init.d/smb:37
+#, fuzzy
+msgid "Starting NMB services: "
+msgstr "Inicializando servicios %s :"
+
+#: /etc/rc.d/init.d/iptables:49
+msgid "Applying iptables firewall rules: "
+msgstr ""
+
+#: /etc/rc.d/init.d/smb:62
+#, fuzzy
+msgid "Reloading smb.conf file: "
+msgstr "Guardando configuración %s :"
+
+#: /etc/rc.d/init.d/smb:33
+#, fuzzy
+msgid "Starting SMB services: "
+msgstr "Inicializando servicios %s :"
+
+#: /etc/rc.d/init.d/smb:93
+#, fuzzy
+msgid "Usage: smb {start|stop|restart|status|condrestart}"
+msgstr "Uso: %s {start|stop|status|restart}\n"
+
+#: /etc/rc.d/init.d/mars-nwe:32
+#, fuzzy
+msgid "Stopping NetWare emulator-server: "
+msgstr "Interrumpiendo el servidor %s :"
+
+#: /etc/rc.d/init.d/network:222
+#, fuzzy
+msgid "Usage: $0 {start|stop|restart|reload|status|probe}"
+msgstr "Uso: %s {start|stop|restart|reload|status|probe}\n"
+
+#: /etc/rc.d/init.d/ups:35
+#, fuzzy
+msgid "Starting UPS monitor (master): "
+msgstr "Iniciando %s:"
+
+#: /etc/rc.d/init.d/ups:53
+#, fuzzy
+msgid "Shutting down UPS daemon: "
+msgstr "Inicializando daemon %s :"
+
+#: /etc/sysconfig/network-scripts/ifup-ppp:63
+#, fuzzy
+msgid "ifup-ppp for ${DEVNAME} exiting"
+msgstr "ifup-ppp para %s saliendo\n"
+
+#: /etc/rc.d/init.d/named:93
+#, fuzzy
+msgid "Usage: $0 {start|stop|status|restart|condrestart|reload|probe}"
+msgstr "Uso: %s {start|stop|status|reload|restart}\n"
+
+#: /etc/rc.d/init.d/ups:30
+#, fuzzy
+msgid "Starting UPS daemon: "
+msgstr "Inicializando daemon %s :"
+
+#: /etc/rc.d/init.d/pppoe:26
+#, fuzzy
+msgid "Bringing up ADSL link"
+msgstr "Activando alias %s: "
+
+#: /etc/rc.d/init.d/pppoe:85
+#, fuzzy
+msgid "Usage: pppoe {start|stop|restart|status|condrestart}"
+msgstr "Uso: %s {start|stop|status|restart}\n"
+
+#: /etc/rc.d/init.d/isdn:444
+msgid "Removing provider '$1' on device '$2'"
+msgstr ""
+
+#: /etc/rc.d/init.d/isdn:512 /etc/rc.d/init.d/isdn:515
+#, fuzzy
+msgid "Starting ibod"
+msgstr "Iniciando %s"
+
+#: /etc/rc.d/init.d/halt:47
+#, fuzzy
+msgid "Usage: (halt|reboot) {start}"
+msgstr "Uso: %s {start|stop|restart}\n"
+
+#: /etc/rc.d/init.d/isdn:504
+msgid "Adding provider '$prov' on device '$device'"
+msgstr ""
+
+#: /etc/rc.d/init.d/isdn:450
+#, fuzzy
+msgid "Loading ISDN modules"
+msgstr "Cargando módulo DRBD"
+
+#: /etc/rc.d/init.d/ups:39
+#, fuzzy
+msgid "Starting UPS monitor (slave): "
+msgstr "Iniciando interfaz USB HID: "
+
 #~ msgid "Sending all processes the %s signal..\n"
 #~ msgstr "Enviando todos los procesos de la señal %s ...\n"
 
@@ -1452,25 +1608,9 @@ msgstr ""
 #~ msgstr "Parar %s\n"
 
 #, fuzzy
-#~ msgid "Reloading smb.conf file: "
-#~ msgstr "Guardando configuración %s :"
-
-#, fuzzy
-#~ msgid "Stopping NetWare emulator-server: "
-#~ msgstr "Interrumpiendo el servidor %s :"
-
-#, fuzzy
-#~ msgid "Starting NetWare emulator-server: "
-#~ msgstr "Inicializando el servidor %s :"
-
-#, fuzzy
 #~ msgid "Run '%' from the command line to re-detect.\n"
 #~ msgstr "Ejecute '/usr/sbin/kudzu' en la línea de comando para redetectar.\n"
 
-#, fuzzy
-#~ msgid "Shutting down http: "
-#~ msgstr "Apagando %s :"
-
 #~ msgid "No LDAP_SERVER specified!\n"
 #~ msgstr "¡Ningún LDAP_SERVER especificado!\n"
 
@@ -1521,9 +1661,6 @@ msgstr ""
 #~ msgid "Loading system font: "
 #~ msgstr "Cargando fuente de sistema: "
 
-#~ msgid "Usage: %s {start|stop|restart}\n"
-#~ msgstr "Uso: %s {start|stop|restart}\n"
-
 #~ msgid "%s is stoppped"
 #~ msgstr "%s está parado"
 
@@ -1618,12 +1755,6 @@ msgstr ""
 #~ msgid "Usage: %s {start|stop|restart|status}"
 #~ msgstr "Uso: %s {start|stop|restart|status}"
 
-#~ msgid "Loading DRBD module"
-#~ msgstr "Cargando módulo DRBD"
-
-#~ msgid "Unloading DRBD module"
-#~ msgstr "Descargando módulo DRBD"
-
 #~ msgid "Usage: killprocparent {program} [signal]\n"
 #~ msgstr "Uso: killprocparent {programa} [señal]\n"