merge in new stuff

1 files changed, 154 insertions, 9 deletions

diff --git a/po/is.po b/po/is.po
index 8512ad69..9317057e 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1338,6 +1338,160 @@ msgstr "Ræsa þjónustu %s (J)á/(N)ei/(H)alda áfram? [J] "
 msgid "vncserver start"
 msgstr ""
 
+#: /etc/rc.d/init.d/smb:46
+#, fuzzy
+msgid "Shutting down SMB services: "
+msgstr "Stöðva SMB þjónusturnar: "
+
+#: /etc/rc.d/init.d/ups:26
+#, fuzzy
+msgid "Starting $MODEL: "
+msgstr "Ræsi %s: "
+
+#: /etc/rc.d/init.d/smb:50
+#, fuzzy
+msgid "Shutting down NMB services: "
+msgstr "Stöðva SMB þjónusturnar: "
+
+#: /etc/rc.d/init.d/netfs:108
+#, fuzzy
+msgid "Usage: $0 {start|stop|restart|reload|status}"
+msgstr "Notkun: %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 er ekki til fyrir %s"
+
+#: /etc/rc.d/init.d/ups:58
+#, fuzzy
+msgid "Shutting down $MODEL: "
+msgstr "Slekk á %s: "
+
+#: /etc/rc.d/init.d/mars-nwe:23
+msgid "Starting NetWare emulator-server: "
+msgstr "Ræsi NetWare þjónustuna: "
+
+#: /etc/rc.d/init.d/ups:92
+#, fuzzy
+msgid "Usage: ups {start|stop|restart|condrestart|status}"
+msgstr "Notkun: %s {start|stop|restart|condrestart|status}\n"
+
+#: /etc/rc.d/init.d/isdn:557
+msgid "Unloading ISDN modules"
+msgstr ""
+
+#: /etc/rc.d/init.d/ups:48
+#, fuzzy
+msgid "Stopping UPS monitor: "
+msgstr "Stöðva cron þjónustuna: "
+
+#: /etc/rc.d/init.d/pppoe:45
+#, fuzzy
+msgid "Shutting down ADSL link"
+msgstr "Slekk á %s: "
+
+#: /etc/rc.d/init.d/iptables:96
+#, fuzzy
+msgid "Changing target policies to DROP: "
+msgstr "Breyti reglum í 'DENY': "
+
+#: /etc/rc.d/init.d/smb:37
+#, fuzzy
+msgid "Starting NMB services: "
+msgstr "Ræsi PCMCIA þjónusturnar:"
+
+#: /etc/rc.d/init.d/iptables:49
+#, fuzzy
+msgid "Applying iptables firewall rules: "
+msgstr "Set í gang ipchains eldveggjarreglur: "
+
+#: /etc/rc.d/init.d/smb:62
+msgid "Reloading smb.conf file: "
+msgstr "Les aftur smb.conf skrána: "
+
+#: /etc/rc.d/init.d/smb:33
+#, fuzzy
+msgid "Starting SMB services: "
+msgstr "Ræsi PCMCIA þjónusturnar:"
+
+#: /etc/rc.d/init.d/smb:93
+#, fuzzy
+msgid "Usage: smb {start|stop|restart|status|condrestart}"
+msgstr "Notkun: %s {start|stop|restart|status|condrestart}\n"
+
+#: /etc/rc.d/init.d/mars-nwe:32
+msgid "Stopping NetWare emulator-server: "
+msgstr "Stöðva NetWare þjónustuna: "
+
+#: /etc/rc.d/init.d/network:222
+#, fuzzy
+msgid "Usage: $0 {start|stop|restart|reload|status|probe}"
+msgstr "Notkun: %s {start|stop|restart|reload|status|probe}\n"
+
+#: /etc/rc.d/init.d/ups:35
+#, fuzzy
+msgid "Starting UPS monitor (master): "
+msgstr "Ræsi annálaþjóninn: "
+
+#: /etc/rc.d/init.d/ups:53
+#, fuzzy
+msgid "Shutting down UPS daemon: "
+msgstr "Ræsi cron þjónustuna: "
+
+#: /etc/sysconfig/network-scripts/ifup-ppp:63
+#, fuzzy
+msgid "ifup-ppp for ${DEVNAME} exiting"
+msgstr "ifup-ppp fyrir %s hættir\n"
+
+#: /etc/rc.d/init.d/named:93
+#, fuzzy
+msgid "Usage: $0 {start|stop|status|restart|condrestart|reload|probe}"
+msgstr "Notkun: syslog {start|stop|status|restart|condrestart}"
+
+#: /etc/rc.d/init.d/ups:30
+#, fuzzy
+msgid "Starting UPS daemon: "
+msgstr "Ræsi cron þjónustuna: "
+
+#: /etc/rc.d/init.d/pppoe:26
+#, fuzzy
+msgid "Bringing up ADSL link"
+msgstr "Set upp alias %s: "
+
+#: /etc/rc.d/init.d/pppoe:85
+#, fuzzy
+msgid "Usage: pppoe {start|stop|restart|status|condrestart}"
+msgstr "Notkun: %s {start|stop|restart|status|condrestart}\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 "Ræsi %s: "
+
+#: /etc/rc.d/init.d/halt:47
+#, fuzzy
+msgid "Usage: (halt|reboot) {start}"
+msgstr "Notkun: kudzu {start|stop}\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 "Les inn lyklaborðsskilgreiningu (%s): "
+
+#: /etc/rc.d/init.d/ups:39
+#, fuzzy
+msgid "Starting UPS monitor (slave): "
+msgstr "Frumstilli USB HID kerfið: "
+
 #~ msgid "Sending all processes the %s signal..\n"
 #~ msgstr "Sendi öllum ferlum %s merkið..\n"
 
@@ -1427,12 +1581,3 @@ msgstr ""
 
 #~ msgid "Stop %s\n"
 #~ msgstr "Stöðva %s\n"
-
-#~ msgid "Reloading smb.conf file: "
-#~ msgstr "Les aftur smb.conf skrána: "
-
-#~ msgid "Stopping NetWare emulator-server: "
-#~ msgstr "Stöðva NetWare þjónustuna: "
-
-#~ msgid "Starting NetWare emulator-server: "
-#~ msgstr "Ræsi NetWare þjónustuna: "