Merge tag 'initscripts-9.41-1' into mga-41

Tag as initscripts-9.41-1

Conflicts:
	.gitignore
	Makefile
	inittab
	po/xgettext_sh.py
	prefdm
	rc.d/init.d/functions
	rc.d/init.d/halt
	rc.d/init.d/killall
	rc.d/init.d/netfs
	rc.d/init.d/network
	rc.d/init.d/single
	rc.d/rc
	rc.d/rc.local
	rc.d/rc.sysinit
	service
	src/console_check.c
	src/console_init.c
	sysconfig.txt
	sysconfig/network-scripts/ifdown
	sysconfig/network-scripts/ifdown-eth
	sysconfig/network-scripts/ifup
	sysconfig/network-scripts/ifup-eth
	sysconfig/network-scripts/ifup-ippp
	sysconfig/network-scripts/network-functions
	systemd/system/fedora-wait-storage.service
	udev/rules.d/10-console.rules

Merge Notes:
 1. prefdm: We are keeping the current prefdm script which parses
    /etc/sysconfig/desktop to find the current preferred dm. We also
    keep the hunk in sysconfig.txt which relates to the afore mentioned
    file. Longer term, we should drop this and move to per-dm units.
 2. sysconfig/network-scripts/ifup-ippp is still removed at our end...
    is there a replacement?
 3. I used our /sbin/service as it varies quite a lot from fedora. I'd
    be tempted to drop our custom version in favour of upstream
    (s/libexec/lib/)
 4. ifup/ifdown NM wrappers have been included - previously we just
    printed a "Device is manged by NM skipping.." message.

CONFLICT (modify/delete): udev/rules.d/10-console.rules deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of udev/rules.d/10-console.rules left in tree.
Auto-merging systemd/system/fedora-wait-storage.service
CONFLICT (content): Merge conflict in systemd/system/fedora-wait-storage.service
Auto-merging systemd/fedora-storage-init
Auto-merging sysconfig/network-scripts/network-functions
CONFLICT (content): Merge conflict in sysconfig/network-scripts/network-functions
Removing sysconfig/network-scripts/net.hotplug
Auto-merging sysconfig/network-scripts/ifup-sit
Auto-merging sysconfig/network-scripts/ifup-post
Auto-merging sysconfig/network-scripts/ifup-plusb
CONFLICT (modify/delete): sysconfig/network-scripts/ifup-ippp deleted in
HEAD and modified in initscripts-9.41-1. Version initscripts-9.41-1 of sysconfig/network-scripts/ifup-ippp left in tree.
Auto-merging sysconfig/network-scripts/ifup-eth
CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifup-eth
Auto-merging sysconfig/network-scripts/ifup
CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifup
Auto-merging sysconfig/network-scripts/ifdown-sit
Auto-merging sysconfig/network-scripts/ifdown-post
Auto-merging sysconfig/network-scripts/ifdown-eth
CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifdown-eth
Auto-merging sysconfig/network-scripts/ifdown
CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifdown
Auto-merging sysconfig.txt
CONFLICT (content): Merge conflict in sysconfig.txt
Removing src/testdinit
Removing src/testd.c
Removing src/securetty.c
Removing src/securetty.8
Removing src/getkey.c
Removing src/getkey.1
Removing src/fstab-decode.c
Removing src/fstab-decode.8
CONFLICT (modify/delete): src/console_init.c deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of src/console_init.c left in tree.
CONFLICT (modify/delete): src/console_check.c deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of src/console_check.c left in tree.
Auto-merging service
CONFLICT (content): Merge conflict in service
CONFLICT (modify/delete): rc.d/rc.sysinit deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc.sysinit left in tree.
CONFLICT (modify/delete): rc.d/rc.local deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc.local left in tree.
CONFLICT (modify/delete): rc.d/rc deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc left in tree.
CONFLICT (modify/delete): rc.d/init.d/single deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/single left in tree.
Auto-merging rc.d/init.d/network
CONFLICT (content): Merge conflict in rc.d/init.d/network
CONFLICT (modify/delete): rc.d/init.d/netfs deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/netfs left in tree.
Auto-merging rc.d/init.d/netconsole
CONFLICT (modify/delete): rc.d/init.d/killall deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/killall left in tree.
CONFLICT (modify/delete): rc.d/init.d/halt deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/halt left in tree.
Auto-merging rc.d/init.d/functions
CONFLICT (content): Merge conflict in rc.d/init.d/functions
CONFLICT (modify/delete): prefdm deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of prefdm left in tree.
Auto-merging ppp/ip-up.ipv6to4
CONFLICT (modify/delete): po/xgettext_sh.py deleted in HEAD and modified in initscripts-9.41-1. Version initscripts-9.41-1 of po/xgettext_sh.py left in tree.
Removing inittab.upstart
Removing inittab.systemd
Removing inittab.s390
Auto-merging inittab
CONFLICT (content): Merge conflict in inittab
Removing init/tty.conf
Removing init/start-ttys.conf
Removing init/splash-manager.conf
Removing init/serial.conf
Removing init/rcS.conf
Removing init/rcS-sulogin.conf
Removing init/rc.conf
Removing init/quit-plymouth.conf
Removing init/prefdm.conf
Removing init/plymouth-shutdown.conf
Removing init/control-alt-delete.conf
Removing crypttab.5
Removing README-init
Removing NetworkManager/dispatcher.d/05-netfs
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.

1 files changed, 193 insertions, 330 deletions

diff --git a/po/de.po b/po/de.po
index fb8619c1..dd438a27 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,33 +1,29 @@
-# translation of initscripts.master.po to
-# translation of initscripts.master.de.po to
-# German translation of initscripts
 #
-# Bernd Groh <bgroh@redhat.com>, 2003,2004.
-# Andreas Müller <redhat@andreas-mueller.com>, 2003, 2004.
-# Verena <vfuehrer@redhat.com>, 2004.
-# Ronny Buchmann <ronny-vlug@vlugnet.org>, 2004,2006.
-# Severin Heiniger <severinheiniger@gmail.com>, 2006.
-# Timo Trinks <ttrinks@redhat.com>, 2007.
-# Fabian Affolter <fab@fedoraproject.org>, 2007-2009.
-# Dominik Sandjaja <dominiksandjaja@fedoraproject.org>, 2008,2009.
-# Marcus Nitzschke <kenda@fedoraproject.org>, 2009.
+# Translators:
+# Bernd Groh <bgroh@redhat.com>, 2003, 2004.
+# Dimitris Glezos <glezos@indifex.com>, 2011.
+# Dominik Sandjaja <dominiksandjaja@fedoraproject.org>, 2008, 2009.
+# Fabian Affolter <fab@fedoraproject.org>, 2007.
 # Hedda Peters <hpeters@redhat.com>, 2009.
 # Jens Maucher <jensm@fedoraproject.org>, 2010.
+# Laurin  <lineak@fedoraproject.org>, 2011.
+# Marcus Nitzschke <kenda@fedoraproject.org>, 2009.
+# Ronny Buchmann <ronny-vlug@vlugnet.org>, 2004, 2006.
+# Severin Heiniger <severinheiniger@gmail.com>, 2006.
 # sknirT omiT <moc.tahder@sknirtt>, 2010.
+# Timo Trinks <ttrinks@redhat.com>, 2007.
+# Verena <vfuehrer@redhat.com>, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: initscripts.master.de\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2010-08-24 01:33+1000\n"
-"Last-Translator: \n"
-"Language-Team:  <en@li.org>\n"
+"Project-Id-Version: fedora-initscripts\n"
+"PO-Revision-Date: 2012-02-14 14:49+0000\n"
+"Last-Translator: notting <notting@redhat.com>\n"
+"Language-Team: German <trans-de@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: /etc/rc.d/init.d/ez-ipupdate:76
 msgid "Reloading $prog for $ez_name: "
@@ -62,9 +58,7 @@ msgstr "Ordnungsgemäßes Beenden des alten $prog: "
 msgid ""
 "Warning: configured MTU '$IPV6TO4_MTU' for 6to4 exceeds maximum limit of "
 "'$tunnelmtu', ignored"
-msgstr ""
-"Achtung: die konfigurierte MTU '$IPV6TO4_MTU' für 6to4 überschreitet die "
-"maximale Grenze für '$tunnelmtu', ignoriert"
+msgstr "Achtung: die konfigurierte MTU '$IPV6TO4_MTU' für 6to4 überschreitet die maximale Grenze für '$tunnelmtu', ignoriert"
 
 #: /etc/rc.d/init.d/tclhttpd:51
 msgid "$base dead but pid file exists"
@@ -73,7 +67,9 @@ msgstr "$base tot, aber PID-Datei existiert"
 #: /etc/sysconfig/network-scripts/ifup:100
 #: /etc/sysconfig/network-scripts/ifup-eth:74
 #: /etc/sysconfig/network-scripts/ifup-ib:52
-msgid "$alias device ${DEVICE} does not seem to be present, delaying initialization."
+msgid ""
+"$alias device ${DEVICE} does not seem to be present, delaying "
+"initialization."
 msgstr "$alias Gerät ${DEVICE} scheint zu fehlen, Initialisierung verzögert."
 
 #: /etc/rc.d/init.d/btseed:70 /etc/rc.d/init.d/bttrack:71
@@ -299,7 +295,8 @@ msgstr "$desc ($prog) speichern: "
 msgid "Missing remote IPv4 address of tunnel, configuration is not valid"
 msgstr "Entfernte IPv4-Adresse des Tunnels fehlt, Konfiguration ist ungültig"
 
-#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/oscap-scan:62
+#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/ksm:47
+#: /etc/rc.d/init.d/oscap-scan:62 /etc/rc.d/init.d/oscap-scan:62
 #: /etc/rc.d/init.d/systemtap:518
 msgid "$prog startup"
 msgstr "$prog starten"
@@ -314,11 +311,9 @@ msgstr "Cron-Dienst 'denyhosts' deaktivieren: "
 
 #: /etc/rc.d/init.d/zarafa-spooler:110
 msgid ""
-"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload|"
-"try-restart}"
-msgstr ""
-"Verwendung: $spooler {start|stop|status|reload|restart|condrestart|force-"
-"reload|try-restart}"
+"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload"
+"|try-restart}"
+msgstr "Verwendung: $spooler {start|stop|status|reload|restart|condrestart|force-reload|try-restart}"
 
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:1146
 msgid "Unsupported mechanism '$mechanism' for sending trigger to radvd"
@@ -340,9 +335,7 @@ msgstr "System-Message-Bus beenden: "
 msgid ""
 "Usage: $0 {start|stop|restart|reload|force-reload|status|condrestart|try-"
 "restart}"
-msgstr ""
-"Verwendung: $0 {start|stop|restart|reload|force-reload|status|condrestart|try-"
-"restart}"
+msgstr "Verwendung: $0 {start|stop|restart|reload|force-reload|status|condrestart|try-restart}"
 
 #: /etc/rc.d/init.d/bgpd:35 /etc/rc.d/init.d/ospf6d:34
 #: /etc/rc.d/init.d/ospfd:34 /etc/rc.d/init.d/radvd:44
@@ -357,11 +350,9 @@ msgstr "Nächtliches yum-Update deaktivieren: "
 
 #: /etc/rc.d/init.d/rhnsd:108
 msgid ""
-"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-restart|"
-"reload}"
-msgstr ""
-"Verwendung:  $0 {start|stop|status|restart|force-reload|condrestart|try-"
+"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-"
 "restart|reload}"
+msgstr "Verwendung:  $0 {start|stop|status|restart|force-reload|condrestart|try-restart|reload}"
 
 #: /etc/rc.d/init.d/firstboot:52
 msgid "ERROR: Program /usr/sbin/firstboot is not installed"
@@ -375,15 +366,12 @@ msgstr "UPS-Monitor beenden: "
 msgid ""
 "Usage: $0 {start|stop|status|restart|force-reload|reload|condrestart|try-"
 "restart}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|restart|force-reload|reload|condrestart|"
-"try-restart}"
+msgstr "Verwendung: $0 {start|stop|status|restart|force-reload|reload|condrestart|try-restart}"
 
 #: /etc/rc.d/init.d/nginx:131
-msgid "Usage: $0 {start|stop|reload|configtest|status|force-reload|upgrade|restart}"
-msgstr ""
-"Verwendung: $0 {start|stop|reload|configtest|status|force-reload|upgrade|"
-"restart}"
+msgid ""
+"Usage: $0 {start|stop|reload|configtest|status|force-reload|upgrade|restart}"
+msgstr "Verwendung: $0 {start|stop|reload|configtest|status|force-reload|upgrade|restart}"
 
 #: /etc/rc.d/init.d/smolt:22
 msgid "Enabling monthly Smolt checkin: "
@@ -438,9 +426,7 @@ msgstr "WINE-Binärformat ist registriert."
 msgid ""
 "Usage: $0 {start|stop|restart|status|condrestart|try-restart|reload|force-"
 "reload|report}"
-msgstr ""
-"Verwendung: $0 {start|stop|restart|status|condrestart|try-restart|reload|"
-"force-reload|report}"
+msgstr "Verwendung: $0 {start|stop|restart|status|condrestart|try-restart|reload|force-reload|report}"
 
 #: /etc/rc.d/init.d/icecast:53
 msgid "Reloading icecast: "
@@ -452,19 +438,15 @@ msgstr "openvpn beenden: "
 
 #: /etc/rc.d/init.d/puppetmaster:133
 msgid ""
-"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|"
-"genconfig}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|restart|reload|force-reload|condrestart|"
-"genconfig}"
+"Usage: $0 {start|stop|status|restart|reload|force-"
+"reload|condrestart|genconfig}"
+msgstr "Verwendung: $0 {start|stop|status|restart|reload|force-reload|condrestart|genconfig}"
 
 #: /etc/rc.d/init.d/zarafa-monitor:110
 msgid ""
-"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload|"
-"try-restart}"
-msgstr ""
-"Verwendung: $monitor {start|stop|status|reload|restart|condrestart|force-"
-"reload|try-restart}"
+"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload"
+"|try-restart}"
+msgstr "Verwendung: $monitor {start|stop|status|reload|restart|condrestart|force-reload|try-restart}"
 
 #: /etc/rc.d/rc.sysinit:89
 msgid "\t\tWelcome to "
@@ -477,11 +459,9 @@ msgstr "$desc ($prog) beenden: "
 
 #: /etc/rc.d/init.d/zarafa-dagent:115
 msgid ""
-"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload|"
-"try-restart}"
-msgstr ""
-"Verwendung: $dagent {start|stop|status|reload|restart|condrestart|force-"
-"reload|try-restart}"
+"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload"
+"|try-restart}"
+msgstr "Verwendung: $dagent {start|stop|status|reload|restart|condrestart|force-reload|try-restart}"
 
 #: /etc/rc.d/init.d/rsyslog:50 /etc/rc.d/init.d/sysklogd:54
 msgid "Shutting down system logger: "
@@ -569,11 +549,9 @@ msgstr "Verwendung: $0 {start|stop|restart|status|condrestart}"
 
 #: /etc/rc.d/init.d/httpd:119
 msgid ""
-"Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|"
-"status|fullstatus|graceful|help|configtest}"
-msgstr ""
-"Verwendung: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|"
-"status|fullstatus|graceful|help|configtest}"
+"Usage: $prog {start|stop|restart|condrestart|try-restart|force-"
+"reload|reload|status|fullstatus|graceful|help|configtest}"
+msgstr "Verwendung: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|status|fullstatus|graceful|help|configtest}"
 
 #: /etc/rc.d/init.d/smokeping:33
 msgid "Starting smokeping: "
@@ -615,7 +593,6 @@ msgstr "xenstored-Daemon starten: "
 msgid "Starting ${ifprog}: "
 msgstr "${ifprog} starten: "
 
-#
 #: /etc/sysconfig/network-scripts/ifup-aliases:192
 msgid "error in $FILE: didn't specify device or ipaddr"
 msgstr "Fehler in $FILE: Gerät oder IP-Adresse wurde nicht angegeben"
@@ -651,11 +628,9 @@ msgstr "NFS-Daemon beenden: "
 
 #: /etc/rc.d/init.d/cups:140
 msgid ""
-"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|"
-"force-reload|status}"
-msgstr ""
-"Verwendung: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|"
-"force-reload|status}"
+"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload"
+"|force-reload|status}"
+msgstr "Verwendung: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|force-reload|status}"
 
 #: /etc/rc.d/init.d/ctdb:280
 msgid "ctdb is stopped"
@@ -794,11 +769,9 @@ msgstr "Prozess-Buchführung starten: "
 
 #: /etc/rc.d/init.d/zarafa-server:144
 msgid ""
-"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload|"
-"try-restart}"
-msgstr ""
-"Verwendung: $server {start|stop|status|reload|restart|condrestart|force-"
-"reload|try-restart}"
+"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload"
+"|try-restart}"
+msgstr "Verwendung: $server {start|stop|status|reload|restart|condrestart|force-reload|try-restart}"
 
 #: /etc/rc.d/init.d/ypxfrd:32
 msgid "Starting YP map server: "
@@ -830,9 +803,7 @@ msgstr "$progbase herunterfahren: "
 msgid ""
 "Warning: ipppd (kernel 2.4.x and below) doesn't support IPv6 using "
 "encapsulation 'syncppp'"
-msgstr ""
-"Warnung: ipppd (Kernel 2.4.x und niedriger) unterstützt kein IPv6, das die "
-"Kapselung 'syncppp' verwendet"
+msgstr "Warnung: ipppd (Kernel 2.4.x und niedriger) unterstützt kein IPv6, das die Kapselung 'syncppp' verwendet"
 
 #: /etc/rc.d/init.d/gpm:58
 msgid "(no mouse is configured)"
@@ -851,8 +822,8 @@ msgid "Applying sysctl settings from $SYSCTL_POST"
 msgstr "sysctl-Einstellungen von $SYSCTL_POST anwenden"
 
 #: /etc/rc.d/init.d/pgpool:134
-msgid "Sending switchover request to $NAME "
-msgstr "Wechselanfrage an $NAME schicken "
+msgid "Sending switchover request to $NAME "
+msgstr ""
 
 #: /etc/rc.d/init.d/gkrellmd:70 /etc/rc.d/init.d/hddtemp:86
 #: /etc/rc.d/init.d/vdr:96
@@ -1002,9 +973,7 @@ msgstr "$prog2 neu laden: "
 msgid ""
 "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-"
 "reload|cyclelogs|online|offline|command}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|restart|condrestart|try-restart|reload|"
-"force-reload|cyclelogs|online|offline|command}"
+msgstr "Verwendung: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|cyclelogs|online|offline|command}"
 
 #: /etc/rc.d/init.d/netconsole:101
 msgid "Disabling netconsole"
@@ -1140,17 +1109,14 @@ msgid "sfcb is not running"
 msgstr "sfcb wird nicht ausgeführt"
 
 #: /etc/rc.d/init.d/arptables_jf:192
-msgid "Usage: $0 {start|stop|restart|try-restart|force-reload|status|panic|save}"
+msgid ""
+"Usage: $0 {start|stop|restart|try-restart|force-reload|status|panic|save}"
 msgstr "Verwendung: $0 {start|stop|restart|try-restart|force-reload|status|panic|save}"
 
 #: /etc/rc.d/init.d/ctdb:172
 msgid "CTDB is already running"
 msgstr "CTDB wird bereits ausgeführt."
 
-#: /etc/ppp/ip-up.ipv6to4:186
-msgid "Error occured while calculating the IPv6to4 prefix"
-msgstr "Ein Fehler trat während der Berechnung des IPv6to4-Präfixes auf"
-
 #: /etc/rc.d/init.d/fetch-crl-boot:57
 msgid "fetch-crl-boot lockfile present"
 msgstr "fetch-crl-boot Lock-Datei vorhanden"
@@ -1214,11 +1180,9 @@ msgstr "$LLDPAD beenden: "
 
 #: /etc/rc.d/init.d/ksmtuned:84
 msgid ""
-"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|"
-"retune|help}"
-msgstr ""
-"Verwendung: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|"
-"retune|help}"
+"Usage: $prog {start|stop|restart|force-reload|condrestart|try-"
+"restart|status|retune|help}"
+msgstr "Verwendung: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|retune|help}"
 
 #: /etc/rc.d/init.d/netfs:40
 msgid "Mounting NFS filesystems: "
@@ -1229,7 +1193,8 @@ msgid "Starting NetworkManager daemon: "
 msgstr "NetworkManager-Daemon starten: "
 
 #: /etc/rc.d/init.d/ospf6d:68 /etc/rc.d/init.d/ospfd:68
-msgid "Usage: $PROG {start|stop|restart|reload|force-reload|try-restart|status}"
+msgid ""
+"Usage: $PROG {start|stop|restart|reload|force-reload|try-restart|status}"
 msgstr "Verwendung: $PROG {start|stop|restart|reload|force-reload|try-restart|status}"
 
 #: /etc/rc.d/init.d/fb-server:42
@@ -1241,9 +1206,7 @@ msgstr "Frozen Bubble Server anhalten: "
 msgid ""
 "Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would "
 "be expected); aborting..."
-msgstr ""
-"Kann util-vserver-Installation nicht finden (die Datei '$UTIL_VSERVER_VARS' "
-"wurde erwartet); abbrechen ..."
+msgstr "Kann util-vserver-Installation nicht finden (die Datei '$UTIL_VSERVER_VARS' wurde erwartet); abbrechen ..."
 
 #: /etc/rc.d/init.d/ctdb:277
 msgid "ctdb dead but subsys locked"
@@ -1251,13 +1214,11 @@ msgstr "ctdb tot, aber Subsystem gesperrt"
 
 #: /etc/rc.d/init.d/puppet:112
 msgid ""
-"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|"
-"genconfig}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|restart|reload|force-reload|condrestart|"
-"once|genconfig}"
+"Usage: $0 {start|stop|status|restart|reload|force-"
+"reload|condrestart|once|genconfig}"
+msgstr "Verwendung: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}"
 
-#: /etc/sysconfig/network-scripts/ifup-ipv6:296
+#: /etc/sysconfig/network-scripts/ifup-ipv6:296 /etc/ppp/ip-up.ipv6to4:186
 msgid "Error occurred while calculating the IPv6to4 prefix"
 msgstr "Fehler während der Berechnung des IPv6to4-Präfixes"
 
@@ -1269,9 +1230,7 @@ msgstr "Aktuelle Regeln in $ARPTABLES_CONFIG speichern"
 msgid ""
 "Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-"
 "restart}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-"
-"restart}"
+msgstr "Verwendung: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-restart}"
 
 #: /etc/rc.d/init.d/firehol:5604 /etc/rc.d/init.d/firehol:5627
 msgid "FireHOL: Blocking all communications:"
@@ -1281,7 +1240,7 @@ msgstr "FireHOL: Alle Datenkommunikation wird geblockt:"
 msgid "Restarting $monitor: "
 msgstr "$monitpr neu starten: "
 
-#: /etc/rc.d/init.d/named:234
+#: /etc/rc.d/init.d/named:234 /etc/rc.d/init.d/named:234
 msgid "$named reload"
 msgstr "$named neu laden"
 
@@ -1404,7 +1363,8 @@ msgstr "Gäste auf $uri URI fortsetzen..."
 msgid "Starting xenconsoled daemon: "
 msgstr "xencosoled-Daemon starten: "
 
-#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/greylistd:28
+#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/functions:267
+#: /etc/rc.d/init.d/greylistd:28 /etc/rc.d/init.d/greylistd:28
 msgid "$base startup"
 msgstr "Starten von $base"
 
@@ -1635,9 +1595,7 @@ msgstr "${prog}-Konfiguration neu laden: "
 msgid ""
 "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-"
 "reload}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|restart|condrestart|try-restart|reload|"
-"force-reload}"
+msgstr "Verwendung: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
 
 #: /etc/rc.d/init.d/smokeping:40
 msgid "Stopping smokeping: "
@@ -1652,7 +1610,8 @@ msgid "Generating unbound control key and certificate: "
 msgstr "Generiere ungebundenen Kontroll-Schlüssel und Zertifikat:"
 
 #: /etc/sysconfig/network-scripts/ifup-ppp:77
-msgid "/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist for ${DEVICE}"
+msgid ""
+"/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist for ${DEVICE}"
 msgstr "/etc/sysconfig/network-scripts/chat-${DEVNAME} existiert nicht für ${DEVICE}"
 
 #: /etc/sysconfig/network-scripts/init.ipv6-global:158
@@ -1661,11 +1620,9 @@ msgstr "Verwendung: $0 {start|stop|reload|restart|showsysctl}"
 
 #: /etc/rc.d/init.d/zarafa-indexer:108
 msgid ""
-"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload|"
-"try-restart}"
-msgstr ""
-"Verwendung: $indexer {start|stop|status|reload|restart|condrestart|force-reload|"
-"try-restart}"
+"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload"
+"|try-restart}"
+msgstr "Verwendung: $indexer {start|stop|status|reload|restart|condrestart|force-reload|try-restart}"
 
 #: /etc/rc.d/init.d/ushare:76
 msgid "Usage: $prog {start|stop|restart|condrestart|reload|status"
@@ -1705,9 +1662,7 @@ msgstr "Verwendung: $0 {start|stop|reload|force-reload|restart|try-restart|statu
 
 #: /etc/rc.d/rc.sysinit:68
 msgid "*** problems. Dropping you to a shell; the system will reboot"
-msgstr ""
-"*** Es traten Probleme auf. Sie erhalten eine Shell; das System wird neu "
-"gestartet"
+msgstr "*** Es traten Probleme auf. Sie erhalten eine Shell; das System wird neu gestartet"
 
 #: /etc/rc.d/init.d/arptables_jf:59
 msgid "Starting arptables_jf"
@@ -1740,19 +1695,17 @@ msgstr "ladvd starten: "
 #: /etc/sysconfig/network-scripts/ifup:119
 #: /etc/sysconfig/network-scripts/ifup:120
 msgid "ERROR: could not add vlan ${VID} as ${DEVICE} on dev ${PHYSDEV}"
-msgstr ""
-"FEHLER: Konnte VLAN ${VID} nicht als ${DEVICE} auf Gerät ${PHYSDEV} "
-"hinzufügen"
+msgstr "FEHLER: Konnte VLAN ${VID} nicht als ${DEVICE} auf Gerät ${PHYSDEV} hinzufügen"
 
 #: /etc/rc.d/init.d/openvpn:125
 msgid "Starting openvpn: "
 msgstr "openvpn starten: "
 
 #: /etc/rc.d/init.d/mailman:168
-msgid "Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}"
-msgstr ""
-"Verwendung: $prog {start|stop|restart|force-reload|condrestart|try-restart|"
-"status}"
+msgid ""
+"Usage: $prog {start|stop|restart|force-reload|condrestart|try-"
+"restart|status}"
+msgstr "Verwendung: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}"
 
 #: /etc/rc.d/init.d/pki-rad:959 /etc/rc.d/init.d/pki-tpsd:983
 msgid "Reloading ${prog}: "
@@ -1882,11 +1835,9 @@ msgstr "Überprüfen von $prog"
 
 #: /etc/rc.d/init.d/dictd:94
 msgid ""
-"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-reload|"
-"status}"
-msgstr ""
-"Verwendung: $0 {start|stop|restart|try-restart|condrestart|reload|force-"
+"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-"
 "reload|status}"
+msgstr "Verwendung: $0 {start|stop|restart|try-restart|condrestart|reload|force-reload|status}"
 
 #: /etc/rc.d/init.d/tclhttpd:37
 msgid "Usage: status {program}"
@@ -1925,10 +1876,9 @@ msgid "Reloading NIS service: "
 msgstr "NIS-Dienst neu laden: "
 
 #: /etc/sysconfig/network-scripts/ifup-ipv6:283
-msgid "Using 6to4 and RADVD IPv6 forwarding usually should be enabled, but it isn't"
-msgstr ""
-"Normalerweise sollten 6to4- und RADVD IPv6-Weiterleitung aktiviert sein, ist "
-"es aber nicht"
+msgid ""
+"Using 6to4 and RADVD IPv6 forwarding usually should be enabled, but it isn't"
+msgstr "Normalerweise sollten 6to4- und RADVD IPv6-Weiterleitung aktiviert sein, ist es aber nicht"
 
 #: /etc/rc.d/init.d/libvirtd:60 /etc/rc.d/init.d/libvirt-qpid:38
 #: /etc/rc.d/init.d/matahari:22
@@ -1989,9 +1939,7 @@ msgstr "$prog Datenbanken imortieren"
 msgid ""
 "Given remote address '$addressipv4tunnel' on tunnel device '$device' is "
 "already configured on device '$devnew'"
-msgstr ""
-"Die angegebene Adresse '$addressipv4tunnel' für das Tunnel-Gerät '$device' "
-"ist bereits für das Gerät '$devnew' konfiguriert"
+msgstr "Die angegebene Adresse '$addressipv4tunnel' für das Tunnel-Gerät '$device' ist bereits für das Gerät '$devnew' konfiguriert"
 
 #: /etc/rc.d/init.d/iceccd:32
 msgid "Starting distributed compiler daemon: "
@@ -2027,9 +1975,7 @@ msgstr "vbi-Proxy-Daemon starten: "
 msgid ""
 "Device '$DEVICE' isn't supported here, use IPV6_AUTOTUNNEL setting and "
 "restart (IPv6) networking"
-msgstr ""
-"Gerät '$DEVICE' wird hier nicht unterstützt, verwenden Sie die "
-"IPV6_AUTOTUNNEL-Einstellung und starten sie das (IPv6) Netzwerk neu"
+msgstr "Gerät '$DEVICE' wird hier nicht unterstützt, verwenden Sie die IPV6_AUTOTUNNEL-Einstellung und starten sie das (IPv6) Netzwerk neu"
 
 #: /etc/rc.d/init.d/yum-cron:22
 msgid "Enabling nightly yum update: "
@@ -2110,11 +2056,9 @@ msgstr "xenstored-Daemon beenden: "
 #: /etc/rc.d/init.d/oddjobd:102 /etc/rc.d/init.d/pyicq-t:92
 #: /etc/rc.d/init.d/rsyslog:102
 msgid ""
-"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|"
-"status}"
-msgstr ""
-"Verwendung: $0 {start|stop|restart|condrestart|try-restart|reload|force-"
+"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-"
 "reload|status}"
+msgstr "Verwendung: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
 
 #: /etc/rc.d/init.d/smartd:88
 msgid "Checking SMART devices now: "
@@ -2128,9 +2072,7 @@ msgstr "Importiere Pakete in die Monotone-Datenbank:"
 msgid ""
 "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-"
 "reload|rotate|resume}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|restart|condrestart|try-restart|reload|"
-"force-reload|rotate|resume}"
+msgstr "Verwendung: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|rotate|resume}"
 
 #: /etc/rc.d/init.d/tinyerp-server:86
 msgid "$prog is running..."
@@ -2228,11 +2170,9 @@ msgstr "VNC-Server"
 
 #: /etc/rc.d/init.d/sshd:233
 msgid ""
-"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|"
-"status}"
-msgstr ""
-"Verwendung: $0 {start|stop|restart|reload|force-reload|condrestart|try-"
+"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-"
 "restart|status}"
+msgstr "Verwendung: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status}"
 
 #: /etc/rc.d/init.d/systemtap:62
 msgid "Options:"
@@ -2263,7 +2203,8 @@ msgid "*** Warning -- SELinux ${SELINUXTYPE} policy relabel is required. "
 msgstr "*** Warnung -- SELinux ${SELINUXTYPE} Richtlinie muss umbenannt werden. "
 
 #: /etc/rc.d/init.d/cyrus-imapd:68
-msgid "$prog error importing databases, check ${CONFIGDIRECTORY}/rpm/db_import.log"
+msgid ""
+"$prog error importing databases, check ${CONFIGDIRECTORY}/rpm/db_import.log"
 msgstr "$prog error importing databases, check ${CONFIGDIRECTORY}/rpm/db_import.log"
 
 #: /etc/rc.d/init.d/orbited:20
@@ -2280,11 +2221,9 @@ msgstr "pand beenden: "
 
 #: /etc/rc.d/init.d/ksm:98
 msgid ""
-"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|"
-"help}"
-msgstr ""
-"Verwendung: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|"
-"help}"
+"Usage: $prog {start|stop|restart|force-reload|condrestart|try-"
+"restart|status|help}"
+msgstr "Verwendung: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|help}"
 
 #: /etc/rc.d/init.d/ajaxterm:71 /etc/rc.d/init.d/qemu:98
 msgid "Usage: $prog {start|stop|status|restart|condrestart}"
@@ -2316,9 +2255,10 @@ msgid "Stopping distributed compiler scheduler: "
 msgstr "distributed compiler-Planer beenden: "
 
 #: /etc/rc.d/init.d/functions:303 /etc/rc.d/init.d/functions:324
-#: /etc/rc.d/init.d/functions:340 /etc/rc.d/init.d/tclhttpd:116
+#: /etc/rc.d/init.d/functions:324 /etc/rc.d/init.d/functions:340
+#: /etc/rc.d/init.d/tclhttpd:116 /etc/rc.d/init.d/tclhttpd:116
 #: /etc/rc.d/init.d/tclhttpd:127 /etc/rc.d/init.d/voms:259
-#: /etc/rc.d/init.d/voms:270
+#: /etc/rc.d/init.d/voms:259 /etc/rc.d/init.d/voms:270
 msgid "$base shutdown"
 msgstr "$base beenden"
 
@@ -2332,9 +2272,7 @@ msgstr "Eine alte Version des Datenbankformats wurde gefunden."
 
 #: /etc/rc.d/init.d/nginx:98
 msgid "Something bad happened, manual intervention required, maybe restart?"
-msgstr ""
-"Etwas ungünstiges ist passiert, manuelles Eingreifen ist erforderlich, "
-"eventuell neustarten?"
+msgstr "Etwas ungünstiges ist passiert, manuelles Eingreifen ist erforderlich, eventuell neustarten?"
 
 #: /etc/rc.d/init.d/gearmand:76 /etc/rc.d/init.d/ngircd:74
 msgid "Usage: $prog {start|stop|restart|reload|condrestart|status|help}"
@@ -2404,11 +2342,9 @@ msgstr "Verwendung: $0 {start|stop|restart}"
 #: /etc/rc.d/init.d/dhcpd:112 /etc/rc.d/init.d/dhcpd6:115
 #: /etc/rc.d/init.d/dhcrelay:83
 msgid ""
-"Usage: $0 {start|stop|restart|force-reload|condrestart|try-restart|"
-"configtest|status}"
-msgstr ""
-"Verwendung: $0 {start|stop|restart|force-reload|condrestart|try-restart|"
-"configtest|status}"
+"Usage: $0 {start|stop|restart|force-reload|condrestart|try-"
+"restart|configtest|status}"
+msgstr "Verwendung: $0 {start|stop|restart|force-reload|condrestart|try-restart|configtest|status}"
 
 #: /etc/rc.d/init.d/util-vserver:112
 msgid "Unmounting cgroup-hierarchy"
@@ -2479,9 +2415,7 @@ msgstr "ser2net neu laden: "
 msgid ""
 "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-"
 "stop|force-restart|force-reload}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|restart|condrestart|try-restart|reload|"
-"force-stop|force-restart|force-reload}"
+msgstr "Verwendung: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-stop|force-restart|force-reload}"
 
 #: /etc/rc.d/init.d/tog-pegasus:90
 msgid "Shutting down CIM server: "
@@ -2521,9 +2455,7 @@ msgstr "pdns-recursor starten: "
 msgid ""
 "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-"
 "reload|initdb}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-"
-"reload|initdb}"
+msgstr "Verwendung: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|initdb}"
 
 #: /etc/rc.d/init.d/bgpd:69 /etc/rc.d/init.d/ripd:68
 #: /etc/rc.d/init.d/ripngd:68 /etc/rc.d/init.d/zebra:68
@@ -2641,9 +2573,7 @@ msgstr "NFS mountd beenden:"
 
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:1051
 msgid "Given IPv6 default device '$device' doesn't exist or isn't up"
-msgstr ""
-"Gegebenes IPv6-Standardgerät '$device' existiert nicht oder ist nicht "
-"eingeschaltet"
+msgstr "Gegebenes IPv6-Standardgerät '$device' existiert nicht oder ist nicht eingeschaltet"
 
 #: /etc/rc.d/init.d/multipathd:69
 msgid "Starting $prog daemon: "
@@ -2703,9 +2633,7 @@ msgstr "NIS-Domain einrichten: "
 msgid ""
 "Argument 1 is empty but should contain interface name - skip IPv6to4 "
 "initialization"
-msgstr ""
-"Argument 1 ist leer, sollte jedoch einen Schnittstellennamen enthalten - "
-"überspringe IPv6to4-Initialisierung"
+msgstr "Argument 1 ist leer, sollte jedoch einen Schnittstellennamen enthalten - überspringe IPv6to4-Initialisierung"
 
 #: /etc/rc.d/init.d/zarafa-gateway:49
 msgid "Starting $gateway: "
@@ -2713,9 +2641,7 @@ msgstr "$gateway starten: "
 
 #: /etc/rc.d/init.d/vdr:43
 msgid "Use \"scandvb -o vdr\" from the dvb-apps package to create one."
-msgstr ""
-"Verwendung von \"scandvb -o vdr\" aus dem Paket dvb-apps, um eins zu "
-"erstellen."
+msgstr "Verwendung von \"scandvb -o vdr\" aus dem Paket dvb-apps, um eins zu erstellen."
 
 #: /etc/rc.d/init.d/ktune:177
 msgid "Reverting to ${KERNEL_ELEVATOR} elevator: "
@@ -2729,7 +2655,8 @@ msgstr "Aktive CIFS-Einhängepunkte: "
 msgid "DSS key generation"
 msgstr "DSS-Schlüsselerzeugung"
 
-#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 /etc/rc.d/init.d/nscd:61
+#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59
+#: /etc/rc.d/init.d/nscd:61
 msgid "$prog shutdown"
 msgstr "Beenden von $prog"
 
@@ -2798,11 +2725,9 @@ msgstr "$dagent neu starten: "
 
 #: /etc/rc.d/init.d/zarafa-gateway:110
 msgid ""
-"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload|"
-"try-restart}"
-msgstr ""
-"Verwendung: $gateway {start|stop|status|reload|restart|condrestart|force-"
-"reload|try-restart}"
+"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload"
+"|try-restart}"
+msgstr "Verwendung: $gateway {start|stop|status|reload|restart|condrestart|force-reload|try-restart}"
 
 #: /etc/rc.d/init.d/zarafa-gateway:62
 msgid "Stopping $gateway: "
@@ -2822,11 +2747,9 @@ msgstr "xend-Daemon beenden: "
 
 #: /etc/rc.d/init.d/pgpool:200
 msgid ""
-"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|"
-"force-reload}"
-msgstr ""
-"Verwendung: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|"
-"force-reload}"
+"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload"
+"|force-reload}"
+msgstr "Verwendung: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|force-reload}"
 
 #: /etc/rc.d/init.d/systemtap:580
 msgid "$s is dead, but another script is running."
@@ -2851,11 +2774,9 @@ msgstr "Konfigurierte NCP-Einhängepunkte: "
 
 #: /etc/rc.d/init.d/ctdb:313
 msgid ""
-"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|"
-"try-restart}"
-msgstr ""
-"Verwendung: $0 {start|stop|restart|reload|force-reload|status|cron|"
-"condrestart|try-restart}"
+"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart"
+"|try-restart}"
+msgstr "Verwendung: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|try-restart}"
 
 #: /etc/rc.d/init.d/puppetmaster:90
 msgid "Generate configuration puppetmaster: "
@@ -2866,9 +2787,7 @@ msgstr "Puppetmaster-Konfiguration erzeugen: "
 msgid ""
 "Device ${DEVICE} has MAC address ${FOUNDMACADDR}, instead of configured "
 "address ${HWADDR}. Ignoring."
-msgstr ""
-"Das Gerät ${DEVICE} hat die MAC-Adresse ${FOUNDMACADDR} anstelle der "
-"konfigurierten Adresse ${HWADDR}. Ignorieren."
+msgstr "Das Gerät ${DEVICE} hat die MAC-Adresse ${FOUNDMACADDR} anstelle der konfigurierten Adresse ${HWADDR}. Ignorieren."
 
 #: /etc/rc.d/init.d/functions:464
 msgid "FAILED"
@@ -2927,9 +2846,7 @@ msgstr "Verwendung: $0 {start|stop|status|restart|reload|try-restart|force-reloa
 msgid ""
 "Usage: $0 {start|stop|status|restart|try-restart|condrestart|reload|force-"
 "reload}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|restart|try-restart|condrestart|reload|force-"
-"reload}"
+msgstr "Verwendung: $0 {start|stop|status|restart|try-restart|condrestart|reload|force-reload}"
 
 #: /etc/rc.d/init.d/denyhosts:93
 msgid "Denyhosts already running."
@@ -2940,10 +2857,9 @@ msgid "Stoping Gadget daemon: "
 msgstr "Gadget-Daemon beenden: "
 
 #: /etc/ppp/ip-up.ipv6to4:138 /etc/sysconfig/network-scripts/ifup-ipv6:247
-msgid "Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored"
-msgstr ""
-"Warnung: Schnittstelle 'tun6to4' unterstützt 'IPV6_DEFAULTGW' nicht, wird "
-"ignoriert"
+msgid ""
+"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored"
+msgstr "Warnung: Schnittstelle 'tun6to4' unterstützt 'IPV6_DEFAULTGW' nicht, wird ignoriert"
 
 #: /etc/sysconfig/network-scripts/ifup-eth:76
 #: /etc/sysconfig/network-scripts/ifup-ib:54
@@ -3062,9 +2978,7 @@ msgstr "sm-client beenden: "
 msgid ""
 "Usage: $prog {start|stop|status|reload|restart|condrestart|force-reload|try-"
 "restart} [<configfile.{yml|conf}>]"
-msgstr ""
-"Verwendung: $prog {start|stop|status|reload|restart|condrestart|force-reload|"
-"try-restart} [<configfile.{yml|conf}>]"
+msgstr "Verwendung: $prog {start|stop|status|reload|restart|condrestart|force-reload|try-restart} [<configfile.{yml|conf}>]"
 
 #: /etc/rc.d/init.d/gnokii-smsd:45
 msgid "Stopping Gnokii SMS daemon ($prog): "
@@ -3204,7 +3118,7 @@ msgstr "$prog wird gestartet: $conf, $INTERFACES, $DRIVERS"
 msgid "Stopping hard disk temperature monitor daemon ($prog): "
 msgstr "Daemon zur Überwachung der Festplattentemperatur beenden ($prog): "
 
-#: /etc/rc.d/init.d/irda:28
+#: /etc/rc.d/init.d/irda:28 /etc/rc.d/init.d/irda:28
 msgid "irattach startup"
 msgstr "Starten von irattach"
 
@@ -3275,9 +3189,7 @@ msgstr "WARN     "
 msgid ""
 "'No route to host' adding route '$networkipv6' via gateway '$gatewayipv6' "
 "through device '$device'"
-msgstr ""
-"'Keine Route zum Rechner' füge Route '$networkipv6' über Gateway "
-"'$gatewayipv6' durch Gerät '$device' hinzu"
+msgstr "'Keine Route zum Rechner' füge Route '$networkipv6' über Gateway '$gatewayipv6' durch Gerät '$device' hinzu"
 
 #: /etc/rc.d/init.d/network:138 /etc/rc.d/init.d/network:150
 msgid "Bringing up interface $i: "
@@ -3301,11 +3213,9 @@ msgstr "Konfigurierte Netzwerkblock-Geräte: "
 
 #: /etc/rc.d/init.d/dovecot:102
 msgid ""
-"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|"
-"status}"
-msgstr ""
-"Verwendung: $0 {condrestart|try-restart|start|stop|restart|reload|force-"
+"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-"
 "reload|status}"
+msgstr "Verwendung: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|status}"
 
 #: /etc/rc.d/init.d/cfenvd:27
 msgid "Starting GNU cfengine environmental history daemon: "
@@ -3329,11 +3239,9 @@ msgstr "Verwendung: $0 {start|stop|restart|try-restart|status|force-reload}"
 
 #: /etc/rc.d/init.d/slapd:264 /etc/rc.d/init.d/slapd:268
 msgid ""
-"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|"
-"configtest|usage}"
-msgstr ""
-"Verwendung: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|"
-"configtest|usage}"
+"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-"
+"restart|configtest|usage}"
+msgstr "Verwendung: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|configtest|usage}"
 
 #: /etc/rc.d/init.d/restorecond:85
 msgid "Usage: $0 {start|stop|restart|force-reload|status|condrestart}"
@@ -3349,7 +3257,8 @@ msgid "Unmounting pipe file systems (retry): "
 msgstr "Pipe-Dateisysteme aushängen (erneuter Versuch): "
 
 #: /etc/rc.d/init.d/qpidd:114
-msgid "Usage: $0 {start|stop|status|restart|condrestart|try-restart|force-reload}"
+msgid ""
+"Usage: $0 {start|stop|status|restart|condrestart|try-restart|force-reload}"
 msgstr "Verwendung: $0 {start|stop|status|restart|condrestart|try-restart|force-reload}"
 
 #: /etc/rc.d/init.d/cyrus-imapd:115
@@ -3401,10 +3310,9 @@ msgid "Orbited is not running."
 msgstr "Orbited läuft nicht"
 
 #: /etc/rc.d/init.d/postfix:160
-msgid "Usage: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
-msgstr ""
-"Verwendung: $0 {start|stop|restart|reload|abort|flush|check|status|"
-"condrestart}"
+msgid ""
+"Usage: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
+msgstr "Verwendung: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
 
 #: /etc/rc.d/init.d/udev-post:32
 msgid "Adding udev persistent rules"
@@ -3467,9 +3375,7 @@ msgstr "Verwendung: status [-p PID-Datei] {Programm}"
 msgid ""
 "Usage: $ical {start|stop|status|reload|restart|condrestart|force-reload|try-"
 "restart}"
-msgstr ""
-"Verwendung: $ical {start|stop|status|reload|restart|condrestart|force-reload|"
-"try-restart}"
+msgstr "Verwendung: $ical {start|stop|status|reload|restart|condrestart|force-reload|try-restart}"
 
 #: /etc/rc.d/init.d/amavisd:60
 msgid "Reloading ${prog_base}:"
@@ -3526,10 +3432,9 @@ msgid "Starting liquidwar game server: "
 msgstr "liquidwar-Gameserver starten: "
 
 #: /etc/rc.d/init.d/cyrus-imapd:100
-msgid "$prog error exporting databases, check ${CONFIGDIRECTORY}/rpm/db_export.log"
-msgstr ""
-"$prog Fehler beim Datenbankexport, überprüfen Sie ${CONFIGDIRECTORY}/rpm/"
-"db_export.log"
+msgid ""
+"$prog error exporting databases, check ${CONFIGDIRECTORY}/rpm/db_export.log"
+msgstr "$prog Fehler beim Datenbankexport, überprüfen Sie ${CONFIGDIRECTORY}/rpm/db_export.log"
 
 #: /etc/rc.d/init.d/and:44
 msgid "Shutting down auto nice daemon:"
@@ -3547,9 +3452,7 @@ msgstr "RSA Host-Schlüssel für dropbear erzeugen: "
 msgid ""
 "Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|try-"
 "restart}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|restart|reload|force-reload|condrestart|try-"
-"restart}"
+msgstr "Verwendung: $0 {start|stop|status|restart|reload|force-reload|condrestart|try-restart}"
 
 #: /etc/rc.d/init.d/crond:82 /etc/rc.d/init.d/sshd:166
 msgid "Reloading $prog"
@@ -3567,8 +3470,9 @@ msgstr "$desc ($prog) beenden: "
 msgid "Sending all processes the KILL signal..."
 msgstr "Das KILL-Signal wird an alle Prozesse gesendet ..."
 
-#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/tclhttpd:123
-#: /etc/rc.d/init.d/voms:266
+#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/functions:331
+#: /etc/rc.d/init.d/tclhttpd:123 /etc/rc.d/init.d/tclhttpd:123
+#: /etc/rc.d/init.d/voms:266 /etc/rc.d/init.d/voms:266
 msgid "$base $killlevel"
 msgstr "$base $killlevel"
 
@@ -3701,11 +3605,9 @@ msgstr "DSA-Schlüsselerzeugung"
 
 #: /etc/rc.d/init.d/pgbouncer:162
 msgid ""
-"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-reload|"
-"condrestart|condstop}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|restart|pause|continue|reload|force-reload|"
-"condrestart|condstop}"
+"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-"
+"reload|condrestart|condstop}"
+msgstr "Verwendung: $0 {start|stop|status|restart|pause|continue|reload|force-reload|condrestart|condstop}"
 
 #: /etc/rc.d/init.d/blktapctrl:39
 msgid "Starting xen blktapctrl daemon: "
@@ -3778,9 +3680,7 @@ msgstr "Verwendung: $0 {start|stop|restart}"
 
 #: /etc/rc.d/init.d/condor:58
 msgid "Warning: $prog may not have exited, start/restart may fail"
-msgstr ""
-"Warnung: $prog ist möglicherweise noch nicht beendet, Start/Neustart kann "
-"fehlschlagen"
+msgstr "Warnung: $prog ist möglicherweise noch nicht beendet, Start/Neustart kann fehlschlagen"
 
 #: /etc/rc.d/init.d/clement:189 /etc/rc.d/init.d/clement:192
 msgid "clement stop"
@@ -3916,11 +3816,9 @@ msgstr "Verwendung: $0 {start|stop|force-reload|restart|try-restart|status}"
 
 #: /etc/rc.d/init.d/mip6d:108
 msgid ""
-"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-"
-"reload}"
-msgstr ""
-"Verwendung: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-"
-"reload}"
+"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload"
+"|force-reload}"
+msgstr "Verwendung: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
 
 #: /etc/rc.d/init.d/systemtap:61
 msgid "Usage: $prog {start|stop|restart|status|compile|cleanup} [option]"
@@ -3928,11 +3826,9 @@ msgstr "Verwendung: $prog {start|stop|restart|status|compile|cleanup} [option]"
 
 #: /etc/rc.d/init.d/autofs:192
 msgid ""
-"Usage: $0 {start|forcestart|stop|status|restart|forcerestart|reload|"
-"condrestart}"
-msgstr ""
-"Verwendung: $0 {start|forcestart|stop|status|restart|forcerestart|reload|"
-"condrestart}"
+"Usage: $0 "
+"{start|forcestart|stop|status|restart|forcerestart|reload|condrestart}"
+msgstr "Verwendung: $0 {start|forcestart|stop|status|restart|forcerestart|reload|condrestart}"
 
 #: /etc/rc.d/init.d/netfs:90 /etc/rc.d/rc.sysinit:69 /etc/rc.d/rc.sysinit:232
 #: /etc/rc.d/rc.sysinit:432
@@ -4023,9 +3919,7 @@ msgstr "vmpsd beenden: "
 msgid ""
 "Usage: $0 {start|stop|softstop|status|restart|try-restart|reload|force-"
 "reload}"
-msgstr ""
-"Verwendung: $0 {start|stop|softstop|status|restart|try-restart|reload|force-"
-"reload}"
+msgstr "Verwendung: $0 {start|stop|softstop|status|restart|try-restart|reload|force-reload}"
 
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:859
 msgid "Missing parameter 'selection' (arg 2)"
@@ -4035,9 +3929,7 @@ msgstr "Fehlender Parameter 'selection' (arg 2)"
 msgid ""
 "IPv6to4 configuration needs an IPv4 address on related interface or "
 "otherwise specified"
-msgstr ""
-"Die IPv6to4-Konfiguration benötigt eine IPv4-Adresse an der entsprechenden "
-"Schnittstelle oder muss anders festgelegt werden"
+msgstr "Die IPv6to4-Konfiguration benötigt eine IPv4-Adresse an der entsprechenden Schnittstelle oder muss anders festgelegt werden"
 
 #: /etc/rc.d/init.d/apt:39
 msgid "Disabling nightly apt update: "
@@ -4053,11 +3945,9 @@ msgstr "NFS-Dienste starten: "
 
 #: /etc/rc.d/init.d/nsd:106
 msgid ""
-"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|"
-"running|update}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|restart|condrestart|stats|notify|reload|"
-"rebuild|running|update}"
+"Usage: $0 "
+"{start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}"
+msgstr "Verwendung: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}"
 
 #: /etc/rc.d/init.d/xpilot-ng-server:57
 msgid "Stopping Xpilot game server: "
@@ -4077,9 +3967,7 @@ msgstr "unbound beenden: "
 
 #: /etc/rc.d/rc.sysinit:67
 msgid "*** /etc/selinux/config indicates you want to manually fix labeling"
-msgstr ""
-"*** /etc/selinux/config zeigt an, dass sie die Etikettierung manuell "
-"korrigieren möchten"
+msgstr "*** /etc/selinux/config zeigt an, dass sie die Etikettierung manuell korrigieren möchten"
 
 #: /etc/rc.d/init.d/systemtap:489
 msgid "No scripts exist."
@@ -4093,9 +3981,7 @@ msgstr "/proc-Einträge wurden korrigiert"
 msgid ""
 "Usage: $0 {start|stop|status|restart|condrestart|condstop|reload|force-"
 "reload|initdb}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|restart|condrestart|condstop|reload|force-"
-"reload|initdb}"
+msgstr "Verwendung: $0 {start|stop|status|restart|condrestart|condstop|reload|force-reload|initdb}"
 
 #: /etc/rc.d/init.d/rarpd:91
 msgid "Usage: $0 {start|stop|restart|condrestart|reload|status|force-reload}"
@@ -4142,10 +4028,9 @@ msgid "${SERVICE}: unrecognized service"
 msgstr "${SERVICE}: unbekannter Dienst"
 
 #: /etc/rc.d/init.d/squid:176
-msgid "Usage: $0 {start|stop|status|reload|force-reload|restart|try-restart|probe}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|reload|force-reload|restart|try-restart|"
-"probe}"
+msgid ""
+"Usage: $0 {start|stop|status|reload|force-reload|restart|try-restart|probe}"
+msgstr "Verwendung: $0 {start|stop|status|reload|force-reload|restart|try-restart|probe}"
 
 #: /etc/rc.d/init.d/sblim-sfcb:74
 msgid "sfcb is not running, but lock file exists"
@@ -4160,10 +4045,9 @@ msgid "Stopping $type $name: "
 msgstr "$type $name beenden: "
 
 #: /etc/rc.d/init.d/postgresql:101
-msgid "See $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
-msgstr ""
-"Lesen Sie $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist für weitere "
-"Informationen."
+msgid ""
+"See $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
+msgstr "Lesen Sie $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist für weitere Informationen."
 
 #: /etc/rc.d/init.d/netbsd-iscsi:45 /etc/rc.d/init.d/nighthttpd:41
 msgid "Starting $SERVICE: "
@@ -4249,9 +4133,7 @@ msgstr "Daemon zur Überwachung der Festplattentemperatur starten ($prog): "
 
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:1158
 msgid "Given pidfile '$pidfile' doesn't exist, cannot send trigger to radvd"
-msgstr ""
-"Angegebene PID-Datei '$pidfile' existiert nicht, kann trigger nicht an radvd "
-"senden"
+msgstr "Angegebene PID-Datei '$pidfile' existiert nicht, kann trigger nicht an radvd senden"
 
 #: /etc/sysconfig/network-scripts/ifup-ippp:376
 #: /etc/sysconfig/network-scripts/ifup-isdn:376
@@ -4282,9 +4164,7 @@ msgstr "Warten auf reader attach/detach-Ereignisse ..."
 msgid ""
 "Usage: $0 {start|stop|status|reload|restart|condrestart|force-reload|try-"
 "restart}"
-msgstr ""
-"Verwendung: $0 {start|stop|status|reload|restart|condrestart|force-reload|try-"
-"restart}"
+msgstr "Verwendung: $0 {start|stop|status|reload|restart|condrestart|force-reload|try-restart}"
 
 #: /etc/rc.d/init.d/netfs:43
 msgid "Mounting NCP filesystems: "
@@ -4425,11 +4305,9 @@ msgstr "Initiatoren sind noch verbunden"
 
 #: /etc/rc.d/init.d/sec:98
 msgid ""
-"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|"
-"status|dump}"
-msgstr ""
-"Verwendung: $0 {start|stop|restart|condrestart|try-restart|reload|force-"
+"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-"
 "reload|status|dump}"
+msgstr "Verwendung: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status|dump}"
 
 #: /etc/rc.d/init.d/blktapctrl:82 /etc/rc.d/init.d/xenstored:90
 msgid "Usage: $0 {start|stop|status}"
@@ -4577,10 +4455,9 @@ msgid "not reloading ${httpd} due to configuration syntax error"
 msgstr "${httpd} wird wegen Syntaxfehler in der Konfiguration nicht neu geladen"
 
 #: /etc/sysconfig/network-scripts/ifup-ipv6:147
-msgid "Cannot enable IPv6 privacy method '$IPV6_PRIVACY', not supported by kernel"
-msgstr ""
-"Kann IPv6-Datenschutzmethode '$IPV6_PRIVACY' nicht aktivieren, da nicht vom "
-"Kernel unterstützt"
+msgid ""
+"Cannot enable IPv6 privacy method '$IPV6_PRIVACY', not supported by kernel"
+msgstr "Kann IPv6-Datenschutzmethode '$IPV6_PRIVACY' nicht aktivieren, da nicht vom Kernel unterstützt"
 
 #: /etc/rc.d/init.d/spamass-milter:73
 msgid "Shutting down ${desc} (${prog}): "
@@ -4596,11 +4473,9 @@ msgstr "Neuladen nicht implementiert"
 
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:1008
 msgid ""
-"Given IPv6 default gateway '$address' is link-local, but no scope or gateway "
-"device is specified"
-msgstr ""
-"Angegebenes IPv6 Standard-Gateway '$address' ist Link-Lokal, aber kein "
-"Gerätebereich oder Gateway-Gerät ist angegeben"
+"Given IPv6 default gateway '$address' is link-local, but no scope or gateway"
+" device is specified"
+msgstr "Angegebenes IPv6 Standard-Gateway '$address' ist Link-Lokal, aber kein Gerätebereich oder Gateway-Gerät ist angegeben"
 
 #: /etc/rc.d/init.d/chronyd:86
 msgid "Adding dhclient NTP servers to chrony: "
@@ -4622,9 +4497,7 @@ msgstr "Crossfire-Gameserver starten: "
 msgid ""
 "Global IPv6 forwarding is disabled in configuration, but not currently "
 "disabled in kernel"
-msgstr ""
-"Globale IPv6-Weiterleitung ist in der Konfiguration deaktiviert, aber zur "
-"Zeit im Kernel nicht deaktiviert"
+msgstr "Globale IPv6-Weiterleitung ist in der Konfiguration deaktiviert, aber zur Zeit im Kernel nicht deaktiviert"
 
 #: /etc/rc.d/init.d/condor:173
 msgid "$0: error: insufficient privileges"
@@ -4654,10 +4527,7 @@ msgstr "Aktion zum Herunterfahren angefordert, aber SHUTDOWN_TIMEOUT nicht geset
 msgid ""
 "Given IPv6 default gateway '$address' has scope '$device_scope' defined, "
 "given default gateway device '$device' will be not used"
-msgstr ""
-"Gegebenes IPv6 Standard-Gateway '$address' hat den Geräteumfang "
-"'$device_scope' definiert, das angegebene Standard-Gateway-Gerät '$device' "
-"wird nicht verwendet"
+msgstr "Gegebenes IPv6 Standard-Gateway '$address' hat den Geräteumfang '$device_scope' definiert, das angegebene Standard-Gateway-Gerät '$device' wird nicht verwendet"
 
 #: /etc/rc.d/init.d/ksm:61
 msgid "$prog not supported"
@@ -4679,17 +4549,13 @@ msgstr "WINE-Binärformat ist nicht registriert."
 msgid ""
 "Global IPv6 forwarding is enabled in configuration, but not currently "
 "enabled in kernel"
-msgstr ""
-"Globale IPv6-Weiterleitung ist in der Konfiguration aktiviert, aber im "
-"Kernel zur Zeit nicht"
+msgstr "Globale IPv6-Weiterleitung ist in der Konfiguration aktiviert, aber im Kernel zur Zeit nicht"
 
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:140
 msgid ""
 "ERROR: [ipv6_log] Syslog is chosen, but binary 'logger' doesn't exist or "
 "isn't executable"
-msgstr ""
-"FEHLER: [ipv6_log] Syslog wurde ausgewählt, aber die Datei 'logger' "
-"existiert entweder nicht oder ist nicht ausführbar"
+msgstr "FEHLER: [ipv6_log] Syslog wurde ausgewählt, aber die Datei 'logger' existiert entweder nicht oder ist nicht ausführbar"
 
 #: /etc/rc.d/init.d/flumotion:257
 msgid "Usage: $service {start|stop|restart|list|status|clean}"
@@ -4853,9 +4719,9 @@ msgstr "smokeping neu laden: "
 msgid "httpd shutdown"
 msgstr "httpd herunterfahren"
 
-#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/halt:42
-#: /etc/rc.d/init.d/halt:44 /etc/rc.d/init.d/reboot:42
-#: /etc/rc.d/init.d/reboot:44
+#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/functions:536
+#: /etc/rc.d/init.d/halt:42 /etc/rc.d/init.d/halt:44
+#: /etc/rc.d/init.d/reboot:42 /etc/rc.d/init.d/reboot:44
 msgid "$STRING"
 msgstr "$STRING"
 
@@ -4889,11 +4755,9 @@ msgstr "Lade Regelkonfiguration neu …"
 
 #: /etc/rc.d/init.d/cyrus-imapd:154
 msgid ""
-"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|"
-"status|quickstart|quickstop}"
-msgstr ""
-"Verwendung: $0 {start|stop|restart|reload|force-reload|condrestart|try-"
+"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-"
 "restart|status|quickstart|quickstop}"
+msgstr "Verwendung: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status|quickstart|quickstop}"
 
 #: /etc/rc.d/init.d/qemu:31
 msgid "Registering binary handler for qemu applications"
@@ -5046,4 +4910,3 @@ msgstr "$prog beenden: "
 #: /etc/rc.d/init.d/audio-entropyd:34
 msgid "Shutting down Audio Entropy daemon: "
 msgstr "Audio-Entropy-Daemon beenden: "
-