# HG changeset patch # User Aleksej Bobylev # Date 1464283005 -10800 # Node ID 7f188676b59cada96848601efb532deabaafc9d3 # Parent f7dd646afeb96e18574c55851cdd0992f38f1451 /etc/init.d/*: use 'action' in pair with 'status'. 'action' returns translated message, so why not to add full translatable /etc/init.d/* content diff -r f7dd646afeb9 -r 7f188676b59c acpid/stuff/init.d/acpid --- a/acpid/stuff/init.d/acpid Wed May 25 23:07:05 2016 +0200 +++ b/acpid/stuff/init.d/acpid Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=acpid -DESC="ACPI event deamon" +DESC="$(_ 'ACPI event deamon')" DAEMON=/usr/sbin/acpid OPTIONS=$ACPID_OPTIONS PIDFILE=/var/run/acpid.pid @@ -17,37 +17,36 @@ case "$1" in start) if active_pidfile $PIDFILE $NAME ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c ajaxterm/stuff/etc/init.d/ajaxterm --- a/ajaxterm/stuff/etc/init.d/ajaxterm Wed May 25 23:07:05 2016 +0200 +++ b/ajaxterm/stuff/etc/init.d/ajaxterm Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/ajaxterm : Start, stop and restart AjaxTerm server on SliTaz, at +# /etc/init.d/ajaxterm : Start, stop and restart AjaxTerm server on SliTaz, at # boot time or with the command line. # # To start AjaxTerm server at boot time, just put ajaxterm in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=AjaxTerm -DESC="AjaxTerm server" +DESC="$(_ '%s server' AjaxTerm)" DAEMON="/usr/share/ajaxterm/ajaxterm.py" OPTIONS=$AJAXTERM_OPTIONS PIDFILE=/var/run/ajaxterm.pid @@ -19,32 +19,32 @@ case "$1" in start) if active_pidfile $PIDFILE python ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status sleep 2 ;; stop) if ! active_pidfile $PIDFILE python ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status rm -f $PIDFILE sleep 2 ;; restart) if ! active_pidfile $PIDFILE python ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm -f $PIDFILE sleep 2 $DAEMON $OPTIONS @@ -52,9 +52,8 @@ sleep 2 ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c apache/stuff/apache --- a/apache/stuff/apache Wed May 25 23:07:05 2016 +0200 +++ b/apache/stuff/apache Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/apache: Start, stop and restart Apache web server on SliTaz, +# /etc/init.d/apache: Start, stop and restart Apache web server on SliTaz, # at boot time or with the command line. Daemons options are configured # with /etc/daemons.conf # @@ -7,7 +7,7 @@ . /etc/daemons.conf NAME=Apache -DESC="Apache Web Server" +DESC="$(_ 'Apache Web Server')" DAEMON=/usr/bin/apachectl OPTIONS=$APACHE_OPTIONS PIDFILE=/var/run/apache/httpd.pid @@ -15,45 +15,44 @@ case "$1" in start) if active_pidfile $PIDFILE httpd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS -k start + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS -k start status ;; stop) if ! active_pidfile $PIDFILE httpd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS -k stop rm $PIDFILE status ;; reload) if ! active_pidfile $PIDFILE httpd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS -k graceful status ;; restart) if ! active_pidfile $PIDFILE httpd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS -k restart status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|reload|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|reload|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c at/stuff/atd --- a/at/stuff/atd Wed May 25 23:07:05 2016 +0200 +++ b/at/stuff/atd Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# Start, stop and restart a atd deamon on SliTaz, at boot time or +# Start, stop and restart a atd deamon on SliTaz, at boot time or # with the command line. # # To start daemon at boot time, just put the right name in the $RUN_DAEMONS @@ -8,7 +8,7 @@ . /etc/init.d/rc.functions NAME=$(basename $0) -DESC="$NAME deamon" +DESC="$(_ '%s daemon' $NAME)" DAEMON=$(which $NAME) eval $(grep -i ^${NAME}_OPTIONS /etc/daemons.conf | sed 's/.*_OPT/OPT/') PIDFILE=/var/run/$NAME.pid @@ -16,41 +16,40 @@ case "$1" in start) if active_pidfile $PIDFILE $NAME ; then - echo "$NAME is already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS - [ -f $PIDFILE ] || pidof $NAME | awk '{ print $1 }' > $PIDFILE + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS + [ -f $PIDFILE ] || pidof $NAME | awk '{print $1}' > $PIDFILE active_pidfile $PIDFILE $NAME status ;; stop) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS - [ -f $PIDFILE ] || pidof $NAME | awk '{ print $1 }' > $PIDFILE + [ -f $PIDFILE ] || pidof $NAME | awk '{print $1}' > $PIDFILE active_pidfile $PIDFILE $NAME status ;; -*) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + *) + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c autofs/stuff/etc/init.d/autofs --- a/autofs/stuff/etc/init.d/autofs Wed May 25 23:07:05 2016 +0200 +++ b/autofs/stuff/etc/init.d/autofs Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/autofs : Start, stop and restart automounter on SliTaz, at +# /etc/init.d/autofs : Start, stop and restart automounter on SliTaz, at # boot time or with the command line. # # To start automounter at boot time, just put dropbear in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Automount -DESC="Automount server" +DESC="$(_ '%s server' Automount)" DAEMON=/usr/sbin/automount OPTIONS=$AUTOMOUNT_OPTIONS PIDFILE=/var/run/automount.pid @@ -17,39 +17,38 @@ case "$1" in start) if active_pidfile $PIDFILE automount ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME modprobe autofs4 $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE automount ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rmmod autofs4 status ;; restart) if ! active_pidfile $PIDFILE automount ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c backuppc/stuff/etc/init.d/backuppc --- a/backuppc/stuff/etc/init.d/backuppc Wed May 25 23:07:05 2016 +0200 +++ b/backuppc/stuff/etc/init.d/backuppc Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=BackupPC -DESC="backuppc deamon" +DESC="$(_ '%s daemon' backuppc)" DAEMON=/usr/bin/BackupPC OPTIONS=$BACKUPPC_OPTIONS [ -n "$OPTIONS" ] || OPTIONS="-d" @@ -18,45 +18,44 @@ case "$1" in start) if active_pidfile $PIDFILE $NAME ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME su -s /bin/sh -c "$DAEMON $OPTIONS" www - pidof $NAME | awk '{ print $1 }' > $PIDFILE + pidof $NAME | awk '{print $1}' > $PIDFILE status ;; stop) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE sleep 2 su -c "$DAEMON $OPTIONS" www - pidof $NAME | awk '{ print $1 }' > $PIDFILE + pidof $NAME | awk '{print $1}' > $PIDFILE status ;; reload) - kill -1 `cat $PIDFILE` + kill -1 $(cat $PIDFILE) status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart|reload]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c bind/stuff/etc/init.d/named --- a/bind/stuff/etc/init.d/named Wed May 25 23:07:05 2016 +0200 +++ b/bind/stuff/etc/init.d/named Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Named -DESC="Named deamon" +DESC="$(_ '%s daemon' Named)" DAEMON=/usr/sbin/named OPTIONS=$NAMED_OPTIONS PIDFILE=/var/run/named.pid @@ -19,19 +19,19 @@ case "$1" in start) if active_pidfile $PIDFILE named ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE named ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME /usr/sbin/rndc stop status ;; @@ -41,19 +41,18 @@ ;; restart) if ! active_pidfile $PIDFILE named ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME /usr/sbin/rndc stop sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|reload|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart|reload]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c boxbackup-client/stuff/bbackupd --- a/boxbackup-client/stuff/bbackupd Wed May 25 23:07:05 2016 +0200 +++ b/boxbackup-client/stuff/bbackupd Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=BBackupd -DESC="BoxBackup deamon" +DESC="$(_ '%s daemon' BoxBackup)" DAEMON=/usr/bin/bbackupd OPTIONS=$BBSTORED_OPTIONS PIDFILE=/var/run/bbackupd.pid @@ -17,39 +17,38 @@ case "$1" in start) if active_pidfile $PIDFILE bbackupd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS > /dev/null + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS >/dev/null status ;; stop) if ! active_pidfile $PIDFILE bbackupd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` - rm -f $PIDFILE + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + rm -f $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE bbackupd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` - rm -f $PIDFILE + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + rm -f $PIDFILE sleep 2 - $DAEMON $OPTIONS > /dev/null + $DAEMON $OPTIONS >/dev/null status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c boxbackup-server/stuff/bbstored --- a/boxbackup-server/stuff/bbstored Wed May 25 23:07:05 2016 +0200 +++ b/boxbackup-server/stuff/bbstored Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=BBstored -DESC="BoxBackup server deamon" +DESC="$(_ 'BoxBackup server deamon')" DAEMON=/usr/bin/bbstored OPTIONS=$BBSTORED_OPTIONS PIDFILE=/var/run/bbstored.pid @@ -17,39 +17,38 @@ case "$1" in start) if active_pidfile $PIDFILE bbstored ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS > /dev/null + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS >/dev/null status ;; stop) if ! active_pidfile $PIDFILE bbstored ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` - rm -f $PIDFILE + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + rm -f $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE bbstored ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` - rm -f $PIDFILE + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + rm -f $PIDFILE sleep 2 - $DAEMON $OPTIONS > /dev/null + $DAEMON $OPTIONS >/dev/null status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c busybox/receipt --- a/busybox/receipt Wed May 25 23:07:05 2016 +0200 +++ b/busybox/receipt Thu May 26 20:16:45 2016 +0300 @@ -109,7 +109,13 @@ cp $stuff/busybox.conf-ssfs $rootfs/etc/busybox.conf chown -R 0.0 $rootfs/etc chmod 0600 $rootfs/etc/busybox.conf - chmod 4755 $rootfs/bin/busybox ;; + chmod 4755 $rootfs/bin/busybox + + # Compile translations + make -C $stuff/po install + + ;; + esac } diff -r f7dd646afeb9 -r 7f188676b59c busybox/stuff/daemon --- a/busybox/stuff/daemon Wed May 25 23:07:05 2016 +0200 +++ b/busybox/stuff/daemon Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# Start, stop and restart a busybox deamon on SliTaz, at boot time or +# Start, stop and restart a busybox deamon on SliTaz, at boot time or # with the command line. # # To start daemon at boot time, just put the right name in the $RUN_DAEMONS @@ -8,12 +8,13 @@ . /etc/init.d/rc.functions NAME=$(basename $0) -DESC="$NAME deamon" +DESC="$(_ '%s daemon' $NAME)" DAEMON=$(which $NAME) for p in ${PATH//:/ }; do [ -L $p/$NAME ] || continue case "$(readlink $p/$NAME)" in - *busybox) DAEMON=$p/$NAME + *busybox) + DAEMON=$p/$NAME break esac done @@ -24,10 +25,10 @@ { if grep $DAEMON /etc/inetd.conf | grep -q ^\#; then sed -i "s,^#\(.*$DAEMON.*\)$,\1," /etc/inetd.conf - /etc/init.d/inetd stop > /dev/null + /etc/init.d/inetd stop >/dev/null exec /etc/init.d/inetd start else - echo "$NAME is already active." + _ '%s is already active.' $NAME exit 1 fi } @@ -35,11 +36,11 @@ inactive_inetd() { if grep $DAEMON /etc/inetd.conf | grep -q ^\#; then - echo "$NAME is not active." + _ '%s is not active.' $NAME exit 1 else sed -i "s,^.*$DAEMON.*$,#&," /etc/inetd.conf - /etc/init.d/inetd stop > /dev/null + /etc/init.d/inetd stop >/dev/null exec /etc/init.d/inetd start fi } @@ -48,43 +49,42 @@ start) grep -qs $DAEMON /etc/inetd.conf && active_inetd if active_pidfile $PIDFILE $NAME ; then - echo "$NAME is already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS - [ -f $PIDFILE ] || pidof $NAME | awk '{ print $1 }' > $PIDFILE + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS + [ -f $PIDFILE ] || pidof $NAME | awk '{print $1}' > $PIDFILE active_pidfile $PIDFILE $NAME status ;; stop) grep -qs $DAEMON /etc/inetd.conf && inactive_inetd if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) grep -qs $DAEMON /etc/inetd.conf && exit 0 if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS - [ -f $PIDFILE ] || pidof $NAME | awk '{ print $1 }' > $PIDFILE + [ -f $PIDFILE ] || pidof $NAME | awk '{print $1}' > $PIDFILE active_pidfile $PIDFILE $NAME status ;; -*) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + *) + emsg "$(_ 'Usage:') /etc/init.d/$(basename $0) [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c busybox/stuff/po/LINGUAS --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/po/LINGUAS Thu May 26 20:16:45 2016 +0300 @@ -0,0 +1,1 @@ +ru diff -r f7dd646afeb9 -r 7f188676b59c busybox/stuff/po/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/po/Makefile Thu May 26 20:16:45 2016 +0300 @@ -0,0 +1,51 @@ +# Makefile for daemon. +# +prefix ?= /usr +datarootdir ?= $(prefix)/share +localedir ?= $(datarootdir)/locale +DESTDIR ?= +LINGUAS ?= $(shell cat LINGUAS) +POTFILES ?= $(shell cat POTFILES) +VERSION ?= 1.0 + +.PHONY: all pot msgmerge msgfmt + +all: msgfmt + +pot: + xgettext -o daemon.pot -L Shell \ + --package-name=daemon \ + --package-version="$(VERSION)" \ + -kaction -k_ -k_n \ + $(POTFILES) + +msgmerge: + @for l in $(LINGUAS); do \ + if [ -f "$$l.po" ]; then \ + echo -n "Updating $$l po file."; \ + msgmerge -U $$l.po daemon.pot ; \ + fi; \ + done + +msgfmt: + @for l in $(LINGUAS); do \ + if [ -f "$$l.po" ]; then \ + echo -n "Compiling daemon $$l mo file... "; \ + msgfmt -o $$l.mo $$l.po ; \ + echo "done"; \ + fi; \ + done; + +install: msgfmt + @for l in $(LINGUAS); do \ + install -m 0755 -d $(DESTDIR)$(localedir)/$$l/LC_MESSAGES; \ + install -m 0644 $$l.mo \ + $(DESTDIR)$(localedir)/$$l/LC_MESSAGES/daemon.mo; \ + done; + +clean: + rm -f *~ + rm -f *.mo + +help: + @echo "make [ pot | msgmerge | msgfmt | all | install | clean ]" diff -r f7dd646afeb9 -r 7f188676b59c busybox/stuff/po/POTFILES --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/po/POTFILES Thu May 26 20:16:45 2016 +0300 @@ -0,0 +1,86 @@ +../daemon +../../../acpid/stuff/init.d/acpid +../../../ajaxterm/stuff/etc/init.d/ajaxterm +../../../apache/stuff/apache +../../../at/stuff/atd +../../../autofs/stuff/etc/init.d/autofs +../../../backuppc/stuff/etc/init.d/backuppc +../../../bind/stuff/etc/init.d/named +../../../boxbackup-client/stuff/bbackupd +../../../boxbackup-server/stuff/bbstored +../../../cherokee/stuff/cherokee +../../../chillispot/stuff/chilli +../../../c_icap/stuff/c-icapd +../../../clamav/stuff/daemon-clamd +../../../collectd/stuff/collectd +../../../connman/stuff/etc/init.d/connman +../../../cups/stuff/etc/init.d/cupsd +../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd +../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl +../../../dbus/stuff/etc/init.d/dbus +../../../ddclient/stuff/ddclient +../../../dhcp/stuff/dhcpd +../../../dhid/stuff/init.d/dhid +../../../distcc/stuff/distccd +../../../dnsmasq/stuff/etc/init.d/dnsmasq +../../../dovecot/stuff/init.d/dovecot +../../../dropbear/stuff/init.d/dropbear +../../../fail2ban/stuff/etc/init.d/fail2ban +../../../fcron/stuff/fcron +../../../git/stuff/git-daemon +../../../gpm/stuff/etc/init.d/gpm +../../../hal/stuff/etc/init.d/hald +../../../hostapd/stuff/hostapd +../../../knock/stuff/etc/init.d/knock +../../../lighttpd/stuff/etc/init.d/lighttpd +../../../linux64-zram/stuff/compcache +../../../linux-zram/stuff/compcache +../../../lxdm/stuff/init.d/lxdm +../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon +../../../mariadb/stuff/etc/init.d/mysql +../../../motion/stuff/init.d/motion +../../../mpd/stuff/etc/init.d/mpd +../../../mysql/stuff/etc/init.d/mysql +../../../nagios/stuff/nagios +../../../nagios-nrpe/stuff/nrpe +../../../netatalk/stuff/etc/init.d/netatalk +../../../netatalk-pam/stuff/etc/init.d/netatalk +../../../nfs-utils/stuff/etc/init.d/nfsd +../../../nginx/stuff/etc/init.d/nginx +../../../nginx-extras/stuff/etc/init.d/nginx +../../../nscd/stuff/nscd +../../../ntop/stuff/etc/init.d/ntop +../../../ntp/stuff/ntp +../../../ofono/stuff/etc/init.d/ofono +../../../openerp-server/stuff/etc/init.d/openerp-server +../../../openerp-web/stuff/etc/init.d/openerp-web +../../../openldap/stuff/etc/init.d/openldap +../../../openssh/stuff/openssh +../../../open-vm-tools/stuff/vmtoolsd +../../../openvpn/stuff/etc/init.d/openvpn-client +../../../openvpn/stuff/etc/init.d/openvpn-server +../../../partimage/stuff/etc/init.d/partimaged +../../../pcsc-lite/stuff/init.d/pcscd +../../../perdition/stuff/etc/init.d/perdition +../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv +../../../portmap/stuff/init.d/portmap +../../../postfix/stuff/etc/init.d/postfix +../../../postgresql/stuff/etc/init.d/postgresql +../../../postgrey/stuff/etc/init.d/postgrey +../../../privoxy/stuff/daemon-privoxy +../../../pure-ftpd/stuff/pure-ftpd +../../../rsync/stuff/etc/init.d/rsyncd +../../../samba/stuff/etc/init.d/samba +../../../slim/stuff/etc/init.d/slim +../../../smartmontools/stuff/etc/init.d/smartd +../../../squid/stuff/etc/init.d/squid +../../../thttpd/stuff/etc/init.d/thttpd +../../../tinc/stuff/etc/init.d/tinc +../../../tinyproxy/stuff/tinyproxy +../../../transmission-daemon/stuff/transmission-daemon +../../../unfs3/stuff/etc/init.d/unfsd +../../../virtualbox-ose-guestutils/stuff/VBoxService +../../../wicd/stuff/wicd +../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant +../../../x11vnc/stuff/x11vnc +../../../ypserv/stuff/ypserv diff -r f7dd646afeb9 -r 7f188676b59c busybox/stuff/po/daemon.pot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/po/daemon.pot Thu May 26 20:16:45 2016 +0300 @@ -0,0 +1,784 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: daemon 1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-05-26 19:12+0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../daemon:11 ../../../at/stuff/atd:11 +#: ../../../backuppc/stuff/etc/init.d/backuppc:12 +#: ../../../bind/stuff/etc/init.d/named:12 +#: ../../../boxbackup-client/stuff/bbackupd:12 +#: ../../../clamav/stuff/daemon-clamd:12 +#: ../../../cups/stuff/etc/init.d/cupsd:12 ../../../dhcp/stuff/dhcpd:12 +#: ../../../distcc/stuff/distccd:23 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:12 +#: ../../../dovecot/stuff/init.d/dovecot:12 ../../../fcron/stuff/fcron:12 +#: ../../../git/stuff/git-daemon:12 ../../../linux64-zram/stuff/compcache:10 +#: ../../../linux-zram/stuff/compcache:10 ../../../nagios-nrpe/stuff/nrpe:12 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:11 +#: ../../../open-vm-tools/stuff/vmtoolsd:12 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:12 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:12 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:11 +#: ../../../rsync/stuff/etc/init.d/rsyncd:12 +#: ../../../tinc/stuff/etc/init.d/tinc:12 +#: ../../../transmission-daemon/stuff/transmission-daemon:12 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:12 +msgid "%s daemon" +msgstr "" + +#: ../daemon:31 +msgid "%s is already active." +msgstr "" + +#: ../daemon:39 +msgid "%s is not active." +msgstr "" + +#: ../daemon:52 ../../../acpid/stuff/init.d/acpid:20 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:22 +#: ../../../apache/stuff/apache:18 ../../../at/stuff/atd:19 +#: ../../../autofs/stuff/etc/init.d/autofs:20 +#: ../../../backuppc/stuff/etc/init.d/backuppc:21 +#: ../../../bind/stuff/etc/init.d/named:22 +#: ../../../boxbackup-client/stuff/bbackupd:20 +#: ../../../boxbackup-server/stuff/bbstored:20 +#: ../../../cherokee/stuff/cherokee:18 ../../../chillispot/stuff/chilli:21 +#: ../../../c_icap/stuff/c-icapd:21 ../../../clamav/stuff/daemon-clamd:20 +#: ../../../collectd/stuff/collectd:20 +#: ../../../connman/stuff/etc/init.d/connman:21 +#: ../../../cups/stuff/etc/init.d/cupsd:31 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:21 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:21 +#: ../../../dbus/stuff/etc/init.d/dbus:23 ../../../ddclient/stuff/ddclient:19 +#: ../../../dhcp/stuff/dhcpd:20 ../../../dhid/stuff/init.d/dhid:17 +#: ../../../distcc/stuff/distccd:38 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:20 +#: ../../../dovecot/stuff/init.d/dovecot:24 +#: ../../../dropbear/stuff/init.d/dropbear:35 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:19 +#: ../../../fcron/stuff/fcron:20 ../../../git/stuff/git-daemon:20 +#: ../../../gpm/stuff/etc/init.d/gpm:20 ../../../hal/stuff/etc/init.d/hald:18 +#: ../../../hostapd/stuff/hostapd:18 ../../../knock/stuff/etc/init.d/knock:22 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:18 +#: ../../../linux64-zram/stuff/compcache:16 +#: ../../../linux-zram/stuff/compcache:16 ../../../lxdm/stuff/init.d/lxdm:18 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:19 +#: ../../../mariadb/stuff/etc/init.d/mysql:25 +#: ../../../motion/stuff/init.d/motion:16 ../../../mpd/stuff/etc/init.d/mpd:19 +#: ../../../mysql/stuff/etc/init.d/mysql:25 ../../../nagios/stuff/nagios:30 +#: ../../../nagios-nrpe/stuff/nrpe:25 +#: ../../../netatalk/stuff/etc/init.d/netatalk:45 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:45 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:25 +#: ../../../nginx/stuff/etc/init.d/nginx:18 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:18 ../../../nscd/stuff/nscd:23 +#: ../../../ntop/stuff/etc/init.d/ntop:26 ../../../ntp/stuff/ntp:21 +#: ../../../ofono/stuff/etc/init.d/ofono:21 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:33 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:22 +#: ../../../openldap/stuff/etc/init.d/openldap:20 +#: ../../../openssh/stuff/openssh:35 ../../../open-vm-tools/stuff/vmtoolsd:20 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:42 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:42 +#: ../../../partimage/stuff/etc/init.d/partimaged:24 +#: ../../../pcsc-lite/stuff/init.d/pcscd:17 +#: ../../../perdition/stuff/etc/init.d/perdition:25 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:20 +#: ../../../portmap/stuff/init.d/portmap:23 +#: ../../../postfix/stuff/etc/init.d/postfix:20 +#: ../../../postgrey/stuff/etc/init.d/postgrey:21 +#: ../../../privoxy/stuff/daemon-privoxy:22 +#: ../../../pure-ftpd/stuff/pure-ftpd:27 +#: ../../../rsync/stuff/etc/init.d/rsyncd:20 +#: ../../../samba/stuff/etc/init.d/samba:23 +#: ../../../samba/stuff/etc/init.d/samba:30 +#: ../../../slim/stuff/etc/init.d/slim:19 +#: ../../../smartmontools/stuff/etc/init.d/smartd:21 +#: ../../../squid/stuff/etc/init.d/squid:23 +#: ../../../thttpd/stuff/etc/init.d/thttpd:21 +#: ../../../tinc/stuff/etc/init.d/tinc:20 +#: ../../../tinyproxy/stuff/tinyproxy:15 +#: ../../../transmission-daemon/stuff/transmission-daemon:20 +#: ../../../unfs3/stuff/etc/init.d/unfsd:23 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:18 +#: ../../../wicd/stuff/wicd:20 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:20 +#: ../../../x11vnc/stuff/x11vnc:17 ../../../ypserv/stuff/ypserv:20 +msgid "%s is already running." +msgstr "" + +#: ../daemon:55 ../../../acpid/stuff/init.d/acpid:23 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:25 +#: ../../../apache/stuff/apache:21 ../../../at/stuff/atd:22 +#: ../../../autofs/stuff/etc/init.d/autofs:23 +#: ../../../backuppc/stuff/etc/init.d/backuppc:24 +#: ../../../bind/stuff/etc/init.d/named:25 +#: ../../../boxbackup-client/stuff/bbackupd:23 +#: ../../../boxbackup-server/stuff/bbstored:23 +#: ../../../cherokee/stuff/cherokee:21 ../../../chillispot/stuff/chilli:24 +#: ../../../c_icap/stuff/c-icapd:24 ../../../clamav/stuff/daemon-clamd:23 +#: ../../../collectd/stuff/collectd:23 +#: ../../../connman/stuff/etc/init.d/connman:25 +#: ../../../cups/stuff/etc/init.d/cupsd:27 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:66 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:24 +#: ../../../dbus/stuff/etc/init.d/dbus:27 ../../../ddclient/stuff/ddclient:22 +#: ../../../dhcp/stuff/dhcpd:23 ../../../dhid/stuff/init.d/dhid:20 +#: ../../../distcc/stuff/distccd:41 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:23 +#: ../../../dovecot/stuff/init.d/dovecot:27 +#: ../../../dropbear/stuff/init.d/dropbear:38 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:22 +#: ../../../fcron/stuff/fcron:23 ../../../git/stuff/git-daemon:23 +#: ../../../gpm/stuff/etc/init.d/gpm:23 ../../../hal/stuff/etc/init.d/hald:21 +#: ../../../hostapd/stuff/hostapd:21 ../../../knock/stuff/etc/init.d/knock:25 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:21 +#: ../../../linux64-zram/stuff/compcache:24 +#: ../../../linux-zram/stuff/compcache:24 ../../../lxdm/stuff/init.d/lxdm:21 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:22 +#: ../../../mariadb/stuff/etc/init.d/mysql:34 +#: ../../../motion/stuff/init.d/motion:19 ../../../mpd/stuff/etc/init.d/mpd:22 +#: ../../../mysql/stuff/etc/init.d/mysql:34 ../../../nagios/stuff/nagios:33 +#: ../../../nagios-nrpe/stuff/nrpe:28 +#: ../../../netatalk/stuff/etc/init.d/netatalk:48 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:48 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:28 +#: ../../../nginx/stuff/etc/init.d/nginx:21 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:21 ../../../nscd/stuff/nscd:26 +#: ../../../ntop/stuff/etc/init.d/ntop:33 ../../../ntp/stuff/ntp:24 +#: ../../../ofono/stuff/etc/init.d/ofono:24 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:36 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:25 +#: ../../../openldap/stuff/etc/init.d/openldap:23 +#: ../../../openssh/stuff/openssh:38 ../../../open-vm-tools/stuff/vmtoolsd:23 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:45 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:45 +#: ../../../partimage/stuff/etc/init.d/partimaged:29 +#: ../../../pcsc-lite/stuff/init.d/pcscd:20 +#: ../../../perdition/stuff/etc/init.d/perdition:28 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:23 +#: ../../../portmap/stuff/init.d/portmap:27 +#: ../../../postfix/stuff/etc/init.d/postfix:23 +#: ../../../postgresql/stuff/etc/init.d/postgresql:25 +#: ../../../postgrey/stuff/etc/init.d/postgrey:36 +#: ../../../privoxy/stuff/daemon-privoxy:25 +#: ../../../pure-ftpd/stuff/pure-ftpd:30 +#: ../../../rsync/stuff/etc/init.d/rsyncd:23 +#: ../../../samba/stuff/etc/init.d/samba:25 +#: ../../../samba/stuff/etc/init.d/samba:32 +#: ../../../slim/stuff/etc/init.d/slim:22 +#: ../../../smartmontools/stuff/etc/init.d/smartd:24 +#: ../../../squid/stuff/etc/init.d/squid:33 +#: ../../../thttpd/stuff/etc/init.d/thttpd:24 +#: ../../../tinc/stuff/etc/init.d/tinc:23 +#: ../../../tinyproxy/stuff/tinyproxy:18 +#: ../../../transmission-daemon/stuff/transmission-daemon:23 +#: ../../../unfs3/stuff/etc/init.d/unfsd:27 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:21 +#: ../../../wicd/stuff/wicd:23 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:23 +#: ../../../x11vnc/stuff/x11vnc:20 ../../../ypserv/stuff/ypserv:23 +msgid "Starting %s: %s..." +msgstr "" + +#: ../daemon:64 ../daemon:74 ../../../acpid/stuff/init.d/acpid:29 +#: ../../../acpid/stuff/init.d/acpid:38 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:32 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:43 +#: ../../../apache/stuff/apache:27 ../../../apache/stuff/apache:37 +#: ../../../apache/stuff/apache:46 ../../../at/stuff/atd:30 +#: ../../../at/stuff/atd:39 ../../../autofs/stuff/etc/init.d/autofs:30 +#: ../../../autofs/stuff/etc/init.d/autofs:40 +#: ../../../backuppc/stuff/etc/init.d/backuppc:31 +#: ../../../backuppc/stuff/etc/init.d/backuppc:41 +#: ../../../bind/stuff/etc/init.d/named:31 +#: ../../../bind/stuff/etc/init.d/named:44 +#: ../../../boxbackup-client/stuff/bbackupd:29 +#: ../../../boxbackup-client/stuff/bbackupd:39 +#: ../../../boxbackup-server/stuff/bbstored:29 +#: ../../../boxbackup-server/stuff/bbstored:39 +#: ../../../cherokee/stuff/cherokee:27 ../../../cherokee/stuff/cherokee:36 +#: ../../../chillispot/stuff/chilli:30 ../../../chillispot/stuff/chilli:39 +#: ../../../c_icap/stuff/c-icapd:30 ../../../c_icap/stuff/c-icapd:39 +#: ../../../clamav/stuff/daemon-clamd:29 ../../../clamav/stuff/daemon-clamd:39 +#: ../../../collectd/stuff/collectd:29 ../../../collectd/stuff/collectd:38 +#: ../../../connman/stuff/etc/init.d/connman:31 +#: ../../../connman/stuff/etc/init.d/connman:41 +#: ../../../connman/stuff/etc/init.d/connman:55 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:73 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:83 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:30 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:39 +#: ../../../dbus/stuff/etc/init.d/dbus:33 +#: ../../../dbus/stuff/etc/init.d/dbus:43 ../../../ddclient/stuff/ddclient:28 +#: ../../../ddclient/stuff/ddclient:38 ../../../dhcp/stuff/dhcpd:29 +#: ../../../dhcp/stuff/dhcpd:38 ../../../dhid/stuff/init.d/dhid:26 +#: ../../../dhid/stuff/init.d/dhid:36 ../../../distcc/stuff/distccd:47 +#: ../../../distcc/stuff/distccd:56 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:29 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:39 +#: ../../../dovecot/stuff/init.d/dovecot:33 +#: ../../../dovecot/stuff/init.d/dovecot:42 +#: ../../../dropbear/stuff/init.d/dropbear:44 +#: ../../../dropbear/stuff/init.d/dropbear:53 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:35 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:44 +#: ../../../fcron/stuff/fcron:29 ../../../fcron/stuff/fcron:38 +#: ../../../git/stuff/git-daemon:29 ../../../git/stuff/git-daemon:38 +#: ../../../gpm/stuff/etc/init.d/gpm:29 ../../../gpm/stuff/etc/init.d/gpm:38 +#: ../../../hal/stuff/etc/init.d/hald:27 ../../../hal/stuff/etc/init.d/hald:36 +#: ../../../hostapd/stuff/hostapd:27 ../../../hostapd/stuff/hostapd:36 +#: ../../../knock/stuff/etc/init.d/knock:31 +#: ../../../knock/stuff/etc/init.d/knock:40 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:27 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:37 +#: ../../../linux64-zram/stuff/compcache:30 +#: ../../../linux-zram/stuff/compcache:30 ../../../lxdm/stuff/init.d/lxdm:26 +#: ../../../lxdm/stuff/init.d/lxdm:35 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:29 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:39 +#: ../../../mariadb/stuff/etc/init.d/mysql:47 +#: ../../../mariadb/stuff/etc/init.d/mysql:57 +#: ../../../motion/stuff/init.d/motion:26 ../../../mpd/stuff/etc/init.d/mpd:29 +#: ../../../mpd/stuff/etc/init.d/mpd:38 +#: ../../../mysql/stuff/etc/init.d/mysql:47 +#: ../../../mysql/stuff/etc/init.d/mysql:57 ../../../nagios/stuff/nagios:40 +#: ../../../nagios/stuff/nagios:49 ../../../nagios-nrpe/stuff/nrpe:34 +#: ../../../nagios-nrpe/stuff/nrpe:43 +#: ../../../netatalk/stuff/etc/init.d/netatalk:58 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:58 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:45 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:60 +#: ../../../nginx/stuff/etc/init.d/nginx:27 +#: ../../../nginx/stuff/etc/init.d/nginx:37 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:27 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:37 ../../../nscd/stuff/nscd:33 +#: ../../../nscd/stuff/nscd:43 ../../../ntop/stuff/etc/init.d/ntop:39 +#: ../../../ntop/stuff/etc/init.d/ntop:48 ../../../ntp/stuff/ntp:31 +#: ../../../ntp/stuff/ntp:41 ../../../ofono/stuff/etc/init.d/ofono:31 +#: ../../../ofono/stuff/etc/init.d/ofono:41 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:47 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:57 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:31 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:40 +#: ../../../openldap/stuff/etc/init.d/openldap:35 +#: ../../../openldap/stuff/etc/init.d/openldap:44 +#: ../../../openssh/stuff/openssh:44 ../../../openssh/stuff/openssh:53 +#: ../../../open-vm-tools/stuff/vmtoolsd:34 +#: ../../../open-vm-tools/stuff/vmtoolsd:43 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:51 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:61 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:51 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:61 +#: ../../../partimage/stuff/etc/init.d/partimaged:40 +#: ../../../pcsc-lite/stuff/init.d/pcscd:26 +#: ../../../perdition/stuff/etc/init.d/perdition:38 +#: ../../../perdition/stuff/etc/init.d/perdition:50 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:31 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:40 +#: ../../../portmap/stuff/init.d/portmap:46 +#: ../../../postfix/stuff/etc/init.d/postfix:29 +#: ../../../postfix/stuff/etc/init.d/postfix:38 +#: ../../../postfix/stuff/etc/init.d/postfix:49 +#: ../../../postgrey/stuff/etc/init.d/postgrey:42 +#: ../../../postgrey/stuff/etc/init.d/postgrey:51 +#: ../../../privoxy/stuff/daemon-privoxy:31 +#: ../../../privoxy/stuff/daemon-privoxy:41 +#: ../../../pure-ftpd/stuff/pure-ftpd:36 ../../../pure-ftpd/stuff/pure-ftpd:45 +#: ../../../rsync/stuff/etc/init.d/rsyncd:29 +#: ../../../rsync/stuff/etc/init.d/rsyncd:39 +#: ../../../samba/stuff/etc/init.d/samba:39 +#: ../../../samba/stuff/etc/init.d/samba:46 +#: ../../../samba/stuff/etc/init.d/samba:59 +#: ../../../slim/stuff/etc/init.d/slim:28 +#: ../../../slim/stuff/etc/init.d/slim:38 +#: ../../../smartmontools/stuff/etc/init.d/smartd:30 +#: ../../../smartmontools/stuff/etc/init.d/smartd:39 +#: ../../../squid/stuff/etc/init.d/squid:40 +#: ../../../squid/stuff/etc/init.d/squid:51 +#: ../../../squid/stuff/etc/init.d/squid:60 +#: ../../../thttpd/stuff/etc/init.d/thttpd:30 +#: ../../../thttpd/stuff/etc/init.d/thttpd:39 +#: ../../../tinc/stuff/etc/init.d/tinc:29 +#: ../../../tinc/stuff/etc/init.d/tinc:38 +#: ../../../tinyproxy/stuff/tinyproxy:24 ../../../tinyproxy/stuff/tinyproxy:34 +#: ../../../transmission-daemon/stuff/transmission-daemon:29 +#: ../../../transmission-daemon/stuff/transmission-daemon:39 +#: ../../../unfs3/stuff/etc/init.d/unfsd:38 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:27 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:36 +#: ../../../wicd/stuff/wicd:29 ../../../wicd/stuff/wicd:39 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:29 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:38 +#: ../../../x11vnc/stuff/x11vnc:26 ../../../x11vnc/stuff/x11vnc:35 +#: ../../../ypserv/stuff/ypserv:30 ../../../ypserv/stuff/ypserv:39 +msgid "%s is not running." +msgstr "" + +#: ../daemon:67 ../../../acpid/stuff/init.d/acpid:32 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:35 +#: ../../../apache/stuff/apache:30 ../../../apache/stuff/apache:40 +#: ../../../at/stuff/atd:33 ../../../autofs/stuff/etc/init.d/autofs:33 +#: ../../../backuppc/stuff/etc/init.d/backuppc:34 +#: ../../../bind/stuff/etc/init.d/named:34 +#: ../../../boxbackup-client/stuff/bbackupd:32 +#: ../../../boxbackup-server/stuff/bbstored:32 +#: ../../../cherokee/stuff/cherokee:30 ../../../chillispot/stuff/chilli:33 +#: ../../../c_icap/stuff/c-icapd:33 ../../../clamav/stuff/daemon-clamd:32 +#: ../../../collectd/stuff/collectd:32 +#: ../../../connman/stuff/etc/init.d/connman:34 +#: ../../../cups/stuff/etc/init.d/cupsd:19 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:76 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:33 +#: ../../../dbus/stuff/etc/init.d/dbus:36 ../../../ddclient/stuff/ddclient:31 +#: ../../../dhcp/stuff/dhcpd:32 ../../../dhid/stuff/init.d/dhid:29 +#: ../../../distcc/stuff/distccd:50 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:32 +#: ../../../dovecot/stuff/init.d/dovecot:36 +#: ../../../dropbear/stuff/init.d/dropbear:47 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:28 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:38 +#: ../../../fcron/stuff/fcron:32 ../../../git/stuff/git-daemon:32 +#: ../../../gpm/stuff/etc/init.d/gpm:32 ../../../hal/stuff/etc/init.d/hald:30 +#: ../../../hostapd/stuff/hostapd:30 ../../../knock/stuff/etc/init.d/knock:34 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:30 +#: ../../../linux64-zram/stuff/compcache:33 +#: ../../../linux-zram/stuff/compcache:33 ../../../lxdm/stuff/init.d/lxdm:29 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:32 +#: ../../../mariadb/stuff/etc/init.d/mysql:50 +#: ../../../motion/stuff/init.d/motion:29 ../../../mpd/stuff/etc/init.d/mpd:32 +#: ../../../mysql/stuff/etc/init.d/mysql:50 ../../../nagios-nrpe/stuff/nrpe:37 +#: ../../../netatalk/stuff/etc/init.d/netatalk:61 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:61 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:48 +#: ../../../nginx/stuff/etc/init.d/nginx:30 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:30 ../../../nscd/stuff/nscd:36 +#: ../../../ntop/stuff/etc/init.d/ntop:42 ../../../ntp/stuff/ntp:34 +#: ../../../ofono/stuff/etc/init.d/ofono:34 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:50 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:34 +#: ../../../openldap/stuff/etc/init.d/openldap:38 +#: ../../../openssh/stuff/openssh:47 ../../../open-vm-tools/stuff/vmtoolsd:37 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:54 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:54 +#: ../../../partimage/stuff/etc/init.d/partimaged:43 +#: ../../../pcsc-lite/stuff/init.d/pcscd:29 +#: ../../../perdition/stuff/etc/init.d/perdition:41 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:34 +#: ../../../portmap/stuff/init.d/portmap:49 +#: ../../../postfix/stuff/etc/init.d/postfix:32 +#: ../../../postgresql/stuff/etc/init.d/postgresql:39 +#: ../../../postgrey/stuff/etc/init.d/postgrey:45 +#: ../../../privoxy/stuff/daemon-privoxy:34 +#: ../../../pure-ftpd/stuff/pure-ftpd:39 +#: ../../../rsync/stuff/etc/init.d/rsyncd:32 +#: ../../../samba/stuff/etc/init.d/samba:41 +#: ../../../samba/stuff/etc/init.d/samba:48 +#: ../../../slim/stuff/etc/init.d/slim:31 +#: ../../../smartmontools/stuff/etc/init.d/smartd:33 +#: ../../../squid/stuff/etc/init.d/squid:43 +#: ../../../thttpd/stuff/etc/init.d/thttpd:33 +#: ../../../tinc/stuff/etc/init.d/tinc:32 +#: ../../../tinyproxy/stuff/tinyproxy:27 +#: ../../../transmission-daemon/stuff/transmission-daemon:32 +#: ../../../unfs3/stuff/etc/init.d/unfsd:41 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:30 +#: ../../../wicd/stuff/wicd:32 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:32 +#: ../../../x11vnc/stuff/x11vnc:29 ../../../ypserv/stuff/ypserv:33 +msgid "Stopping %s: %s..." +msgstr "" + +#: ../daemon:77 ../../../acpid/stuff/init.d/acpid:41 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:46 +#: ../../../apache/stuff/apache:49 ../../../at/stuff/atd:42 +#: ../../../autofs/stuff/etc/init.d/autofs:43 +#: ../../../backuppc/stuff/etc/init.d/backuppc:44 +#: ../../../bind/stuff/etc/init.d/named:47 +#: ../../../boxbackup-client/stuff/bbackupd:42 +#: ../../../boxbackup-server/stuff/bbstored:42 +#: ../../../cherokee/stuff/cherokee:39 ../../../chillispot/stuff/chilli:42 +#: ../../../c_icap/stuff/c-icapd:42 ../../../clamav/stuff/daemon-clamd:42 +#: ../../../collectd/stuff/collectd:41 +#: ../../../connman/stuff/etc/init.d/connman:44 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:86 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:42 +#: ../../../dbus/stuff/etc/init.d/dbus:47 ../../../ddclient/stuff/ddclient:41 +#: ../../../dhcp/stuff/dhcpd:41 ../../../dhid/stuff/init.d/dhid:39 +#: ../../../distcc/stuff/distccd:59 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:42 +#: ../../../dovecot/stuff/init.d/dovecot:45 +#: ../../../dropbear/stuff/init.d/dropbear:56 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:47 +#: ../../../fcron/stuff/fcron:41 ../../../git/stuff/git-daemon:41 +#: ../../../gpm/stuff/etc/init.d/gpm:41 ../../../hal/stuff/etc/init.d/hald:39 +#: ../../../hostapd/stuff/hostapd:39 ../../../knock/stuff/etc/init.d/knock:43 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:40 +#: ../../../lxdm/stuff/init.d/lxdm:38 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:42 +#: ../../../mariadb/stuff/etc/init.d/mysql:60 +#: ../../../motion/stuff/init.d/motion:39 ../../../mpd/stuff/etc/init.d/mpd:41 +#: ../../../mysql/stuff/etc/init.d/mysql:60 ../../../nagios/stuff/nagios:52 +#: ../../../nagios-nrpe/stuff/nrpe:46 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:63 +#: ../../../nginx/stuff/etc/init.d/nginx:40 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:40 ../../../nscd/stuff/nscd:46 +#: ../../../ntop/stuff/etc/init.d/ntop:51 ../../../ntp/stuff/ntp:44 +#: ../../../ofono/stuff/etc/init.d/ofono:44 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:60 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:43 +#: ../../../openldap/stuff/etc/init.d/openldap:47 +#: ../../../openssh/stuff/openssh:56 ../../../open-vm-tools/stuff/vmtoolsd:46 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:64 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:64 +#: ../../../perdition/stuff/etc/init.d/perdition:53 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:43 +#: ../../../postfix/stuff/etc/init.d/postfix:41 +#: ../../../postgresql/stuff/etc/init.d/postgresql:44 +#: ../../../postgrey/stuff/etc/init.d/postgrey:54 +#: ../../../privoxy/stuff/daemon-privoxy:47 +#: ../../../pure-ftpd/stuff/pure-ftpd:48 +#: ../../../rsync/stuff/etc/init.d/rsyncd:42 +#: ../../../slim/stuff/etc/init.d/slim:41 +#: ../../../smartmontools/stuff/etc/init.d/smartd:42 +#: ../../../squid/stuff/etc/init.d/squid:63 +#: ../../../thttpd/stuff/etc/init.d/thttpd:42 +#: ../../../tinc/stuff/etc/init.d/tinc:41 +#: ../../../tinyproxy/stuff/tinyproxy:37 +#: ../../../transmission-daemon/stuff/transmission-daemon:42 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:39 +#: ../../../wicd/stuff/wicd:42 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:41 +#: ../../../x11vnc/stuff/x11vnc:38 ../../../ypserv/stuff/ypserv:42 +msgid "Restarting %s: %s..." +msgstr "" + +#: ../daemon:86 ../../../acpid/stuff/init.d/acpid:48 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:55 +#: ../../../apache/stuff/apache:54 ../../../at/stuff/atd:51 +#: ../../../autofs/stuff/etc/init.d/autofs:50 +#: ../../../backuppc/stuff/etc/init.d/backuppc:57 +#: ../../../bind/stuff/etc/init.d/named:54 +#: ../../../boxbackup-client/stuff/bbackupd:50 +#: ../../../boxbackup-server/stuff/bbstored:50 +#: ../../../cherokee/stuff/cherokee:47 ../../../chillispot/stuff/chilli:49 +#: ../../../c_icap/stuff/c-icapd:51 ../../../clamav/stuff/daemon-clamd:50 +#: ../../../collectd/stuff/collectd:48 +#: ../../../connman/stuff/etc/init.d/connman:59 +#: ../../../cups/stuff/etc/init.d/cupsd:35 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:98 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:49 +#: ../../../dbus/stuff/etc/init.d/dbus:55 ../../../ddclient/stuff/ddclient:49 +#: ../../../dhcp/stuff/dhcpd:48 ../../../dhid/stuff/init.d/dhid:47 +#: ../../../distcc/stuff/distccd:64 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:50 +#: ../../../dovecot/stuff/init.d/dovecot:52 +#: ../../../dropbear/stuff/init.d/dropbear:63 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:53 +#: ../../../fcron/stuff/fcron:48 ../../../git/stuff/git-daemon:48 +#: ../../../gpm/stuff/etc/init.d/gpm:48 ../../../hal/stuff/etc/init.d/hald:46 +#: ../../../hostapd/stuff/hostapd:46 ../../../knock/stuff/etc/init.d/knock:50 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:48 +#: ../../../linux64-zram/stuff/compcache:41 +#: ../../../linux-zram/stuff/compcache:41 ../../../lxdm/stuff/init.d/lxdm:45 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:51 +#: ../../../mariadb/stuff/etc/init.d/mysql:68 +#: ../../../motion/stuff/init.d/motion:47 ../../../mpd/stuff/etc/init.d/mpd:48 +#: ../../../mysql/stuff/etc/init.d/mysql:68 ../../../nagios/stuff/nagios:62 +#: ../../../nagios-nrpe/stuff/nrpe:53 +#: ../../../netatalk/stuff/etc/init.d/netatalk:74 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:74 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:77 +#: ../../../nginx/stuff/etc/init.d/nginx:48 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:48 ../../../nscd/stuff/nscd:54 +#: ../../../ntop/stuff/etc/init.d/ntop:58 ../../../ntp/stuff/ntp:51 +#: ../../../ofono/stuff/etc/init.d/ofono:52 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:68 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:50 +#: ../../../openldap/stuff/etc/init.d/openldap:54 +#: ../../../openssh/stuff/openssh:63 ../../../open-vm-tools/stuff/vmtoolsd:53 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:72 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:72 +#: ../../../partimage/stuff/etc/init.d/partimaged:53 +#: ../../../pcsc-lite/stuff/init.d/pcscd:38 +#: ../../../perdition/stuff/etc/init.d/perdition:70 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:52 +#: ../../../portmap/stuff/init.d/portmap:65 +#: ../../../postfix/stuff/etc/init.d/postfix:58 +#: ../../../postgresql/stuff/etc/init.d/postgresql:54 +#: ../../../postgrey/stuff/etc/init.d/postgrey:61 +#: ../../../privoxy/stuff/daemon-privoxy:52 +#: ../../../pure-ftpd/stuff/pure-ftpd:55 +#: ../../../rsync/stuff/etc/init.d/rsyncd:50 +#: ../../../samba/stuff/etc/init.d/samba:67 +#: ../../../slim/stuff/etc/init.d/slim:49 +#: ../../../smartmontools/stuff/etc/init.d/smartd:49 +#: ../../../squid/stuff/etc/init.d/squid:69 +#: ../../../thttpd/stuff/etc/init.d/thttpd:49 +#: ../../../tinc/stuff/etc/init.d/tinc:48 +#: ../../../tinyproxy/stuff/tinyproxy:45 +#: ../../../transmission-daemon/stuff/transmission-daemon:50 +#: ../../../unfs3/stuff/etc/init.d/unfsd:51 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:46 +#: ../../../wicd/stuff/wicd:50 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:48 +#: ../../../x11vnc/stuff/x11vnc:45 ../../../ypserv/stuff/ypserv:49 +msgid "Usage:" +msgstr "" + +#: ../../../acpid/stuff/init.d/acpid:12 +msgid "ACPI event deamon" +msgstr "" + +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:12 +#: ../../../autofs/stuff/etc/init.d/autofs:12 +#: ../../../chillispot/stuff/chilli:12 ../../../c_icap/stuff/c-icapd:12 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:12 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:12 +#: ../../../dropbear/stuff/init.d/dropbear:12 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:10 +#: ../../../gpm/stuff/etc/init.d/gpm:12 +#: ../../../knock/stuff/etc/init.d/knock:12 +#: ../../../mariadb/stuff/etc/init.d/mysql:12 +#: ../../../mysql/stuff/etc/init.d/mysql:12 +#: ../../../ntop/stuff/etc/init.d/ntop:12 ../../../ntp/stuff/ntp:12 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:12 +#: ../../../openldap/stuff/etc/init.d/openldap:12 +#: ../../../openssh/stuff/openssh:12 +#: ../../../partimage/stuff/etc/init.d/partimaged:12 +#: ../../../postfix/stuff/etc/init.d/postfix:12 +#: ../../../postgresql/stuff/etc/init.d/postgresql:12 +#: ../../../samba/stuff/etc/init.d/samba:12 +#: ../../../thttpd/stuff/etc/init.d/thttpd:12 +#: ../../../unfs3/stuff/etc/init.d/unfsd:12 ../../../x11vnc/stuff/x11vnc:10 +#: ../../../ypserv/stuff/ypserv:12 +msgid "%s server" +msgstr "" + +#: ../../../apache/stuff/apache:10 +msgid "Apache Web Server" +msgstr "" + +#: ../../../boxbackup-server/stuff/bbstored:12 +msgid "BoxBackup server deamon" +msgstr "" + +#: ../../../cherokee/stuff/cherokee:10 +msgid "Cherokee Web Server" +msgstr "" + +#: ../../../collectd/stuff/collectd:12 +msgid "Statistics collection daemon" +msgstr "" + +#: ../../../connman/stuff/etc/init.d/connman:13 +msgid "Connection Manager" +msgstr "" + +#: ../../../connman/stuff/etc/init.d/connman:53 +msgid "%s is running." +msgstr "" + +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:26 +msgid "Initialize %s..." +msgstr "" + +#: ../../../dbus/stuff/etc/init.d/dbus:10 +msgid "message bus daemon" +msgstr "" + +#: ../../../ddclient/stuff/ddclient:11 +msgid "dynamic IP manager" +msgstr "" + +#: ../../../dhid/stuff/init.d/dhid:9 +msgid "DHIS client daemon" +msgstr "" + +#: ../../../dropbear/stuff/init.d/dropbear:21 +#: ../../../dropbear/stuff/init.d/dropbear:28 +msgid "Generating Dropbear %s key..." +msgstr "" + +#: ../../../hal/stuff/etc/init.d/hald:10 +msgid "Hardware Abstraction Layer" +msgstr "" + +#: ../../../hostapd/stuff/hostapd:10 +msgid "daemon for wireless software access points" +msgstr "" + +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:10 +#: ../../../nginx/stuff/etc/init.d/nginx:10 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:10 +msgid "web server" +msgstr "" + +#: ../../../linux64-zram/stuff/compcache:19 +#: ../../../linux-zram/stuff/compcache:19 +msgid "Loading module..." +msgstr "" + +#: ../../../linux64-zram/stuff/compcache:36 +#: ../../../linux-zram/stuff/compcache:36 +msgid "Unloading module..." +msgstr "" + +#: ../../../lxdm/stuff/init.d/lxdm:11 +msgid "LXDE login manager" +msgstr "" + +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:12 +msgid "Network daemon" +msgstr "" + +#: ../../../mariadb/stuff/etc/init.d/mysql:29 +#: ../../../mysql/stuff/etc/init.d/mysql:29 +msgid "Initializing %s..." +msgstr "" + +#: ../../../mariadb/stuff/etc/init.d/mysql:40 +#: ../../../mysql/stuff/etc/init.d/mysql:40 +#: ../../../openldap/stuff/etc/init.d/openldap:28 +#: ../../../postgresql/stuff/etc/init.d/postgresql:31 +msgid "Running %s..." +msgstr "" + +#: ../../../motion/stuff/init.d/motion:9 +msgid "Video detection daemon" +msgstr "" + +#: ../../../mpd/stuff/etc/init.d/mpd:11 +msgid "Music Player Daemon" +msgstr "" + +#: ../../../nagios/stuff/nagios:12 +msgid "Network Monitoring Server" +msgstr "" + +#: ../../../netatalk/stuff/etc/init.d/netatalk:11 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:11 +msgid "Netatalk daemons" +msgstr "" + +#: ../../../nscd/stuff/nscd:12 +msgid "name-server caching daemon" +msgstr "" + +#: ../../../ofono/stuff/etc/init.d/ofono:13 +msgid "Mobile telephony Manager" +msgstr "" + +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:12 +msgid "openerp-web server" +msgstr "" + +#: ../../../openssh/stuff/openssh:23 ../../../openssh/stuff/openssh:27 +#: ../../../openssh/stuff/openssh:31 +msgid "Generating OpenSSH %s key... " +msgstr "" + +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:20 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:20 +msgid "TUN/TAP support is not available in this Kernel" +msgstr "" + +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:25 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:25 +msgid "Detected broken %s symlink, fixing..." +msgstr "" + +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:38 +msgid "Missing OpenVPN client config." +msgstr "" + +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:38 +msgid "Missing OpenVPN server config." +msgstr "" + +#: ../../../pcsc-lite/stuff/init.d/pcscd:10 +msgid "PC/SC smart card daemon" +msgstr "" + +#: ../../../perdition/stuff/etc/init.d/perdition:13 +msgid "IMAP/POP3 proxy server" +msgstr "" + +#: ../../../portmap/stuff/init.d/portmap:12 +msgid "RPC portmapper" +msgstr "" + +#: ../../../portmap/stuff/init.d/portmap:37 +msgid "Restoring old RPC service information..." +msgstr "" + +#: ../../../postgresql/stuff/etc/init.d/postgresql:21 +msgid "Initializing PostgreSQL server database" +msgstr "" + +#: ../../../postgresql/stuff/etc/init.d/postgresql:49 +#: ../../../samba/stuff/etc/init.d/samba:62 +msgid "Reloading %s: %s..." +msgstr "" + +#: ../../../postgrey/stuff/etc/init.d/postgrey:12 +msgid "Postfix Greylisting Policy Server" +msgstr "" + +#: ../../../postgrey/stuff/etc/init.d/postgrey:25 +msgid "Updating %s" +msgstr "" + +#: ../../../privoxy/stuff/daemon-privoxy:12 +msgid "Web proxy daemon" +msgstr "" + +#: ../../../pure-ftpd/stuff/pure-ftpd:12 +msgid "pure-FTPd Server Daemon" +msgstr "" + +#: ../../../slim/stuff/etc/init.d/slim:11 +msgid "Simple login manager" +msgstr "" + +#: ../../../smartmontools/stuff/etc/init.d/smartd:12 +msgid "Smartmontools (SMART) Daemon" +msgstr "" + +#: ../../../squid/stuff/etc/init.d/squid:12 +msgid "Squid proxy server" +msgstr "" + +#: ../../../squid/stuff/etc/init.d/squid:29 +msgid "Creating squid spool directory structure" +msgstr "" + +#: ../../../squid/stuff/etc/init.d/squid:54 +msgid "Reloading %s configuration..." +msgstr "" + +#: ../../../tinyproxy/stuff/tinyproxy:7 +msgid "Tiny Proxy" +msgstr "" + +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:10 +msgid "VirtualBox Guest Service" +msgstr "" + +#: ../../../wicd/stuff/wicd:12 +msgid "Network connection manager" +msgstr "" diff -r f7dd646afeb9 -r 7f188676b59c busybox/stuff/po/ru.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/po/ru.po Thu May 26 20:16:45 2016 +0300 @@ -0,0 +1,795 @@ +# Russian translations for /etc/init.d/* daemons +# Copyright (C) 2016 SliTaz +# This file is distributed under the same license as the PACKAGE package. +# Aleksej Bobylev , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: daemon\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-05-26 18:37+0300\n" +"PO-Revision-Date: 2016-05-26 19:11+0300\n" +"Last-Translator: Aleksej Bobylev \n" +"Language-Team: \n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.6\n" +"X-Poedit-SourceCharset: UTF-8\n" + +#: ../daemon:11 ../../../at/stuff/atd:11 +#: ../../../backuppc/stuff/etc/init.d/backuppc:12 +#: ../../../bind/stuff/etc/init.d/named:12 +#: ../../../boxbackup-client/stuff/bbackupd:12 +#: ../../../clamav/stuff/daemon-clamd:12 +#: ../../../cups/stuff/etc/init.d/cupsd:12 ../../../dhcp/stuff/dhcpd:12 +#: ../../../distcc/stuff/distccd:23 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:12 +#: ../../../dovecot/stuff/init.d/dovecot:12 ../../../fcron/stuff/fcron:12 +#: ../../../git/stuff/git-daemon:12 ../../../linux64-zram/stuff/compcache:10 +#: ../../../linux-zram/stuff/compcache:10 ../../../nagios-nrpe/stuff/nrpe:12 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:11 +#: ../../../open-vm-tools/stuff/vmtoolsd:12 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:12 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:12 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:11 +#: ../../../rsync/stuff/etc/init.d/rsyncd:12 +#: ../../../tinc/stuff/etc/init.d/tinc:12 +#: ../../../transmission-daemon/stuff/transmission-daemon:12 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:12 +msgid "%s daemon" +msgstr "служба %s" + +#: ../daemon:31 +msgid "%s is already active." +msgstr "%s уже активен." + +#: ../daemon:39 +msgid "%s is not active." +msgstr "%s неактивен." + +#: ../daemon:52 ../../../acpid/stuff/init.d/acpid:20 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:22 +#: ../../../apache/stuff/apache:18 ../../../at/stuff/atd:19 +#: ../../../autofs/stuff/etc/init.d/autofs:20 +#: ../../../backuppc/stuff/etc/init.d/backuppc:21 +#: ../../../bind/stuff/etc/init.d/named:22 +#: ../../../boxbackup-client/stuff/bbackupd:20 +#: ../../../boxbackup-server/stuff/bbstored:20 +#: ../../../cherokee/stuff/cherokee:18 ../../../chillispot/stuff/chilli:21 +#: ../../../c_icap/stuff/c-icapd:21 ../../../clamav/stuff/daemon-clamd:20 +#: ../../../collectd/stuff/collectd:20 +#: ../../../connman/stuff/etc/init.d/connman:21 +#: ../../../cups/stuff/etc/init.d/cupsd:31 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:21 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:21 +#: ../../../dbus/stuff/etc/init.d/dbus:23 ../../../ddclient/stuff/ddclient:19 +#: ../../../dhcp/stuff/dhcpd:20 ../../../dhid/stuff/init.d/dhid:17 +#: ../../../distcc/stuff/distccd:38 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:20 +#: ../../../dovecot/stuff/init.d/dovecot:24 +#: ../../../dropbear/stuff/init.d/dropbear:35 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:19 +#: ../../../fcron/stuff/fcron:20 ../../../git/stuff/git-daemon:20 +#: ../../../gpm/stuff/etc/init.d/gpm:20 ../../../hal/stuff/etc/init.d/hald:18 +#: ../../../hostapd/stuff/hostapd:18 ../../../knock/stuff/etc/init.d/knock:22 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:18 +#: ../../../linux64-zram/stuff/compcache:16 +#: ../../../linux-zram/stuff/compcache:16 ../../../lxdm/stuff/init.d/lxdm:18 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:19 +#: ../../../mariadb/stuff/etc/init.d/mysql:25 +#: ../../../motion/stuff/init.d/motion:16 +#: ../../../mpd/stuff/etc/init.d/mpd:19 +#: ../../../mysql/stuff/etc/init.d/mysql:25 ../../../nagios/stuff/nagios:30 +#: ../../../nagios-nrpe/stuff/nrpe:25 +#: ../../../netatalk/stuff/etc/init.d/netatalk:45 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:45 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:25 +#: ../../../nginx/stuff/etc/init.d/nginx:18 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:18 +#: ../../../nscd/stuff/nscd:23 ../../../ntop/stuff/etc/init.d/ntop:26 +#: ../../../ntp/stuff/ntp:21 ../../../ofono/stuff/etc/init.d/ofono:21 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:33 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:22 +#: ../../../openldap/stuff/etc/init.d/openldap:20 +#: ../../../openssh/stuff/openssh:35 ../../../open-vm-tools/stuff/vmtoolsd:20 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:42 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:42 +#: ../../../partimage/stuff/etc/init.d/partimaged:24 +#: ../../../pcsc-lite/stuff/init.d/pcscd:17 +#: ../../../perdition/stuff/etc/init.d/perdition:25 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:20 +#: ../../../portmap/stuff/init.d/portmap:23 +#: ../../../postfix/stuff/etc/init.d/postfix:20 +#: ../../../postgrey/stuff/etc/init.d/postgrey:21 +#: ../../../privoxy/stuff/daemon-privoxy:22 +#: ../../../pure-ftpd/stuff/pure-ftpd:27 +#: ../../../rsync/stuff/etc/init.d/rsyncd:20 +#: ../../../samba/stuff/etc/init.d/samba:23 +#: ../../../samba/stuff/etc/init.d/samba:30 +#: ../../../slim/stuff/etc/init.d/slim:19 +#: ../../../smartmontools/stuff/etc/init.d/smartd:21 +#: ../../../squid/stuff/etc/init.d/squid:23 +#: ../../../thttpd/stuff/etc/init.d/thttpd:21 +#: ../../../tinc/stuff/etc/init.d/tinc:20 +#: ../../../tinyproxy/stuff/tinyproxy:15 +#: ../../../transmission-daemon/stuff/transmission-daemon:20 +#: ../../../unfs3/stuff/etc/init.d/unfsd:23 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:18 +#: ../../../wicd/stuff/wicd:20 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:20 +#: ../../../x11vnc/stuff/x11vnc:17 ../../../ypserv/stuff/ypserv:20 +msgid "%s is already running." +msgstr "%s уже запущен." + +#: ../daemon:55 ../../../acpid/stuff/init.d/acpid:23 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:25 +#: ../../../apache/stuff/apache:21 ../../../at/stuff/atd:22 +#: ../../../autofs/stuff/etc/init.d/autofs:23 +#: ../../../backuppc/stuff/etc/init.d/backuppc:24 +#: ../../../bind/stuff/etc/init.d/named:25 +#: ../../../boxbackup-client/stuff/bbackupd:23 +#: ../../../boxbackup-server/stuff/bbstored:23 +#: ../../../cherokee/stuff/cherokee:21 ../../../chillispot/stuff/chilli:24 +#: ../../../c_icap/stuff/c-icapd:24 ../../../clamav/stuff/daemon-clamd:23 +#: ../../../collectd/stuff/collectd:23 +#: ../../../connman/stuff/etc/init.d/connman:25 +#: ../../../cups/stuff/etc/init.d/cupsd:27 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:66 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:24 +#: ../../../dbus/stuff/etc/init.d/dbus:27 ../../../ddclient/stuff/ddclient:22 +#: ../../../dhcp/stuff/dhcpd:23 ../../../dhid/stuff/init.d/dhid:20 +#: ../../../distcc/stuff/distccd:41 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:23 +#: ../../../dovecot/stuff/init.d/dovecot:27 +#: ../../../dropbear/stuff/init.d/dropbear:38 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:22 +#: ../../../fcron/stuff/fcron:23 ../../../git/stuff/git-daemon:23 +#: ../../../gpm/stuff/etc/init.d/gpm:23 ../../../hal/stuff/etc/init.d/hald:21 +#: ../../../hostapd/stuff/hostapd:21 ../../../knock/stuff/etc/init.d/knock:25 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:21 +#: ../../../linux64-zram/stuff/compcache:24 +#: ../../../linux-zram/stuff/compcache:24 ../../../lxdm/stuff/init.d/lxdm:21 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:22 +#: ../../../mariadb/stuff/etc/init.d/mysql:34 +#: ../../../motion/stuff/init.d/motion:19 +#: ../../../mpd/stuff/etc/init.d/mpd:22 +#: ../../../mysql/stuff/etc/init.d/mysql:34 ../../../nagios/stuff/nagios:33 +#: ../../../nagios-nrpe/stuff/nrpe:28 +#: ../../../netatalk/stuff/etc/init.d/netatalk:48 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:48 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:28 +#: ../../../nginx/stuff/etc/init.d/nginx:21 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:21 +#: ../../../nscd/stuff/nscd:26 ../../../ntop/stuff/etc/init.d/ntop:33 +#: ../../../ntp/stuff/ntp:24 ../../../ofono/stuff/etc/init.d/ofono:24 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:36 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:25 +#: ../../../openldap/stuff/etc/init.d/openldap:23 +#: ../../../openssh/stuff/openssh:38 ../../../open-vm-tools/stuff/vmtoolsd:23 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:45 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:45 +#: ../../../partimage/stuff/etc/init.d/partimaged:29 +#: ../../../pcsc-lite/stuff/init.d/pcscd:20 +#: ../../../perdition/stuff/etc/init.d/perdition:28 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:23 +#: ../../../portmap/stuff/init.d/portmap:27 +#: ../../../postfix/stuff/etc/init.d/postfix:23 +#: ../../../postgresql/stuff/etc/init.d/postgresql:25 +#: ../../../postgrey/stuff/etc/init.d/postgrey:36 +#: ../../../privoxy/stuff/daemon-privoxy:25 +#: ../../../pure-ftpd/stuff/pure-ftpd:30 +#: ../../../rsync/stuff/etc/init.d/rsyncd:23 +#: ../../../samba/stuff/etc/init.d/samba:25 +#: ../../../samba/stuff/etc/init.d/samba:32 +#: ../../../slim/stuff/etc/init.d/slim:22 +#: ../../../smartmontools/stuff/etc/init.d/smartd:24 +#: ../../../squid/stuff/etc/init.d/squid:33 +#: ../../../thttpd/stuff/etc/init.d/thttpd:24 +#: ../../../tinc/stuff/etc/init.d/tinc:23 +#: ../../../tinyproxy/stuff/tinyproxy:18 +#: ../../../transmission-daemon/stuff/transmission-daemon:23 +#: ../../../unfs3/stuff/etc/init.d/unfsd:27 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:21 +#: ../../../wicd/stuff/wicd:23 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:23 +#: ../../../x11vnc/stuff/x11vnc:20 ../../../ypserv/stuff/ypserv:23 +msgid "Starting %s: %s..." +msgstr "Запускается %s: %s…" + +#: ../daemon:64 ../daemon:74 ../../../acpid/stuff/init.d/acpid:29 +#: ../../../acpid/stuff/init.d/acpid:38 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:32 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:43 +#: ../../../apache/stuff/apache:27 ../../../apache/stuff/apache:37 +#: ../../../apache/stuff/apache:46 ../../../at/stuff/atd:30 +#: ../../../at/stuff/atd:39 ../../../autofs/stuff/etc/init.d/autofs:30 +#: ../../../autofs/stuff/etc/init.d/autofs:40 +#: ../../../backuppc/stuff/etc/init.d/backuppc:31 +#: ../../../backuppc/stuff/etc/init.d/backuppc:41 +#: ../../../bind/stuff/etc/init.d/named:31 +#: ../../../bind/stuff/etc/init.d/named:44 +#: ../../../boxbackup-client/stuff/bbackupd:29 +#: ../../../boxbackup-client/stuff/bbackupd:39 +#: ../../../boxbackup-server/stuff/bbstored:29 +#: ../../../boxbackup-server/stuff/bbstored:39 +#: ../../../cherokee/stuff/cherokee:27 ../../../cherokee/stuff/cherokee:36 +#: ../../../chillispot/stuff/chilli:30 ../../../chillispot/stuff/chilli:39 +#: ../../../c_icap/stuff/c-icapd:30 ../../../c_icap/stuff/c-icapd:39 +#: ../../../clamav/stuff/daemon-clamd:29 +#: ../../../clamav/stuff/daemon-clamd:39 ../../../collectd/stuff/collectd:29 +#: ../../../collectd/stuff/collectd:38 +#: ../../../connman/stuff/etc/init.d/connman:31 +#: ../../../connman/stuff/etc/init.d/connman:41 +#: ../../../connman/stuff/etc/init.d/connman:55 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:73 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:83 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:30 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:39 +#: ../../../dbus/stuff/etc/init.d/dbus:33 +#: ../../../dbus/stuff/etc/init.d/dbus:43 ../../../ddclient/stuff/ddclient:28 +#: ../../../ddclient/stuff/ddclient:38 ../../../dhcp/stuff/dhcpd:29 +#: ../../../dhcp/stuff/dhcpd:38 ../../../dhid/stuff/init.d/dhid:26 +#: ../../../dhid/stuff/init.d/dhid:36 ../../../distcc/stuff/distccd:47 +#: ../../../distcc/stuff/distccd:56 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:29 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:39 +#: ../../../dovecot/stuff/init.d/dovecot:33 +#: ../../../dovecot/stuff/init.d/dovecot:42 +#: ../../../dropbear/stuff/init.d/dropbear:44 +#: ../../../dropbear/stuff/init.d/dropbear:53 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:35 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:44 +#: ../../../fcron/stuff/fcron:29 ../../../fcron/stuff/fcron:38 +#: ../../../git/stuff/git-daemon:29 ../../../git/stuff/git-daemon:38 +#: ../../../gpm/stuff/etc/init.d/gpm:29 ../../../gpm/stuff/etc/init.d/gpm:38 +#: ../../../hal/stuff/etc/init.d/hald:27 +#: ../../../hal/stuff/etc/init.d/hald:36 ../../../hostapd/stuff/hostapd:27 +#: ../../../hostapd/stuff/hostapd:36 ../../../knock/stuff/etc/init.d/knock:31 +#: ../../../knock/stuff/etc/init.d/knock:40 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:27 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:37 +#: ../../../linux64-zram/stuff/compcache:30 +#: ../../../linux-zram/stuff/compcache:30 ../../../lxdm/stuff/init.d/lxdm:26 +#: ../../../lxdm/stuff/init.d/lxdm:35 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:29 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:39 +#: ../../../mariadb/stuff/etc/init.d/mysql:47 +#: ../../../mariadb/stuff/etc/init.d/mysql:57 +#: ../../../motion/stuff/init.d/motion:26 +#: ../../../mpd/stuff/etc/init.d/mpd:29 ../../../mpd/stuff/etc/init.d/mpd:38 +#: ../../../mysql/stuff/etc/init.d/mysql:47 +#: ../../../mysql/stuff/etc/init.d/mysql:57 ../../../nagios/stuff/nagios:40 +#: ../../../nagios/stuff/nagios:49 ../../../nagios-nrpe/stuff/nrpe:34 +#: ../../../nagios-nrpe/stuff/nrpe:43 +#: ../../../netatalk/stuff/etc/init.d/netatalk:58 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:58 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:45 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:60 +#: ../../../nginx/stuff/etc/init.d/nginx:27 +#: ../../../nginx/stuff/etc/init.d/nginx:37 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:27 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:37 +#: ../../../nscd/stuff/nscd:33 ../../../nscd/stuff/nscd:43 +#: ../../../ntop/stuff/etc/init.d/ntop:39 +#: ../../../ntop/stuff/etc/init.d/ntop:48 ../../../ntp/stuff/ntp:31 +#: ../../../ntp/stuff/ntp:41 ../../../ofono/stuff/etc/init.d/ofono:31 +#: ../../../ofono/stuff/etc/init.d/ofono:41 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:47 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:57 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:31 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:40 +#: ../../../openldap/stuff/etc/init.d/openldap:35 +#: ../../../openldap/stuff/etc/init.d/openldap:44 +#: ../../../openssh/stuff/openssh:44 ../../../openssh/stuff/openssh:53 +#: ../../../open-vm-tools/stuff/vmtoolsd:34 +#: ../../../open-vm-tools/stuff/vmtoolsd:43 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:51 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:61 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:51 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:61 +#: ../../../partimage/stuff/etc/init.d/partimaged:40 +#: ../../../pcsc-lite/stuff/init.d/pcscd:26 +#: ../../../perdition/stuff/etc/init.d/perdition:38 +#: ../../../perdition/stuff/etc/init.d/perdition:50 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:31 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:40 +#: ../../../portmap/stuff/init.d/portmap:46 +#: ../../../postfix/stuff/etc/init.d/postfix:29 +#: ../../../postfix/stuff/etc/init.d/postfix:38 +#: ../../../postfix/stuff/etc/init.d/postfix:49 +#: ../../../postgrey/stuff/etc/init.d/postgrey:42 +#: ../../../postgrey/stuff/etc/init.d/postgrey:51 +#: ../../../privoxy/stuff/daemon-privoxy:31 +#: ../../../privoxy/stuff/daemon-privoxy:41 +#: ../../../pure-ftpd/stuff/pure-ftpd:36 +#: ../../../pure-ftpd/stuff/pure-ftpd:45 +#: ../../../rsync/stuff/etc/init.d/rsyncd:29 +#: ../../../rsync/stuff/etc/init.d/rsyncd:39 +#: ../../../samba/stuff/etc/init.d/samba:39 +#: ../../../samba/stuff/etc/init.d/samba:46 +#: ../../../samba/stuff/etc/init.d/samba:59 +#: ../../../slim/stuff/etc/init.d/slim:28 +#: ../../../slim/stuff/etc/init.d/slim:38 +#: ../../../smartmontools/stuff/etc/init.d/smartd:30 +#: ../../../smartmontools/stuff/etc/init.d/smartd:39 +#: ../../../squid/stuff/etc/init.d/squid:40 +#: ../../../squid/stuff/etc/init.d/squid:51 +#: ../../../squid/stuff/etc/init.d/squid:60 +#: ../../../thttpd/stuff/etc/init.d/thttpd:30 +#: ../../../thttpd/stuff/etc/init.d/thttpd:39 +#: ../../../tinc/stuff/etc/init.d/tinc:29 +#: ../../../tinc/stuff/etc/init.d/tinc:38 +#: ../../../tinyproxy/stuff/tinyproxy:24 +#: ../../../tinyproxy/stuff/tinyproxy:34 +#: ../../../transmission-daemon/stuff/transmission-daemon:29 +#: ../../../transmission-daemon/stuff/transmission-daemon:39 +#: ../../../unfs3/stuff/etc/init.d/unfsd:38 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:27 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:36 +#: ../../../wicd/stuff/wicd:29 ../../../wicd/stuff/wicd:39 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:29 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:38 +#: ../../../x11vnc/stuff/x11vnc:26 ../../../x11vnc/stuff/x11vnc:35 +#: ../../../ypserv/stuff/ypserv:30 ../../../ypserv/stuff/ypserv:39 +msgid "%s is not running." +msgstr "%s не запущен." + +#: ../daemon:67 ../../../acpid/stuff/init.d/acpid:32 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:35 +#: ../../../apache/stuff/apache:30 ../../../apache/stuff/apache:40 +#: ../../../at/stuff/atd:33 ../../../autofs/stuff/etc/init.d/autofs:33 +#: ../../../backuppc/stuff/etc/init.d/backuppc:34 +#: ../../../bind/stuff/etc/init.d/named:34 +#: ../../../boxbackup-client/stuff/bbackupd:32 +#: ../../../boxbackup-server/stuff/bbstored:32 +#: ../../../cherokee/stuff/cherokee:30 ../../../chillispot/stuff/chilli:33 +#: ../../../c_icap/stuff/c-icapd:33 ../../../clamav/stuff/daemon-clamd:32 +#: ../../../collectd/stuff/collectd:32 +#: ../../../connman/stuff/etc/init.d/connman:34 +#: ../../../cups/stuff/etc/init.d/cupsd:19 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:76 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:33 +#: ../../../dbus/stuff/etc/init.d/dbus:36 ../../../ddclient/stuff/ddclient:31 +#: ../../../dhcp/stuff/dhcpd:32 ../../../dhid/stuff/init.d/dhid:29 +#: ../../../distcc/stuff/distccd:50 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:32 +#: ../../../dovecot/stuff/init.d/dovecot:36 +#: ../../../dropbear/stuff/init.d/dropbear:47 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:28 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:38 +#: ../../../fcron/stuff/fcron:32 ../../../git/stuff/git-daemon:32 +#: ../../../gpm/stuff/etc/init.d/gpm:32 ../../../hal/stuff/etc/init.d/hald:30 +#: ../../../hostapd/stuff/hostapd:30 ../../../knock/stuff/etc/init.d/knock:34 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:30 +#: ../../../linux64-zram/stuff/compcache:33 +#: ../../../linux-zram/stuff/compcache:33 ../../../lxdm/stuff/init.d/lxdm:29 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:32 +#: ../../../mariadb/stuff/etc/init.d/mysql:50 +#: ../../../motion/stuff/init.d/motion:29 +#: ../../../mpd/stuff/etc/init.d/mpd:32 +#: ../../../mysql/stuff/etc/init.d/mysql:50 +#: ../../../nagios-nrpe/stuff/nrpe:37 +#: ../../../netatalk/stuff/etc/init.d/netatalk:61 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:61 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:48 +#: ../../../nginx/stuff/etc/init.d/nginx:30 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:30 +#: ../../../nscd/stuff/nscd:36 ../../../ntop/stuff/etc/init.d/ntop:42 +#: ../../../ntp/stuff/ntp:34 ../../../ofono/stuff/etc/init.d/ofono:34 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:50 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:34 +#: ../../../openldap/stuff/etc/init.d/openldap:38 +#: ../../../openssh/stuff/openssh:47 ../../../open-vm-tools/stuff/vmtoolsd:37 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:54 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:54 +#: ../../../partimage/stuff/etc/init.d/partimaged:43 +#: ../../../pcsc-lite/stuff/init.d/pcscd:29 +#: ../../../perdition/stuff/etc/init.d/perdition:41 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:34 +#: ../../../portmap/stuff/init.d/portmap:49 +#: ../../../postfix/stuff/etc/init.d/postfix:32 +#: ../../../postgresql/stuff/etc/init.d/postgresql:39 +#: ../../../postgrey/stuff/etc/init.d/postgrey:45 +#: ../../../privoxy/stuff/daemon-privoxy:34 +#: ../../../pure-ftpd/stuff/pure-ftpd:39 +#: ../../../rsync/stuff/etc/init.d/rsyncd:32 +#: ../../../samba/stuff/etc/init.d/samba:41 +#: ../../../samba/stuff/etc/init.d/samba:48 +#: ../../../slim/stuff/etc/init.d/slim:31 +#: ../../../smartmontools/stuff/etc/init.d/smartd:33 +#: ../../../squid/stuff/etc/init.d/squid:43 +#: ../../../thttpd/stuff/etc/init.d/thttpd:33 +#: ../../../tinc/stuff/etc/init.d/tinc:32 +#: ../../../tinyproxy/stuff/tinyproxy:27 +#: ../../../transmission-daemon/stuff/transmission-daemon:32 +#: ../../../unfs3/stuff/etc/init.d/unfsd:41 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:30 +#: ../../../wicd/stuff/wicd:32 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:32 +#: ../../../x11vnc/stuff/x11vnc:29 ../../../ypserv/stuff/ypserv:33 +msgid "Stopping %s: %s..." +msgstr "Останавливается %s: %s…" + +#: ../daemon:77 ../../../acpid/stuff/init.d/acpid:41 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:46 +#: ../../../apache/stuff/apache:49 ../../../at/stuff/atd:42 +#: ../../../autofs/stuff/etc/init.d/autofs:43 +#: ../../../backuppc/stuff/etc/init.d/backuppc:44 +#: ../../../bind/stuff/etc/init.d/named:47 +#: ../../../boxbackup-client/stuff/bbackupd:42 +#: ../../../boxbackup-server/stuff/bbstored:42 +#: ../../../cherokee/stuff/cherokee:39 ../../../chillispot/stuff/chilli:42 +#: ../../../c_icap/stuff/c-icapd:42 ../../../clamav/stuff/daemon-clamd:42 +#: ../../../collectd/stuff/collectd:41 +#: ../../../connman/stuff/etc/init.d/connman:44 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:86 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:42 +#: ../../../dbus/stuff/etc/init.d/dbus:47 ../../../ddclient/stuff/ddclient:41 +#: ../../../dhcp/stuff/dhcpd:41 ../../../dhid/stuff/init.d/dhid:39 +#: ../../../distcc/stuff/distccd:59 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:42 +#: ../../../dovecot/stuff/init.d/dovecot:45 +#: ../../../dropbear/stuff/init.d/dropbear:56 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:47 +#: ../../../fcron/stuff/fcron:41 ../../../git/stuff/git-daemon:41 +#: ../../../gpm/stuff/etc/init.d/gpm:41 ../../../hal/stuff/etc/init.d/hald:39 +#: ../../../hostapd/stuff/hostapd:39 ../../../knock/stuff/etc/init.d/knock:43 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:40 +#: ../../../lxdm/stuff/init.d/lxdm:38 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:42 +#: ../../../mariadb/stuff/etc/init.d/mysql:60 +#: ../../../motion/stuff/init.d/motion:39 +#: ../../../mpd/stuff/etc/init.d/mpd:41 +#: ../../../mysql/stuff/etc/init.d/mysql:60 ../../../nagios/stuff/nagios:52 +#: ../../../nagios-nrpe/stuff/nrpe:46 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:63 +#: ../../../nginx/stuff/etc/init.d/nginx:40 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:40 +#: ../../../nscd/stuff/nscd:46 ../../../ntop/stuff/etc/init.d/ntop:51 +#: ../../../ntp/stuff/ntp:44 ../../../ofono/stuff/etc/init.d/ofono:44 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:60 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:43 +#: ../../../openldap/stuff/etc/init.d/openldap:47 +#: ../../../openssh/stuff/openssh:56 ../../../open-vm-tools/stuff/vmtoolsd:46 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:64 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:64 +#: ../../../perdition/stuff/etc/init.d/perdition:53 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:43 +#: ../../../postfix/stuff/etc/init.d/postfix:41 +#: ../../../postgresql/stuff/etc/init.d/postgresql:44 +#: ../../../postgrey/stuff/etc/init.d/postgrey:54 +#: ../../../privoxy/stuff/daemon-privoxy:47 +#: ../../../pure-ftpd/stuff/pure-ftpd:48 +#: ../../../rsync/stuff/etc/init.d/rsyncd:42 +#: ../../../slim/stuff/etc/init.d/slim:41 +#: ../../../smartmontools/stuff/etc/init.d/smartd:42 +#: ../../../squid/stuff/etc/init.d/squid:63 +#: ../../../thttpd/stuff/etc/init.d/thttpd:42 +#: ../../../tinc/stuff/etc/init.d/tinc:41 +#: ../../../tinyproxy/stuff/tinyproxy:37 +#: ../../../transmission-daemon/stuff/transmission-daemon:42 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:39 +#: ../../../wicd/stuff/wicd:42 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:41 +#: ../../../x11vnc/stuff/x11vnc:38 ../../../ypserv/stuff/ypserv:42 +msgid "Restarting %s: %s..." +msgstr "Перезапускается %s: %s…" + +#: ../daemon:86 ../../../acpid/stuff/init.d/acpid:48 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:55 +#: ../../../apache/stuff/apache:54 ../../../at/stuff/atd:51 +#: ../../../autofs/stuff/etc/init.d/autofs:50 +#: ../../../backuppc/stuff/etc/init.d/backuppc:57 +#: ../../../bind/stuff/etc/init.d/named:54 +#: ../../../boxbackup-client/stuff/bbackupd:50 +#: ../../../boxbackup-server/stuff/bbstored:50 +#: ../../../cherokee/stuff/cherokee:47 ../../../chillispot/stuff/chilli:49 +#: ../../../c_icap/stuff/c-icapd:51 ../../../clamav/stuff/daemon-clamd:50 +#: ../../../collectd/stuff/collectd:48 +#: ../../../connman/stuff/etc/init.d/connman:59 +#: ../../../cups/stuff/etc/init.d/cupsd:35 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:98 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:49 +#: ../../../dbus/stuff/etc/init.d/dbus:55 ../../../ddclient/stuff/ddclient:49 +#: ../../../dhcp/stuff/dhcpd:48 ../../../dhid/stuff/init.d/dhid:47 +#: ../../../distcc/stuff/distccd:64 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:50 +#: ../../../dovecot/stuff/init.d/dovecot:52 +#: ../../../dropbear/stuff/init.d/dropbear:63 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:53 +#: ../../../fcron/stuff/fcron:48 ../../../git/stuff/git-daemon:48 +#: ../../../gpm/stuff/etc/init.d/gpm:48 ../../../hal/stuff/etc/init.d/hald:46 +#: ../../../hostapd/stuff/hostapd:46 ../../../knock/stuff/etc/init.d/knock:50 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:48 +#: ../../../linux64-zram/stuff/compcache:41 +#: ../../../linux-zram/stuff/compcache:41 ../../../lxdm/stuff/init.d/lxdm:45 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:51 +#: ../../../mariadb/stuff/etc/init.d/mysql:68 +#: ../../../motion/stuff/init.d/motion:47 +#: ../../../mpd/stuff/etc/init.d/mpd:48 +#: ../../../mysql/stuff/etc/init.d/mysql:68 ../../../nagios/stuff/nagios:62 +#: ../../../nagios-nrpe/stuff/nrpe:53 +#: ../../../netatalk/stuff/etc/init.d/netatalk:74 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:74 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:77 +#: ../../../nginx/stuff/etc/init.d/nginx:48 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:48 +#: ../../../nscd/stuff/nscd:54 ../../../ntop/stuff/etc/init.d/ntop:58 +#: ../../../ntp/stuff/ntp:51 ../../../ofono/stuff/etc/init.d/ofono:52 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:68 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:50 +#: ../../../openldap/stuff/etc/init.d/openldap:54 +#: ../../../openssh/stuff/openssh:63 ../../../open-vm-tools/stuff/vmtoolsd:53 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:72 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:72 +#: ../../../partimage/stuff/etc/init.d/partimaged:53 +#: ../../../pcsc-lite/stuff/init.d/pcscd:38 +#: ../../../perdition/stuff/etc/init.d/perdition:70 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:52 +#: ../../../portmap/stuff/init.d/portmap:65 +#: ../../../postfix/stuff/etc/init.d/postfix:58 +#: ../../../postgresql/stuff/etc/init.d/postgresql:54 +#: ../../../postgrey/stuff/etc/init.d/postgrey:61 +#: ../../../privoxy/stuff/daemon-privoxy:52 +#: ../../../pure-ftpd/stuff/pure-ftpd:55 +#: ../../../rsync/stuff/etc/init.d/rsyncd:50 +#: ../../../samba/stuff/etc/init.d/samba:67 +#: ../../../slim/stuff/etc/init.d/slim:49 +#: ../../../smartmontools/stuff/etc/init.d/smartd:49 +#: ../../../squid/stuff/etc/init.d/squid:69 +#: ../../../thttpd/stuff/etc/init.d/thttpd:49 +#: ../../../tinc/stuff/etc/init.d/tinc:48 +#: ../../../tinyproxy/stuff/tinyproxy:45 +#: ../../../transmission-daemon/stuff/transmission-daemon:50 +#: ../../../unfs3/stuff/etc/init.d/unfsd:51 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:46 +#: ../../../wicd/stuff/wicd:50 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:48 +#: ../../../x11vnc/stuff/x11vnc:45 ../../../ypserv/stuff/ypserv:49 +msgid "Usage:" +msgstr "Использование:" + +#: ../../../acpid/stuff/init.d/acpid:12 +msgid "ACPI event deamon" +msgstr "служба событий ACPI" + +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:12 +#: ../../../autofs/stuff/etc/init.d/autofs:12 +#: ../../../chillispot/stuff/chilli:12 ../../../c_icap/stuff/c-icapd:12 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:12 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:12 +#: ../../../dropbear/stuff/init.d/dropbear:12 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:10 +#: ../../../gpm/stuff/etc/init.d/gpm:12 +#: ../../../knock/stuff/etc/init.d/knock:12 +#: ../../../mariadb/stuff/etc/init.d/mysql:12 +#: ../../../mysql/stuff/etc/init.d/mysql:12 +#: ../../../ntop/stuff/etc/init.d/ntop:12 ../../../ntp/stuff/ntp:12 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:12 +#: ../../../openldap/stuff/etc/init.d/openldap:12 +#: ../../../openssh/stuff/openssh:12 +#: ../../../partimage/stuff/etc/init.d/partimaged:12 +#: ../../../postfix/stuff/etc/init.d/postfix:12 +#: ../../../postgresql/stuff/etc/init.d/postgresql:12 +#: ../../../samba/stuff/etc/init.d/samba:12 +#: ../../../thttpd/stuff/etc/init.d/thttpd:12 +#: ../../../unfs3/stuff/etc/init.d/unfsd:12 ../../../x11vnc/stuff/x11vnc:10 +#: ../../../ypserv/stuff/ypserv:12 +msgid "%s server" +msgstr "сервер %s" + +#: ../../../apache/stuff/apache:10 +msgid "Apache Web Server" +msgstr "веб-сервер Apache" + +#: ../../../boxbackup-server/stuff/bbstored:12 +msgid "BoxBackup server deamon" +msgstr "служба сервера BoxBackup" + +#: ../../../cherokee/stuff/cherokee:10 +msgid "Cherokee Web Server" +msgstr "веб-сервер Cherokee" + +#: ../../../collectd/stuff/collectd:12 +msgid "Statistics collection daemon" +msgstr "служба сбора статистики" + +#: ../../../connman/stuff/etc/init.d/connman:13 +msgid "Connection Manager" +msgstr "диспетчер подключений" + +#: ../../../connman/stuff/etc/init.d/connman:53 +msgid "%s is running." +msgstr "%s запущен." + +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:26 +msgid "Initialize %s..." +msgstr "Инициализация %s…" + +#: ../../../dbus/stuff/etc/init.d/dbus:10 +msgid "message bus daemon" +msgstr "служба шины сообщений" + +#: ../../../ddclient/stuff/ddclient:11 +msgid "dynamic IP manager" +msgstr "диспетчер динамического IP" + +#: ../../../dhid/stuff/init.d/dhid:9 +msgid "DHIS client daemon" +msgstr "служба клиента DHIS" + +#: ../../../dropbear/stuff/init.d/dropbear:21 +#: ../../../dropbear/stuff/init.d/dropbear:28 +msgid "Generating Dropbear %s key..." +msgstr "Создание %s-ключа Dropbear…" + +#: ../../../hal/stuff/etc/init.d/hald:10 +msgid "Hardware Abstraction Layer" +msgstr "слой аппаратных абстракций (HAL)" + +#: ../../../hostapd/stuff/hostapd:10 +msgid "daemon for wireless software access points" +msgstr "служба программных беспроводных точек доступа" + +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:10 +#: ../../../nginx/stuff/etc/init.d/nginx:10 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:10 +msgid "web server" +msgstr "веб-сервер" + +#: ../../../linux64-zram/stuff/compcache:19 +#: ../../../linux-zram/stuff/compcache:19 +msgid "Loading module..." +msgstr "Загрузка модуля…" + +#: ../../../linux64-zram/stuff/compcache:36 +#: ../../../linux-zram/stuff/compcache:36 +msgid "Unloading module..." +msgstr "Выгрузка модуля…" + +#: ../../../lxdm/stuff/init.d/lxdm:11 +msgid "LXDE login manager" +msgstr "диспетчер входа LXDE" + +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:12 +msgid "Network daemon" +msgstr "сетевая служба" + +#: ../../../mariadb/stuff/etc/init.d/mysql:29 +#: ../../../mysql/stuff/etc/init.d/mysql:29 +msgid "Initializing %s..." +msgstr "Инициализация %s…" + +#: ../../../mariadb/stuff/etc/init.d/mysql:40 +#: ../../../mysql/stuff/etc/init.d/mysql:40 +#: ../../../openldap/stuff/etc/init.d/openldap:28 +#: ../../../postgresql/stuff/etc/init.d/postgresql:31 +msgid "Running %s..." +msgstr "Запуск %s…" + +#: ../../../motion/stuff/init.d/motion:9 +msgid "Video detection daemon" +msgstr "служба видео-детектирования" + +#: ../../../mpd/stuff/etc/init.d/mpd:11 +msgid "Music Player Daemon" +msgstr "служба MPD" + +#: ../../../nagios/stuff/nagios:12 +msgid "Network Monitoring Server" +msgstr "сервер мониторинга сети" + +#: ../../../netatalk/stuff/etc/init.d/netatalk:11 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:11 +msgid "Netatalk daemons" +msgstr "службы Netatalk" + +#: ../../../nscd/stuff/nscd:12 +msgid "name-server caching daemon" +msgstr "служба кеширования сервиса имен" + +#: ../../../ofono/stuff/etc/init.d/ofono:13 +msgid "Mobile telephony Manager" +msgstr "диспетчер мобильной связи" + +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:12 +msgid "openerp-web server" +msgstr "веб-сервер OpenERP" + +#: ../../../openssh/stuff/openssh:23 ../../../openssh/stuff/openssh:27 +#: ../../../openssh/stuff/openssh:31 +msgid "Generating OpenSSH %s key... " +msgstr "Создание %s-ключа OpenSSH… " + +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:20 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:20 +msgid "TUN/TAP support is not available in this Kernel" +msgstr "Поддержка TUN/TAP недоступна в этом ядре" + +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:25 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:25 +msgid "Detected broken %s symlink, fixing..." +msgstr "Обнаружена битая ссылка на %s. Исправление…" + +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:38 +msgid "Missing OpenVPN client config." +msgstr "Отсутствует файл настроек клиента OpenVPN." + +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:38 +msgid "Missing OpenVPN server config." +msgstr "Отсутствует файл настроек сервера OpenVPN." + +#: ../../../pcsc-lite/stuff/init.d/pcscd:10 +msgid "PC/SC smart card daemon" +msgstr "служба смарт-карт PC/SC" + +#: ../../../perdition/stuff/etc/init.d/perdition:13 +msgid "IMAP/POP3 proxy server" +msgstr "прокси-сервер IMAP/POP3" + +#: ../../../portmap/stuff/init.d/portmap:12 +msgid "RPC portmapper" +msgstr "RPC portmapper" + +#: ../../../portmap/stuff/init.d/portmap:37 +msgid "Restoring old RPC service information..." +msgstr "Восстановление старой информации службы RPC…" + +#: ../../../postgresql/stuff/etc/init.d/postgresql:21 +msgid "Initializing PostgreSQL server database" +msgstr "Инициализация базы данных сервера PostgreSQL" + +#: ../../../postgresql/stuff/etc/init.d/postgresql:49 +#: ../../../samba/stuff/etc/init.d/samba:62 +msgid "Reloading %s: %s..." +msgstr "Перезагружается %s: %s…" + +#: ../../../postgrey/stuff/etc/init.d/postgrey:12 +msgid "Postfix Greylisting Policy Server" +msgstr "сервер политики серых списков Postfix" + +#: ../../../postgrey/stuff/etc/init.d/postgrey:25 +msgid "Updating %s" +msgstr "Обновление %s" + +#: ../../../privoxy/stuff/daemon-privoxy:12 +msgid "Web proxy daemon" +msgstr "служба веб-прокси" + +#: ../../../pure-ftpd/stuff/pure-ftpd:12 +msgid "pure-FTPd Server Daemon" +msgstr "служба сервера pure-FTPd" + +#: ../../../slim/stuff/etc/init.d/slim:11 +msgid "Simple login manager" +msgstr "простой диспетчер входа" + +#: ../../../smartmontools/stuff/etc/init.d/smartd:12 +msgid "Smartmontools (SMART) Daemon" +msgstr "служба Smartmontools (SMART)" + +#: ../../../squid/stuff/etc/init.d/squid:12 +msgid "Squid proxy server" +msgstr "прокси-сервер Squid" + +#: ../../../squid/stuff/etc/init.d/squid:29 +msgid "Creating squid spool directory structure" +msgstr "Создание структуры спул-папки Squid" + +#: ../../../squid/stuff/etc/init.d/squid:54 +msgid "Reloading %s configuration..." +msgstr "Перезагружаются параметры %s…" + +#: ../../../tinyproxy/stuff/tinyproxy:7 +msgid "Tiny Proxy" +msgstr "крошечный прокси" + +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:10 +msgid "VirtualBox Guest Service" +msgstr "гостевые службы VirtualBox" + +#: ../../../wicd/stuff/wicd:12 +msgid "Network connection manager" +msgstr "диспетчер сетевых подключений" diff -r f7dd646afeb9 -r 7f188676b59c c_icap/stuff/c-icapd --- a/c_icap/stuff/c-icapd Wed May 25 23:07:05 2016 +0200 +++ b/c_icap/stuff/c-icapd Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/nagios : Start, stop and restart ICAP server on SliTaz, at +# /etc/init.d/nagios : Start, stop and restart ICAP server on SliTaz, at # boot time or with the command line. # # To start ICAP server at boot time, just put c-icapd in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=c-icap -DESC="ICAP Server" +DESC="$(_ '%s server' ICAP)" DAEMON=/usr/bin/c-icap OPTIONS="" PIDFILE=/var/run/c-icap/c-icap.pid @@ -18,39 +18,38 @@ case "$1" in start) if active_pidfile $PIDFILE $NAME ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart|reload) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; test) - configtest ;; + configtest ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart|reload]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart|reload|test]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c cherokee/stuff/cherokee --- a/cherokee/stuff/cherokee Wed May 25 23:07:05 2016 +0200 +++ b/cherokee/stuff/cherokee Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/cherokee: Start, stop and restart Cherokee web server on SliTaz, +# /etc/init.d/cherokee: Start, stop and restart Cherokee web server on SliTaz, # at boot time or with the command line. Daemons options are configured # with /etc/daemons.conf # @@ -7,7 +7,7 @@ . /etc/daemons.conf NAME=Cherokee -DESC="Cherokee Web Server" +DESC="$(_ 'Cherokee Web Server')" DAEMON=/usr/sbin/cherokee OPTIONS= PIDFILE=/var/run/cherokee.pid @@ -15,28 +15,28 @@ case "$1" in start) if active_pidfile $PIDFILE cherokee ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS -d &>/dev/null + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS -d &>/dev/null status ;; stop) if ! active_pidfile $PIDFILE cherokee ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE cherokee ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) rm $PIDFILE sleep 2 @@ -44,9 +44,8 @@ status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c chillispot/stuff/chilli --- a/chillispot/stuff/chilli Wed May 25 23:07:05 2016 +0200 +++ b/chillispot/stuff/chilli Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/chilli : Start, stop and restart ChilliSpot server on SliTaz, at +# /etc/init.d/chilli : Start, stop and restart ChilliSpot server on SliTaz, at # boot time or with the command line. # # To start ChilliSpot server at boot time, just put chilli in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=ChilliSpot -DESC="ChilliSpot server" +DESC="$(_ '%s server' ChilliSpot)" DAEMON=/usr/sbin/chilli OPTIONS=$CHILLI_OPTIONS PIDFILE=/var/run/chilli.pid @@ -18,36 +18,36 @@ case "$1" in start) if active_pidfile $PIDFILE chilli ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE chilli ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE chilli ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c clamav/stuff/daemon-clamd --- a/clamav/stuff/daemon-clamd Wed May 25 23:07:05 2016 +0200 +++ b/clamav/stuff/daemon-clamd Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/daemon-name: Start, stop and restart daemon +# /etc/init.d/daemon-name: Start, stop and restart daemon # on SliTaz, at boot time or with the command line. # # To start daemon at boot time, just put the right name in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Clamd -DESC="clamav daemon" +DESC="$(_ '%s daemon' clamav)" DAEMON=/usr/sbin/clamd OPTIONS=$CLAMD_OPTIONS PIDFILE=/run/clamav/clamd.pid @@ -17,39 +17,38 @@ case "$1" in start) if active_pidfile $PIDFILE clamd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE clamd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE clamd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c collectd/stuff/collectd --- a/collectd/stuff/collectd Wed May 25 23:07:05 2016 +0200 +++ b/collectd/stuff/collectd Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/collectd : Start, stop and restart Collectd server on SliTaz, at +# /etc/init.d/collectd : Start, stop and restart Collectd server on SliTaz, at # boot time or with the command line. # # To start Collectd server at boot time, just put collectd in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=collectd -DESC="Statistics collection daemon" +DESC="$(_ 'Statistics collection daemon')" DAEMON=/usr/sbin/collectd OPTIONS="" PIDFILE=/var/run/collectd.pid @@ -17,37 +17,36 @@ case "$1" in start) if active_pidfile $PIDFILE collectd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE collectd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE collectd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c connman/stuff/etc/init.d/connman --- a/connman/stuff/etc/init.d/connman Wed May 25 23:07:05 2016 +0200 +++ b/connman/stuff/etc/init.d/connman Thu May 26 20:16:45 2016 +0300 @@ -10,7 +10,7 @@ . /etc/daemons.conf NAME=Connman -DESC="Connection Manager" +DESC="$(_ 'Connection Manager')" DAEMON=connmand OPTIONS=$CONNMAN_OPTIONS PIDFILE="$(pidof $DAEMON)" @@ -18,30 +18,30 @@ case "$1" in start) if [ -n "$PIDFILE" ] ; then - echo "$NAME is already running." + _ '%s is already running.' $NAME exit 1 fi pkill udhcpc 2>/dev/null - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if [ -z "$PIDFILE" ] ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME pkill $DAEMON pkill wpa_supplicant status ;; restart) if [ -z "$PIDFILE" ] ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME pkill $DAEMON && pkill wpa_supplicant && sleep 2 && @@ -50,15 +50,14 @@ ;; status) if [ -n "$PIDFILE" ] ; then - echo "$NAME is running." + _ '%s is running.' $NAME else - echo "$NAME is not running." - fi + _ '%s is not running.' $NAME + fi ;; *) - printf "\n\033[1mUsage:\033[0m /etc/init.d/%b [start|stop|restart|status]\n" \ - "$(basename $0)" - exit 1 + emsg "$(_ 'Usage:') $0 [start|stop|restart|status]" + newline ;; esac diff -r f7dd646afeb9 -r 7f188676b59c cups/stuff/etc/init.d/cupsd --- a/cups/stuff/etc/init.d/cupsd Wed May 25 23:07:05 2016 +0200 +++ b/cups/stuff/etc/init.d/cupsd Thu May 26 20:16:45 2016 +0300 @@ -9,14 +9,14 @@ . /etc/daemons.conf NAME=Cupsd -DESC="cups deamon" +DESC="$(_ '%s daemon' CUPS)" DAEMON=/usr/sbin/cupsd OPTIONS=$CUPSD_OPTIONS PIDFILE=/var/run/cups/cups.sock case "$1" in stop) - action 'Stopping $DESC: $NAME... ' + action 'Stopping %s: %s...' "$DESC" $NAME kill $(pgrep -f cupsd) sleep 2 [ -e /var/run/cups/cups.sock ] && rm -f $PIDFILE @@ -24,16 +24,15 @@ ;; start) if ! active_pidfile $PIDFILE cupsd 2>/dev/null; then - action 'Starting $DESC: $NAME... ' + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status else - action 'Not starting $DESC: $DESC is already running' - false; status + _ '%s is already running.' $NAME fi ;; *) - emsg "Usage: /etc/init.d/$(basename $0) [start|stop]" + emsg "$(_ 'Usage:') $0 [start|stop]" newline exit 1 ;; diff -r f7dd646afeb9 -r 7f188676b59c cyrus-imapd/stuff/etc/init.d/cyrus-imapd --- a/cyrus-imapd/stuff/etc/init.d/cyrus-imapd Wed May 25 23:07:05 2016 +0200 +++ b/cyrus-imapd/stuff/etc/init.d/cyrus-imapd Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/cyrus-imapd : Start, stop and restart IMAP server on SliTaz, at +# /etc/init.d/cyrus-imapd : Start, stop and restart IMAP server on SliTaz, at # boot time or with the command line. # # To start IMAP server at boot time, just put cyrus-imapd in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=cyrus-imapd -DESC="IMAP server" +DESC="$(_ '%s server' IMAP)" DAEMON=/usr/lib/cyrus/master OPTIONS=$CYRUS_OPTIONS PIDFILE=/var/run/cyrus.master.pid @@ -18,12 +18,12 @@ case "$1" in start) if active_pidfile $PIDFILE master ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - dir=$(grep ^configdirectory /etc/imapd.conf | awk '{ print $2 }') + dir=$(grep ^configdirectory /etc/imapd.conf | awk '{print $2}') if [ ! -f $dir/mailboxes.db ]; then - echo -n "Initialize $DESC: " + action 'Initialize %s...' "$DESC" #/usr/cyrus/bin/mkimap for i in db proc socket log msg user quota; do [ -d $dir/$i ] || mkdir -p -m 700 $dir/$i @@ -43,7 +43,7 @@ [ -d $i/$j ] || mkdir -p $i/$j done ;; esac - [ -d $i/stage. ] || mkdir $i/stage. + [ -d $i/stage. ] || mkdir $i/stage. chown -R cyrus:mail $i done case "$(grep ^sieveusehomedir /etc/imapd.conf | awk '{ print $2 }')" in @@ -60,44 +60,43 @@ su cyrus -c "/usr/cyrus/bin/reconstruct" status fi - if ! pidof saslauthd > /dev/null; then + if ! pidof saslauthd >/dev/null; then /etc/init.d/cyrus-sasl start fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status sleep 2 ;; stop) if ! active_pidfile $PIDFILE master ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` - ps x | grep -q `cat $PIDFILE` || rm -f $PIDFILE + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + ps x | grep -q $(cat $PIDFILE) || rm -f $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE master ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` - if ps x | grep -q `cat $PIDFILE`; then - false + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + if ps x | grep -q $(cat $PIDFILE); then + false else - rm -f $PIDFILE - sleep 2 - $DAEMON $OPTIONS + rm -f $PIDFILE + sleep 2 + $DAEMON $OPTIONS fi status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c cyrus-sasl/stuff/etc/init.d/cyrus-sasl --- a/cyrus-sasl/stuff/etc/init.d/cyrus-sasl Wed May 25 23:07:05 2016 +0200 +++ b/cyrus-sasl/stuff/etc/init.d/cyrus-sasl Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/cyrus-sasl : Start, stop and restart SASL server on SliTaz, at +# /etc/init.d/cyrus-sasl : Start, stop and restart SASL server on SliTaz, at # boot time or with the command line. # # To start SASL server at boot time, just put cyrus-sasl in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=cyrus-sasl -DESC="SASL server" +DESC="$(_ '%s server' SASL)" DAEMON=/usr/sbin/saslauthd OPTIONS=$CYRUS_OPTIONS PIDFILE=/var/state/saslauthd/saslauthd.pid @@ -18,37 +18,36 @@ case "$1" in start) if active_pidfile $PIDFILE saslauthd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE saslauthd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE saslauthd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c dbus/stuff/etc/init.d/dbus --- a/dbus/stuff/etc/init.d/dbus Wed May 25 23:07:05 2016 +0200 +++ b/dbus/stuff/etc/init.d/dbus Thu May 26 20:16:45 2016 +0300 @@ -7,7 +7,7 @@ . /etc/daemons.conf NAME=DBUS -DESC="message bus daemon" +DESC="$(_ 'message bus daemon')" DAEMON=/usr/bin/dbus-daemon OPTIONS=$DBUS_OPTIONS PIDFILE=/run/dbus/pid @@ -20,41 +20,40 @@ case "$1" in start) if active_pidfile $PIDFILE dbus-daemon ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi mkdir -p /run/dbus - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE dbus-daemon ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE dbus-daemon ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi mkdir -p /run/dbus - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c ddclient/stuff/ddclient --- a/ddclient/stuff/ddclient Wed May 25 23:07:05 2016 +0200 +++ b/ddclient/stuff/ddclient Thu May 26 20:16:45 2016 +0300 @@ -8,7 +8,7 @@ . /etc/init.d/rc.functions NAME=DDclient -DESC="ddclient dynamic IP manager" +DESC="$(_ 'dynamic IP manager')" DAEMON=/usr/sbin/ddclient PID_FILE=/var/run/ddclient.pid OPTION="-pid $PID_FILE" @@ -16,29 +16,29 @@ case "$1" in start) if active_pidfile $PID_FILE ddclient ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTION status ;; stop) if ! active_pidfile $PID_FILE ddclient ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME killall ddclient rm $PID_FILE status ;; restart) if ! active_pidfile $PID_FILE ddclient ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME killall ddclient rm $PID_FILE sleep 2 @@ -46,9 +46,8 @@ status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c dhcp/stuff/dhcpd --- a/dhcp/stuff/dhcpd Wed May 25 23:07:05 2016 +0200 +++ b/dhcp/stuff/dhcpd Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Dhcpd -DESC="dhcp deamon" +DESC="$(_ '%s daemon' DHCP)" DAEMON=/usr/sbin/dhcpd OPTIONS=$DHCPD_OPTIONS PIDFILE=/var/run/dhcpd.pid @@ -17,37 +17,36 @@ case "$1" in start) if active_pidfile $PIDFILE dhcpd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE dhcpd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE dhcpd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c dhid/stuff/init.d/dhid --- a/dhid/stuff/init.d/dhid Wed May 25 23:07:05 2016 +0200 +++ b/dhid/stuff/init.d/dhid Thu May 26 20:16:45 2016 +0300 @@ -2,47 +2,52 @@ # # /etc/init.d/dhid: Start, stop and restart dhis daemon on SliTaz # -. /lib/libtaz.sh +. /etc/init.d/rc.functions #. /etc/daemons.conf NAME=DHID -DESC="dyn ip" +DESC="$(_ 'DHIS client daemon')" DAEMON=/usr/sbin/dhid PIDFILE=/run/dhid.pid OPTIONS="-P $PIDFILE" case "$1" in - start) + start) if active_pidfile $PIDFILE dhid; then - echo "$NAME already running."; §exit 1 + _ '%s is already running.' $NAME + exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS - status ;; - + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS + status + ;; stop) if ! active_pidfile $PIDFILE dhid; then - echo "$NAME is not running."; exit 1 + _ '%s is not running.' $NAME + exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) rm $PIDFILE - status ;; - + status + ;; restart) if ! active_pidfile $PIDFILE dhid; then - echo "$NAME is not running."; exit 1 + _ '%s is not running.' $NAME + exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) rm $PIDFILE sleep 2 $DAEMON $OPTIONS - status ;; - - *) - echo "Usage: /etc/init.d/$(basename $0) [start|stop|restart]" - exit 1 ;; + status + ;; + *) + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline + exit 1 + ;; esac exit 0 diff -r f7dd646afeb9 -r 7f188676b59c distcc/stuff/distccd --- a/distcc/stuff/distccd Wed May 25 23:07:05 2016 +0200 +++ b/distcc/stuff/distccd Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/distccd: Start, stop and restart Distcc daemon on SliTaz, +# /etc/init.d/distccd: Start, stop and restart Distcc daemon on SliTaz, # at boot time or with the command line. Daemons options are configured # with /etc/daemons.conf # @@ -10,7 +10,7 @@ { if [ -s /etc/distcc/hosts.allow ]; then for i in $(cat /etc/distcc/clients.allow); do - ( echo $i | grep -q '^#' ) && continue + ( echo $i | grep -q '^#' ) && continue ALLOW_HOST="$ALLOW_HOST --allow $i" done else @@ -20,7 +20,7 @@ } NAME=Distccd -DESC="Distcc daemon" +DESC="$(_ '%s daemon' Distcc)" DAEMON="/usr/bin/distccd" LOGFILE="/var/log/distccd/distccd.log" PIDFILE="/var/run/distccd/distccd.pid" @@ -35,35 +35,34 @@ case "$1" in start) if active_pidfile $PIDFILE distccd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE distccd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME kill -15 $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE distccd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS -k restart status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c dnsmasq/stuff/etc/init.d/dnsmasq --- a/dnsmasq/stuff/etc/init.d/dnsmasq Wed May 25 23:07:05 2016 +0200 +++ b/dnsmasq/stuff/etc/init.d/dnsmasq Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=DNSmasq -DESC="dnsmasq deamon" +DESC="$(_ '%s daemon' dnsmasq)" DAEMON=/usr/sbin/dnsmasq OPTIONS=$DNSMASQ_OPTIONS PIDFILE=/var/run/dnsmasq.pid @@ -17,39 +17,38 @@ case "$1" in start) if active_pidfile $PIDFILE dnsmasq ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE dnsmasq ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE dnsmasq ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c dovecot/stuff/init.d/dovecot --- a/dovecot/stuff/init.d/dovecot Wed May 25 23:07:05 2016 +0200 +++ b/dovecot/stuff/init.d/dovecot Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/dovecot : Start, stop and restart Dovecotserver on SliTaz, at +# /etc/init.d/dovecot : Start, stop and restart Dovecotserver on SliTaz, at # boot time or with the command line. # # To start SSH server at boot time, just put dovecot in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=dovecot -DESC="Dovecot daemon" +DESC="$(_ '%s daemon' Dovecot)" DAEMON=/usr/sbin/dovecot OPTIONS=$dovecot_OPTIONS PIDFILE=/var/run/dovecot/master.pid @@ -21,37 +21,36 @@ case "$1" in start) if active_pidfile $PIDFILE dovecot ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE dovecot ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE dovecot ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c dropbear/stuff/init.d/dropbear --- a/dropbear/stuff/init.d/dropbear Wed May 25 23:07:05 2016 +0200 +++ b/dropbear/stuff/init.d/dropbear Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/dropbear : Start, stop and restart SSH server on SliTaz, at +# /etc/init.d/dropbear : Start, stop and restart SSH server on SliTaz, at # boot time or with the command line. # # To start SSH server at boot time, just put dropbear in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Dropbear -DESC="SSH server" +DESC="$(_ '%s server' SSH)" DAEMON=/usr/sbin/dropbear OPTIONS=$DROPBEAR_OPTIONS PIDFILE=/var/run/dropbear.pid @@ -18,51 +18,50 @@ start) # We need rsa and dss host key file to start dropbear. if [ ! -s /etc/dropbear/dropbear_rsa_host_key ] ; then - echo -n "Generating $NAME rsa key... " + action 'Generating Dropbear %s key...' RSA # Need to delete key before creating it. rm -f /etc/dropbear/dropbear_rsa_host_key - dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1 + dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key >/dev/null 2>&1 status fi if [ ! -s /etc/dropbear/dropbear_dss_host_key ] ; then - echo -n "Generating $NAME dss key... " + action 'Generating Dropbear %s key...' DSS # Need to delete key before creating it. rm -f /etc/dropbear/dropbear_dss_host_key - dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1 + dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key >/dev/null 2>&1 status fi if active_pidfile $PIDFILE dropbear ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE dropbear ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE dropbear ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c fail2ban/stuff/etc/init.d/fail2ban --- a/fail2ban/stuff/etc/init.d/fail2ban Wed May 25 23:07:05 2016 +0200 +++ b/fail2ban/stuff/etc/init.d/fail2ban Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/fail2ban: Start, stop and restart Apache web server on SliTaz, +# /etc/init.d/fail2ban: Start, stop and restart Apache web server on SliTaz, # at boot time or with the command line. Daemons options are configured # with /etc/daemons.conf # @@ -7,7 +7,7 @@ . /etc/daemons.conf NAME=Fail2ban -DESC="Fail2ban Server" +DESC="$(_ '%s server' Fail2ban)" DAEMON=/usr/bin/fail2ban-client OPTIONS= PIDFILE=/var/run/fail2ban/fail2ban.pid @@ -16,43 +16,42 @@ case "$1" in start) if active_pidfile $PIDFILE fail2ban-server ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME rm -f $SOCKET - $DAEMON start > /dev/null + $DAEMON start >/dev/null status ;; stop) - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME $DAEMON stop rm -f $PIDFILE status ;; reload) if ! active_pidfile $PIDFILE fail2ban-server ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME $DAEMON stop status ;; restart) if ! active_pidfile $PIDFILE fail2ban-server ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME $0 stop $0 start status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|reload|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart|reload]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c fcron/receipt --- a/fcron/receipt Wed May 25 23:07:05 2016 +0200 +++ b/fcron/receipt Thu May 26 20:16:45 2016 +0300 @@ -17,7 +17,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -38,11 +37,12 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/ + mkdir -p $fs/usr/ $fs/etc/init.d + cp -a $install/usr/bin $fs/usr cp -a $install/usr/sbin/fcron $fs/usr/bin - cp -a $install/var $fs/ - cp -a $install/etc $fs/ - + cp -a $install/var $fs + cp -a $install/etc $fs + cp -a stuff/fcron $fs/etc/init.d } diff -r f7dd646afeb9 -r 7f188676b59c fcron/stuff/fcron --- a/fcron/stuff/fcron Wed May 25 23:07:05 2016 +0200 +++ b/fcron/stuff/fcron Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/fcron : Start, stop and fcron on SliTaz, at +# /etc/init.d/fcron : Start, stop and fcron on SliTaz, at # boot time or with the command line. # # To start SSH server at boot time, just put fcron in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=fcron -DESC="Cron daemon" +DESC="$(_ '%s daemon' Cron)" DAEMON=/usr/bin/fcron OPTIONS=-b PIDFILE=/var/run/fcron.pid @@ -17,37 +17,36 @@ case "$1" in start) if active_pidfile $PIDFILE fcron ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE fcron ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE fcron ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c git/stuff/git-daemon --- a/git/stuff/git-daemon Wed May 25 23:07:05 2016 +0200 +++ b/git/stuff/git-daemon Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=git-daemon -DESC="git-daemon daemon" +DESC="$(_ '%s daemon' Git)" DAEMON=/usr/lib/git-core/git-daemon OPTIONS=$GIT_OPTIONS PIDFILE=/var/run/git-daemon.pid @@ -17,37 +17,36 @@ case "$1" in start) if active_pidfile $PIDFILE git-daemon ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON --pid-file=$PIDFILE $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE git-daemon ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE git-daemon ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c gpm/stuff/etc/init.d/gpm --- a/gpm/stuff/etc/init.d/gpm Wed May 25 23:07:05 2016 +0200 +++ b/gpm/stuff/etc/init.d/gpm Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/gpm : Start, stop and restart gpm server on SliTaz, at +# /etc/init.d/gpm : Start, stop and restart gpm server on SliTaz, at # boot time or with the command line. # # To start gpm server at boot time, just put mysql in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=gpm -DESC="gpm server" +DESC="$(_ '%s server' GPM)" DAEMON=/usr/sbin/gpm OPTIONS=$GPM_OPTIONS [ -n "$OPTIONS" ] || OPTIONS="-m /dev/psaux -t ps2" @@ -17,34 +17,36 @@ case "$1" in start) if active_pidfile $PIDFILE gpm ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE gpm ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi + action 'Stopping %s: %s...' "$DESC" $NAME $DAEMON -k status ;; restart) if ! active_pidfile $PIDFILE gpm ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi + action 'Restarting %s: %s...' "$DESC" $NAME $DAEMON -k status $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c hal/stuff/etc/init.d/hald --- a/hal/stuff/etc/init.d/hald Wed May 25 23:07:05 2016 +0200 +++ b/hal/stuff/etc/init.d/hald Thu May 26 20:16:45 2016 +0300 @@ -7,7 +7,7 @@ . /etc/daemons.conf NAME=HAL -DESC="Hardware Abstraction Layer" +DESC="$(_ 'Hardware Abstraction Layer')" DAEMON=/usr/sbin/hald OPTIONS=$HALD_OPTIONS PIDFILE=/run/hald/pid @@ -15,37 +15,36 @@ case "$1" in start) if active_pidfile $PIDFILE hald ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME mkdir -p $(dirname $PIDFILE) $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE hald ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE hald ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) rm $PIDFILE sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c hostapd/stuff/hostapd --- a/hostapd/stuff/hostapd Wed May 25 23:07:05 2016 +0200 +++ b/hostapd/stuff/hostapd Thu May 26 20:16:45 2016 +0300 @@ -7,7 +7,7 @@ . /etc/daemons.conf NAME=hostapd -DESC="daemon for wireless software access points" +DESC="$(_ 'daemon for wireless software access points')" DAEMON=/usr/bin/hostapd PIDFILE=/var/run/hostapd.pid OPTIONS="-B -P $PIDFILE /etc/hostapd/hostapd.conf" @@ -15,39 +15,38 @@ case "$1" in start) if active_pidfile $PIDFILE hostapd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE hostapd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE hostapd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac -exit 0 \ No newline at end of file +exit 0 diff -r f7dd646afeb9 -r 7f188676b59c knock/stuff/etc/init.d/knock --- a/knock/stuff/etc/init.d/knock Wed May 25 23:07:05 2016 +0200 +++ b/knock/stuff/etc/init.d/knock Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/knock : Start, stop and restart knockd server on SliTaz, at +# /etc/init.d/knock : Start, stop and restart knockd server on SliTaz, at # boot time or with the command line. # # To start Knock server at boot time, just put knock in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Knock -DESC="Knock server" +DESC="$(_ '%s server' knock)" DAEMON=/usr/sbin/knockd OPTIONS=$KNOCK_OPTIONS PIDFILE=/var/run/knockd.pid @@ -19,37 +19,36 @@ case "$1" in start) if active_pidfile $PIDFILE knockd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE knockd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE knockd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c lighttpd/stuff/applications/lighttpd-status.desktop --- a/lighttpd/stuff/applications/lighttpd-status.desktop Wed May 25 23:07:05 2016 +0200 +++ b/lighttpd/stuff/applications/lighttpd-status.desktop Thu May 26 20:16:45 2016 +0300 @@ -1,10 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 +Type=Application Name=LightTPD server status Name[fr]=Status du serveur LightTPD Name[pt]=Status do servidor LightTPD Name[pt_BR]=Status do servidor LightTPD +Name[ru]=Состояние сервера LightTPD Exec=browser http://localhost/server-status -Icon=text-html -Type=Application -Categories=System; +Icon=network-server +Categories=System;Monitor; diff -r f7dd646afeb9 -r 7f188676b59c lighttpd/stuff/etc/init.d/lighttpd --- a/lighttpd/stuff/etc/init.d/lighttpd Wed May 25 23:07:05 2016 +0200 +++ b/lighttpd/stuff/etc/init.d/lighttpd Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/lighttpd: Start, stop and restart web server on SliTaz, +# /etc/init.d/lighttpd: Start, stop and restart web server on SliTaz, # at boot time or with the command line. Daemons options are configured # with /etc/daemons.conf # @@ -7,7 +7,7 @@ . /etc/daemons.conf NAME=LightTPD -DESC="web server" +DESC="$(_ 'web server')" DAEMON=/usr/sbin/lighttpd OPTIONS=$LIGHTTPD_OPTIONS PIDFILE=/var/run/lighttpd.pid @@ -15,39 +15,38 @@ case "$1" in start) if active_pidfile $PIDFILE lighttpd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE lighttpd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE lighttpd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c linux-zram/stuff/compcache --- a/linux-zram/stuff/compcache Wed May 25 23:07:05 2016 +0200 +++ b/linux-zram/stuff/compcache Thu May 26 20:16:45 2016 +0300 @@ -7,39 +7,39 @@ source /etc/compcache.conf NAME="compcache" -EXIST=`cat /proc/swaps | grep zram0` +DESC="$(_ '%s daemon' compcache)" +EXIST=$(cat /proc/swaps | grep zram0) case "$1" in start) - if [ ! "$EXIST" = "" ] ; then - echo "$NAME already running." + if [ -n "$EXIST" ] ; then + _ '%s is already running.' $NAME exit 1 fi - echo -n "Loading module" + action 'Loading module...' modprobe zram zram_num_devices=1 && [ -n "$SIZE_KB" ] && echo $(($SIZE_KB * 1024)) > /sys/block/zram0/disksize status - echo -n "Starting $NAME..." + action 'Starting %s: %s...' "$DESC" $NAME mkswap /dev/zram0 && swapon /dev/zram0 -p 100 status ;; stop) - if [ "$EXIST" = "" ] ; then - echo "$NAME is not running." + if [ -z "$EXIST" ] ; then + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME swapoff /dev/zram0 && echo 1 > /sys/block/zram0/reset status - echo -n "Unloading module" + action 'Unloading module...' rmmod zram status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c linux64-zram/stuff/compcache --- a/linux64-zram/stuff/compcache Wed May 25 23:07:05 2016 +0200 +++ b/linux64-zram/stuff/compcache Thu May 26 20:16:45 2016 +0300 @@ -7,39 +7,39 @@ source /etc/compcache.conf NAME="compcache" -EXIST=`cat /proc/swaps | grep zram0` +DESC="$(_ '%s daemon' compcache)" +EXIST=$(cat /proc/swaps | grep zram0) case "$1" in start) - if [ ! "$EXIST" = "" ] ; then - echo "$NAME already running." + if [ -n "$EXIST" ] ; then + _ '%s is already running.' $NAME exit 1 fi - echo -n "Loading module" + action 'Loading module...' modprobe zram zram_num_devices=1 && [ -n "$SIZE_KB" ] && echo $(($SIZE_KB * 1024)) > /sys/block/zram0/disksize status - echo -n "Starting $NAME..." + action 'Starting %s: %s...' "$DESC" $NAME mkswap /dev/zram0 && swapon /dev/zram0 -p 100 status ;; stop) - if [ "$EXIST" = "" ] ; then - echo "$NAME is not running." + if [ -z "$EXIST" ] ; then + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME swapoff /dev/zram0 && echo 1 > /sys/block/zram0/reset status - echo -n "Unloading module" + action 'Unloading module...' rmmod zram status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c lxdm/stuff/init.d/lxdm --- a/lxdm/stuff/init.d/lxdm Wed May 25 23:07:05 2016 +0200 +++ b/lxdm/stuff/init.d/lxdm Thu May 26 20:16:45 2016 +0300 @@ -8,43 +8,43 @@ . /etc/init.d/rc.functions NAME=LXDM -DESC="LXDE login manager" +DESC="$(_ 'LXDE login manager')" DAEMON=/usr/sbin/lxdm PIDFILE=/var/run/lxdm.pid case "$1" in start) if active_pidfile $PIDFILE lxdm ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTION status ;; stop) if ! active_pidfile $PIDFILE lxdm ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME killall lxdm rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE lxdm ; then - echo "$NAME is not running." + _ '%s is not running.' exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME killall lxdm rm $PIDFILE sleep 2 $DAEMON $OPTION status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/$(basename $0) [start|stop|restart]" - echo "" && exit 1 ;; + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline + exit 1 ;; esac exit 0 diff -r f7dd646afeb9 -r 7f188676b59c lxnetdaemon/stuff/etc/init.d/lxnetdaemon --- a/lxnetdaemon/stuff/etc/init.d/lxnetdaemon Wed May 25 23:07:05 2016 +0200 +++ b/lxnetdaemon/stuff/etc/init.d/lxnetdaemon Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/lxnetdaemon: Start, stop and restart LXnetdaemon deamon on +# /etc/init.d/lxnetdaemon: Start, stop and restart LXnetdaemon deamon on # SliTaz, at boot time or with the command line. # # To start daemon at boot time, just put the right name in the $RUN_DAEMONS @@ -9,38 +9,38 @@ . /etc/daemons.conf NAME=LXnetdaemon -DESC="Network daemon" +DESC="$(_ 'Network daemon')" DAEMON=/usr/bin/lxnetdaemon PIDFILE=/var/run/lxnetdaemon.pid case "$1" in start) if active_pidfile $PIDFILE lxnetdaemon ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status pidof lxnetdaemon > $PIDFILE ;; stop) if ! active_pidfile $PIDFILE lxnetdaemon ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE lxnetdaemon ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE sleep 2 $DAEMON $OPTIONS @@ -48,9 +48,8 @@ pidof lxnetdaemon > $PIDFILE ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c mariadb/stuff/etc/init.d/mysql --- a/mariadb/stuff/etc/init.d/mysql Wed May 25 23:07:05 2016 +0200 +++ b/mariadb/stuff/etc/init.d/mysql Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/mysql : Start, stop and restart MySQL server on SliTaz, at +# /etc/init.d/mysql : Start, stop and restart MySQL server on SliTaz, at # boot time or with the command line. # # To start MySQL server at boot time, just put mysql in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Mysql -DESC="MySQL server" +DESC="$(_ '%s server' MySQL)" DAEMON=/usr/bin/mysqld_safe OPTIONS=$MYSQL_OPTIONS PIDFILE=/var/run/mysqld/mysql.pid @@ -22,51 +22,51 @@ case "$1" in start) if active_pidfile $PIDFILE mysqld ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi if [ ! -d /var/lib/mysql/mysql ]; then - echo "Initializing $DESC: " - rm -rf /var/lib/mysql/* 2> /dev/null + action 'Initializing %s...' "$DESC" + rm -rf /var/lib/mysql/* 2>/dev/null mysql_install_db --user=mysql --datadir=/var/lib/mysql + status fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS > /dev/null & + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS >/dev/null & status sleep 2 for i in /etc/mysql.d/* ; do - [ -x $i ] || continue - echo -n "Running $i..." - $i - status + [ -x $i ] || continue + action 'Running %s...' $i + $i + status done ;; stop) if ! active_pidfile $PIDFILE mysqld ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE`> /dev/null + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) >/dev/null status sleep 2 ;; restart) if ! active_pidfile $PIDFILE mysqld ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS & status sleep 2 ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c motion/stuff/init.d/motion --- a/motion/stuff/init.d/motion Wed May 25 23:07:05 2016 +0200 +++ b/motion/stuff/init.d/motion Thu May 26 20:16:45 2016 +0300 @@ -6,42 +6,46 @@ . /etc/init.d/rc.functions NAME=Motion -DESC="Video detection" +DESC="$(_ 'Video detection daemon')" DAEMON=/usr/bin/motion PIDFILE=/run/motion/motion.pid case "$1" in start) if active_pidfile $PIDFILE motion ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME mkdir -p $(dirname $PIDFILE) - $DAEMON -p $PIDFILE ;; + $DAEMON -p $PIDFILE + status + ;; stop) if ! active_pidfile $PIDFILE motion ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) rm $PIDFILE - status ;; + status + ;; restart) if ! active_pidfile $PIDFILE motion ; then echo "$NAME is not running." exit 1 fi - echo "Restarting $DESC: $NAME... " + _ 'Restarting %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) rm $PIDFILE sleep 2 - $DAEMON -p $PIDFILE ;; + $DAEMON -p $PIDFILE + status + ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c mpd/stuff/etc/init.d/mpd --- a/mpd/stuff/etc/init.d/mpd Wed May 25 23:07:05 2016 +0200 +++ b/mpd/stuff/etc/init.d/mpd Thu May 26 20:16:45 2016 +0300 @@ -8,48 +8,47 @@ . /etc/init.d/rc.functions NAME=mpd -DESC="Music Player Daemon" +DESC="$(_ 'Music Player Daemon')" DAEMON=/usr/sbin/mpd OPTION="/etc/mpd.conf" PIDFILE="/var/run/mpd.pid" case "$1" in -start) - if active_pidfile $PIDFILE mpd ; then - echo "$NAME already running." + start) + if active_pidfile $PIDFILE mpd ; then + _ '%s is already running.' $NAME + exit 1 + fi + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTION 2>/dev/null + status + pidof $NAME > $PIDFILE + ;; + stop) + if ! active_pidfile $PIDFILE mpd ; then + _ '%s is not running.' $NAME + exit 1 + fi + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(pidof $NAME) + status + ;; + restart) + if ! active_pidfile $PIDFILE mpd ; then + _ '%s is not running.' $NAME + exit 1 + fi + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(pidof $NAME) + sleep 2 + $DAEMON $OPTION 2>/dev/null + status + ;; + *) + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 - fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTION 2> /dev/null - status - pidof $NAME > $PIDFILE - ;; -stop) - if ! active_pidfile $PIDFILE mpd ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Stopping $DESC: $NAME... " - kill $(pidof $NAME) - status - ;; -restart) - if ! active_pidfile $PIDFILE mpd ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Restarting $DESC: $NAME... " - kill $(pidof $NAME) - sleep 2 - $DAEMON $OPTION 2> /dev/null - status - ;; -*) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/$(basename $0) [start|stop|restart]" - echo "" - exit 1 - ;; + ;; esac exit 0 diff -r f7dd646afeb9 -r 7f188676b59c mysql/stuff/etc/init.d/mysql --- a/mysql/stuff/etc/init.d/mysql Wed May 25 23:07:05 2016 +0200 +++ b/mysql/stuff/etc/init.d/mysql Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/mysql : Start, stop and restart MySQL server on SliTaz, at +# /etc/init.d/mysql : Start, stop and restart MySQL server on SliTaz, at # boot time or with the command line. # # To start MySQL server at boot time, just put mysql in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Mysql -DESC="MySQL server" +DESC="$(_ '%s server' MySQL)" DAEMON=/usr/bin/mysqld_safe OPTIONS=$MYSQL_OPTIONS PIDFILE=/var/run/mysqld/mysql.pid @@ -22,51 +22,51 @@ case "$1" in start) if active_pidfile $PIDFILE mysqld ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi if [ ! -d /var/lib/mysql/mysql ]; then - echo "Initializing $DESC: " - rm -rf /var/lib/mysql/* 2> /dev/null + action 'Initializing %s...' "$DESC" + rm -rf /var/lib/mysql/* 2>/dev/null mysql_install_db --user=mysql --datadir=/var/lib/mysql + status fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS > /dev/null & + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS >/dev/null & status sleep 2 for i in /etc/mysql.d/* ; do - [ -x $i ] || continue - echo -n "Running $i..." - $i - status + [ -x $i ] || continue + action 'Running %s...' $i + $i + status done ;; stop) if ! active_pidfile $PIDFILE mysqld ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE`> /dev/null + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) >/dev/null status sleep 2 ;; restart) if ! active_pidfile $PIDFILE mysqld ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS & status sleep 2 ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c nagios-nrpe/stuff/nrpe --- a/nagios-nrpe/stuff/nrpe Wed May 25 23:07:05 2016 +0200 +++ b/nagios-nrpe/stuff/nrpe Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/nrpe : Start, stop and restart NRPE Server on SliTaz, at +# /etc/init.d/nrpe : Start, stop and restart NRPE Server on SliTaz, at # boot time or with the command line. # # To start SSH server at boot time, just put nagios in the $RUN_DAEMONS @@ -9,50 +9,49 @@ . /etc/daemons.conf NAME=NRPE -DESC="NRPE daemon" +DESC="$(_ '%s daemon' NRPE)" DAEMON=/usr/bin/nrpe CONFIG_FILE="/etc/nagios/nrpe.cfg" OPTIONS="-n -c $CONFIG_FILE -d" PIDFILE=/var/run/nagios/nrpe.pid if [ ! -d /var/run/nagios ]; then - mkdir -p /var/run/nagios - chown nagios.nagios /var/run/nagios + mkdir -p /var/run/nagios + chown nagios.nagios /var/run/nagios fi case "$1" in start) if active_pidfile $PIDFILE nrpe ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE nrpe ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart|reload) if ! active_pidfile $PIDFILE nrpe ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart|reload]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart|reload]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c nagios/stuff/nagios --- a/nagios/stuff/nagios Wed May 25 23:07:05 2016 +0200 +++ b/nagios/stuff/nagios Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/nagios : Start, stop and restart Nagios server on SliTaz, at +# /etc/init.d/nagios : Start, stop and restart Nagios server on SliTaz, at # boot time or with the command line. # # To start Nagios at boot time, just put nagios in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Nagios -DESC="Network Monitoring Server" +DESC="$(_ 'Network Monitoring Server')" DAEMON=/usr/bin/nagios CONFIG_FILE="/etc/nagios/nagios.cfg" OPTIONS="-d $CONFIG_FILE" @@ -17,50 +17,50 @@ configtest() { - $DAEMON -v $CONFIG_FILE + $DAEMON -v $CONFIG_FILE } if [ ! -d /var/run/nagios ]; then - mkdir -p /var/run/nagios - chown nagios.nagios /var/run/nagios + mkdir -p /var/run/nagios + chown nagios.nagios /var/run/nagios fi case "$1" in start) if active_pidfile $PIDFILE nagios ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS - #/usr/bin/nagios -d /etc/nagios/nagios.cfg + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS + #/usr/bin/nagios -d /etc/nagios/nagios.cfg status ;; stop) if ! active_pidfile $PIDFILE nagios ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + status 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart|reload) if ! active_pidfile $PIDFILE nagios ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; test) - configtest ;; + configtest + ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart|reload]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart|reload|test]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c netatalk-pam/stuff/etc/init.d/netatalk --- a/netatalk-pam/stuff/etc/init.d/netatalk Wed May 25 23:07:05 2016 +0200 +++ b/netatalk-pam/stuff/etc/init.d/netatalk Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# Start, stop and restart the netatalk deamons on SliTaz, at boot time or +# Start, stop and restart the netatalk deamons on SliTaz, at boot time or # with the command line. # # To start netatalk at boot time, just put the right name in the $RUN_DAEMONS @@ -8,7 +8,7 @@ . /etc/init.d/rc.functions NAME=atalkd -DESC="netatalk deamons" +DESC="$(_ 'Netatalk daemons')" PIDFILE=/var/run/$NAME.pid AFPD_UAMLIST="-U uams_dhx.so,uams_clrtxt.so,uams_randnum.so" AFPD_GUEST=nobody @@ -22,7 +22,7 @@ # Start Netatalk servers. atalk_startup() { - if [ "$ATALKD_RUN" = "yes" ]; then + if [ "$ATALKD_RUN" == "yes" ]; then modprobe appletalk atalkd pidof atalkd > $PIDFILE @@ -31,51 +31,50 @@ nbprgstr -p 4 "$ATALK_NAME:Workstation$ATALK_ZONE" nbprgstr -p 4 "$ATALK_NAME:netatalk$ATALK_ZONE" - [ "$PAPD_RUN" = "yes" ] && papd - [ "$TIMELORD_RUN" = "yes" ] && timelord + [ "$PAPD_RUN" == "yes" ] && papd + [ "$TIMELORD_RUN" == "yes" ] && timelord fi - [ "$AFPD_RUN" = "yes" ] && afpd $AFPD_UAMLIST -g $AFPD_GUEST \ + [ "$AFPD_RUN" == "yes" ] && afpd $AFPD_UAMLIST -g $AFPD_GUEST \ -c $AFPD_MAX_CLIENTS -n "$ATALK_NAME$ATALK_ZONE" } case "$1" in -start) - if active_pidfile $PIDFILE $NAME ; then - echo "$NAME is already running." + start) + if active_pidfile $PIDFILE $NAME ; then + _ '%s is already running.' $NAME + exit 1 + fi + action 'Starting %s: %s...' "$DESC" $NAME + if [ "$ATALK_BGROUND" == "yes" ]; then + atalk_startup >/dev/null & + else + atalk_startup + fi + status + ;; + stop) + if ! active_pidfile $PIDFILE $NAME ; then + _ '%s is not running.' $NAME + exit 1 + fi + action 'Stopping %s: %s...' "$DESC" $NAME + killall afpd + killall papd + killall timelord + killall atalkd + status + ;; + restart) + $0 start + sleep 2 + $0 stop + ;; + *) + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 - fi - echo -n "Starting $DESC: $NAME... " - if [ "$ATALK_BGROUND" == "yes" ]; then - atalk_startup >/dev/null & - else - atalk_startup - fi - status - ;; -stop) - if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Stopping $DESC: $NAME... " - killall afpd - killall papd - killall timelord - killall atalkd - status - ;; -restart) - $0 start - sleep 2 - $0 stop - ;; -*) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" - exit 1 - ;; + ;; esac exit 0 diff -r f7dd646afeb9 -r 7f188676b59c netatalk/stuff/etc/init.d/netatalk --- a/netatalk/stuff/etc/init.d/netatalk Wed May 25 23:07:05 2016 +0200 +++ b/netatalk/stuff/etc/init.d/netatalk Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# Start, stop and restart the netatalk deamons on SliTaz, at boot time or +# Start, stop and restart the netatalk deamons on SliTaz, at boot time or # with the command line. # # To start netatalk at boot time, just put the right name in the $RUN_DAEMONS @@ -8,7 +8,7 @@ . /etc/init.d/rc.functions NAME=atalkd -DESC="netatalk deamons" +DESC="$(_ 'Netatalk daemons')" PIDFILE=/var/run/$NAME.pid AFPD_UAMLIST="-U uams_dhx.so,uams_clrtxt.so,uams_randnum.so" AFPD_GUEST=nobody @@ -22,7 +22,7 @@ # Start Netatalk servers. atalk_startup() { - if [ "$ATALKD_RUN" = "yes" ]; then + if [ "$ATALKD_RUN" == "yes" ]; then modprobe appletalk atalkd pidof atalkd > $PIDFILE @@ -31,8 +31,8 @@ nbprgstr -p 4 "$ATALK_NAME:Workstation$ATALK_ZONE" nbprgstr -p 4 "$ATALK_NAME:netatalk$ATALK_ZONE" - [ "$PAPD_RUN" = "yes" ] && papd - [ "$TIMELORD_RUN" = "yes" ] && timelord + [ "$PAPD_RUN" == "yes" ] && papd + [ "$TIMELORD_RUN" == "yes" ] && timelord fi [ "$AFPD_RUN" = "yes" ] && afpd $AFPD_UAMLIST -g $AFPD_GUEST \ @@ -40,42 +40,41 @@ } case "$1" in -start) - if active_pidfile $PIDFILE $NAME ; then - echo "$NAME is already running." + start) + if active_pidfile $PIDFILE $NAME ; then + _ '%s is already running.' $NAME + exit 1 + fi + action 'Starting %s: %s...' "$DESC" $NAME + if [ "$ATALK_BGROUND" == "yes" ]; then + atalk_startup >/dev/null & + else + atalk_startup + fi + status + ;; + stop) + if ! active_pidfile $PIDFILE $NAME ; then + _ '%s is not running.' $NAME + exit 1 + fi + action 'Stopping %s: %s...' "$DESC" $NAME + killall afpd + killall papd + killall timelord + killall atalkd + status + ;; + restart) + $0 start + sleep 2 + $0 stop + ;; + *) + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 - fi - echo -n "Starting $DESC: $NAME... " - if [ "$ATALK_BGROUND" == "yes" ]; then - atalk_startup >/dev/null & - else - atalk_startup - fi - status - ;; -stop) - if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Stopping $DESC: $NAME... " - killall afpd - killall papd - killall timelord - killall atalkd - status - ;; -restart) - $0 start - sleep 2 - $0 stop - ;; -*) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" - exit 1 - ;; + ;; esac exit 0 diff -r f7dd646afeb9 -r 7f188676b59c nfs-utils/stuff/etc/init.d/nfsd --- a/nfs-utils/stuff/etc/init.d/nfsd Wed May 25 23:07:05 2016 +0200 +++ b/nfs-utils/stuff/etc/init.d/nfsd Thu May 26 20:16:45 2016 +0300 @@ -8,7 +8,7 @@ . /etc/init.d/rc.functions NAME=NFSd -DESC="NFS Daemon" +DESC="$(_ '%s daemon' NFS)" DAEMON=/usr/sbin/rpc.nfsd PID_FILE=/var/run/nfsd.pid OPTION="8" @@ -16,24 +16,24 @@ stop_warning() { -echo "Warning: filesystems are unexported but nfsd and lockd processes are still alive..." + echo "Warning: filesystems are unexported but nfsd and lockd processes are still alive..." } case "$1" in start) if active_pidfile $PID_FILE nfsd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME portmap="$(pidof portmap)" if [ -n "$portmap" ]; then - kill $portmap - sleep 2 + kill $portmap + sleep 2 fi [ -n "$(pidof rpcbind)" ] || rpcbind modprobe nfsd - mount -t nfsd nfsd /proc/fs/nfsd 2> /dev/null + mount -t nfsd nfsd /proc/fs/nfsd 2>/dev/null /usr/sbin/exportfs -r $DAEMON $OPTION pidof nfsd | awk '{print $1}' > $PID_FILE @@ -42,10 +42,10 @@ ;; stop) if ! active_pidfile $PID_FILE nfsd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME killall rpc.mountd killall nfsd killall lockd @@ -57,10 +57,10 @@ ;; restart) if ! active_pidfile $PID_FILE nfsd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME killall rpc.mountd killall nfsd killall lockd @@ -74,9 +74,8 @@ status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c nginx-extras/stuff/etc/init.d/nginx --- a/nginx-extras/stuff/etc/init.d/nginx Wed May 25 23:07:05 2016 +0200 +++ b/nginx-extras/stuff/etc/init.d/nginx Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/nginx: Start, stop and restart web server on SliTaz, +# /etc/init.d/nginx: Start, stop and restart web server on SliTaz, # at boot time or with the command line. Daemons options are configured # with /etc/daemons.conf # @@ -7,7 +7,7 @@ . /etc/daemons.conf NAME=Nginx -DESC="web server" +DESC="$(_ 'web server')" DAEMON=/usr/sbin/nginx OPTIONS=$NGINX_OPTIONS PIDFILE=/var/run/nginx.pid @@ -15,39 +15,38 @@ case "$1" in start) if active_pidfile $PIDFILE nginx ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE nginx ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE nginx ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c nginx/stuff/etc/init.d/nginx --- a/nginx/stuff/etc/init.d/nginx Wed May 25 23:07:05 2016 +0200 +++ b/nginx/stuff/etc/init.d/nginx Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/nginx: Start, stop and restart web server on SliTaz, +# /etc/init.d/nginx: Start, stop and restart web server on SliTaz, # at boot time or with the command line. Daemons options are configured # with /etc/daemons.conf # @@ -7,7 +7,7 @@ . /etc/daemons.conf NAME=Nginx -DESC="web server" +DESC="$(_ 'web server')" DAEMON=/usr/sbin/nginx OPTIONS=$NGINX_OPTIONS PIDFILE=/var/run/nginx.pid @@ -15,39 +15,38 @@ case "$1" in start) if active_pidfile $PIDFILE nginx ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE nginx ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE nginx ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c nscd/stuff/nscd --- a/nscd/stuff/nscd Wed May 25 23:07:05 2016 +0200 +++ b/nscd/stuff/nscd Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=nscd -DESC="Name Switch Cache Daemon" +DESC="$(_ 'name-server caching daemon')" DAEMON=/usr/sbin/nscd OPTIONS=$NSCD_OPTIONS PIDFILE=/var/run/nscd/nscd.pid @@ -20,41 +20,39 @@ case "$1" in start) if active_pidfile $PIDFILE nscd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status sleep 2 ;; stop) if ! active_pidfile $PIDFILE nscd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status sleep 2 ;; restart) if ! active_pidfile $PIDFILE nscd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status sleep 2 ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart -]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c ntop/stuff/etc/init.d/ntop --- a/ntop/stuff/etc/init.d/ntop Wed May 25 23:07:05 2016 +0200 +++ b/ntop/stuff/etc/init.d/ntop Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/ntop : Start, stop and restart ntop daemon on SliTaz, at +# /etc/init.d/ntop : Start, stop and restart ntop daemon on SliTaz, at # boot time or with the command line. # # To start SSH server at boot time, just put ntop in the $RUN_DAEMONS @@ -9,7 +9,7 @@ NAME=ntop -DESC="ntop server" +DESC="$(_ '%s server' ntop)" DAEMON=/usr/bin/ntop HTTP_PORT="3000" @@ -23,41 +23,40 @@ case "$1" in start) if active_pidfile $PIDFILE $NAME ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi # We need to set ntop admin password. if [ ! -f /var/ntop/ntop_pw.db ] ; then - ntop -A || exit + ntop -A || exit fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS >> $LOGFILE status ;; stop) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` && rm -f $PIDFILE + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) && rm -f $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` && rm -f $PIDFILE + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) && rm -f $PIDFILE sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c ntp/stuff/ntp --- a/ntp/stuff/ntp Wed May 25 23:07:05 2016 +0200 +++ b/ntp/stuff/ntp Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/ntp : Start, stop and restart ntp server on SliTaz, at +# /etc/init.d/ntp : Start, stop and restart ntp server on SliTaz, at # boot time or with the command line. # # To start ntp server at boot time, just put ntp in the $RUN_DAEMONS @@ -9,49 +9,47 @@ . /etc/daemons.conf NAME=ntp -DESC="ntp server" +DESC="$(_ '%s server' NTP)" DAEMON=/usr/bin/ntpd OPTIONS=$NTP_OPTIONS PIDFILE=/var/run/ntpd.pid [ -n "$OPTIONS" ] || OPTIONS="-p $PIDFILE -c /etc/ntp.conf" - case "$1" in start) if active_pidfile $PIDFILE ntpd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status pgrep $DAEMON > $PIDFILE # it seems that -p doesn't work ? ;; stop) if ! active_pidfile $PIDFILE ntpd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE ntpd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) $DAEMON $OPTIONS status pgrep $DAEMON > $PIDFILE # it seems that -p doesn't work ? ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c ofono/stuff/etc/init.d/ofono --- a/ofono/stuff/etc/init.d/ofono Wed May 25 23:07:05 2016 +0200 +++ b/ofono/stuff/etc/init.d/ofono Thu May 26 20:16:45 2016 +0300 @@ -10,7 +10,7 @@ . /etc/daemons.conf NAME=Ofono -DESC="Mobile telephony Manager" +DESC="$(_ 'Mobile telephony Manager')" DAEMON=/usr/sbin/ofonod OPTIONS=$OFONO_OPTIONS PIDFILE=/var/run/ofono.pid @@ -18,30 +18,30 @@ case "$1" in start) if active_pidfile $PIDFILE ofonod ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status pidof ofonod > $PIDFILE ;; stop) if ! active_pidfile $PIDFILE ofonod ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME rm -rf $PIDFILE kill $(pidof ofonod) status ;; restart) if ! active_pidfile $PIDFILE ofonod ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME rm -rf $PIDFILE kill $(pidof ofonod) && sleep 2 && @@ -49,9 +49,8 @@ status ;; *) - printf "\n\033[1mUsage:\033[0m /etc/init.d/%b [start|stop|restart]\n" \ - "$(basename $0)" - exit 1 + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline ;; esac diff -r f7dd646afeb9 -r 7f188676b59c open-vm-tools/stuff/vmtoolsd --- a/open-vm-tools/stuff/vmtoolsd Wed May 25 23:07:05 2016 +0200 +++ b/open-vm-tools/stuff/vmtoolsd Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/vmtoolsd : Start, stop and restart Open VM Tools daemon on SliTaz, at +# /etc/init.d/vmtoolsd : Start, stop and restart Open VM Tools daemon on SliTaz, at # boot time or with the command line. # # To start VMTools daemon at boot time, just put vmtoolsd in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=VMTools -DESC="VMTools" +DESC="$(_ '%s daemon' VMTools)" DAEMON=/usr/bin/vmtoolsd PIDFILE=/var/run/vmtoolsd.pid OPTIONS="-b $PIDFILE" @@ -17,10 +17,10 @@ case "$1" in start) if active_pidfile $PIDFILE vmtoolsd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME modprobe vmblock modprobe vmhgfs modprobe vmci @@ -31,28 +31,27 @@ ;; stop) if ! active_pidfile $PIDFILE vmtoolsd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME kill `cat $PIDFILE` status ;; restart) if ! active_pidfile $PIDFILE vmtoolsd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c openerp-server/stuff/etc/init.d/openerp-server --- a/openerp-server/stuff/etc/init.d/openerp-server Wed May 25 23:07:05 2016 +0200 +++ b/openerp-server/stuff/etc/init.d/openerp-server Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/openerp-server : Start, stop and restart OpenERP server on SliTaz, at +# /etc/init.d/openerp-server : Start, stop and restart OpenERP server on SliTaz, at # boot time or with the command line. # # To start OpenERP server at boot time, just put openerp-server in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=OpenERP -DESC="OpenERP server" +DESC="$(_ '%s server' OpenERP)" DAEMON=/usr/bin/openerp-server OPTIONS=$OPENERP_OPTIONS PIDFILE=/var/run/openerp/openerp-server.pid @@ -30,44 +30,43 @@ case "$1" in start) if active_pidfile $PIDFILE python ; then - echo "$NAME already running (PID: `cat $PIDFILE`)." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS & status sleep 4 - # At boot OpenERP dont start correctly if we start it in background. + # At boot OpenERP don't start correctly if we start it in background. if ! active_pidfile $PIDFILE python ; then sleep 6 $DAEMON $OPTIONS > $LOGFILE fi ;; stop) if ! active_pidfile $PIDFILE python ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm -f $PIDFILE status sleep 2 ;; restart) if ! active_pidfile $PIDFILE python ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` - rm -f $PIDFILE 2> /dev/null + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + rm -f $PIDFILE 2>/dev/null sleep 2 $DAEMON $OPTIONS & status sleep 2 ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c openerp-web/stuff/etc/init.d/openerp-web --- a/openerp-web/stuff/etc/init.d/openerp-web Wed May 25 23:07:05 2016 +0200 +++ b/openerp-web/stuff/etc/init.d/openerp-web Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/openerp-web : Start, stop and restart openerp-web server on SliTaz, at +# /etc/init.d/openerp-web : Start, stop and restart openerp-web server on SliTaz, at # boot time or with the command line. # # To start openerp-web server at boot time, just put etiny in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=openerp-web -DESC="openerp-web server" +DESC="$(_ 'openerp-web server')" DAEMON=/usr/bin/openerp-web OPTIONS=$OPENERP_WEB_OPTIONS PIDFILE=/var/run/openerp-web.pid @@ -19,37 +19,36 @@ case "$1" in start) if active_pidfile $PIDFILE $NAME ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS & status sleep 2 ;; stop) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status sleep 2 ;; restart) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS & status sleep 2 ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c openldap/stuff/etc/init.d/openldap --- a/openldap/stuff/etc/init.d/openldap Wed May 25 23:07:05 2016 +0200 +++ b/openldap/stuff/etc/init.d/openldap Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/openldap : Start, stop and restart LDAP server on SliTaz, at +# /etc/init.d/openldap : Start, stop and restart LDAP server on SliTaz, at # boot time or with the command line. # # To start LDAP server at boot time, just put openldap in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Openldap -DESC="LDAP server" +DESC="$(_ '%s server' LDAP)" DAEMON=/usr/lib/openldap/slapd OPTIONS=$LDAP_OPTIONS PIDFILE=/var/lib/openldap/run/slapd.pid @@ -17,43 +17,42 @@ case "$1" in start) if active_pidfile $PIDFILE slapd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS && sleep 2 status for i in /etc/ldap.d/* ; do - [ -x $i ] || continue - echo -n "Running $i..." - $i - status + [ -x $i ] || continue + action 'Running %s...' $i + $i + status done ;; stop) if ! active_pidfile $PIDFILE slapd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE slapd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS && sleep 2 status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c openssh/stuff/openssh --- a/openssh/stuff/openssh Wed May 25 23:07:05 2016 +0200 +++ b/openssh/stuff/openssh Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=OpenSSH -DESC="OpenSSH server" +DESC="$(_ '%s server' OpenSSH)" DAEMON=/usr/sbin/sshd OPTIONS=$OPENSSH_OPTIONS PIDFILE=/var/run/sshd.pid @@ -20,47 +20,47 @@ start) # We need rsa and dsa host key file to start dropbear. if [ ! -f /etc/ssh/ssh_host_rsa_key ] ; then - echo "Generating $NAME rsa key... " + _ 'Generating OpenSSH %s key... ' rsa ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -C '' -N '' fi if [ ! -f /etc/ssh/ssh_host_dsa_key ] ; then - echo "Generating $NAME dsa key... " + _ 'Generating OpenSSH %s key... ' dsa ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -C '' -N '' fi if [ ! -f /etc/ssh/ssh_host_ecdsa_key ] ; then - echo "Generating $NAME ecdsa key... " + _ 'Generating OpenSSH %s key... ' ecdsa ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -C '' -N '' fi if active_pidfile $PIDFILE sshd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - action "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE sshd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - action "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE sshd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - action "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - emsg "Usage: /etc/init.d/$(basename $0) [start|stop|restart]" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" newline exit 1 ;; diff -r f7dd646afeb9 -r 7f188676b59c openvpn/stuff/etc/init.d/openvpn-client --- a/openvpn/stuff/etc/init.d/openvpn-client Wed May 25 23:07:05 2016 +0200 +++ b/openvpn/stuff/etc/init.d/openvpn-client Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=OpenVPN -DESC="VPN daemon" +DESC="$(_ '%s daemon' VPN)" DAEMON=/usr/sbin/openvpn OPTIONS=$OPENVPN_OPTIONS PIDFILE=/var/run/openvpni-client.pid @@ -17,60 +17,60 @@ checktundevice() { if [ ! -e /dev/net/tun ]; then if ! modprobe tun ; then - echo -n "TUN/TAP support is not available in this kernel" + _ 'TUN/TAP support is not available in this Kernel' return 1 fi fi - if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then - echo -n "Detected broken /dev/net/tun symlink, fixing..." + if [ -h /dev/net/tun -a -c /dev/misc/net/tun ]; then + _ 'Detected broken %s symlink, fixing...' '/dev/net/tun' rm -f /dev/net/tun ln -s /dev/misc/net/tun /dev/net/tun fi } [ -d /var/run/openvpn ] || mkdir -p /var/run/openvpn + case "$1" in start) checktundevice if [ ! -e /etc/openvpn/client.conf ]; then - echo "Missing OpenVPN client config." + _ 'Missing OpenVPN client config.' exit 1 fi if active_pidfile $PIDFILE openvpn ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON --client $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE openvpn ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE openvpn ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE sleep 2 $DAEMON --client $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c openvpn/stuff/etc/init.d/openvpn-server --- a/openvpn/stuff/etc/init.d/openvpn-server Wed May 25 23:07:05 2016 +0200 +++ b/openvpn/stuff/etc/init.d/openvpn-server Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=OpenVPN -DESC="VPN daemon" +DESC="$(_ '%s daemon' VPN)" DAEMON=/usr/sbin/openvpn OPTIONS=$OPENVPN_OPTIONS PIDFILE=/var/run/openvpn-server.pid @@ -17,60 +17,60 @@ checktundevice() { if [ ! -e /dev/net/tun ]; then if ! modprobe tun ; then - echo -n "TUN/TAP support is not available in this kernel" + _ 'TUN/TAP support is not available in this Kernel' return 1 fi fi - if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then - echo -n "Detected broken /dev/net/tun symlink, fixing..." + if [ -h /dev/net/tun -a -c /dev/misc/net/tun ]; then + _ 'Detected broken %s symlink, fixing...' '/dev/net/tun' rm -f /dev/net/tun ln -s /dev/misc/net/tun /dev/net/tun fi } [ -d /var/run/openvpn ] || mkdir -p /var/run/openvpn + case "$1" in start) checktundevice if [ ! -e /etc/openvpn/server.conf ]; then - echo "Missing OpenVPN server config." - exit 1 + _ 'Missing OpenVPN server config.' + exit 1 fi if active_pidfile $PIDFILE openvpn ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE openvpn ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE openvpn ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c partimage/stuff/etc/init.d/partimaged --- a/partimage/stuff/etc/init.d/partimaged Wed May 25 23:07:05 2016 +0200 +++ b/partimage/stuff/etc/init.d/partimaged Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=partimaged -DESC="Partimage Server" +DESC="$(_ '%s server' Partimage)" DAEMON=/usr/sbin/partimaged IMAGES_DIR=/var/lib/partimaged OPTIONS="-D -d ${IMAGES_DIR}" @@ -17,45 +17,43 @@ test -f $DAEMON || exit 0 - - - + case "$1" in - start) - if active_pidfile $PIDFILE $NAME ; then - echo "$NAME already running." - exit 1 - fi - - check_conf - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS - status - - # registering PID - if [ $? -eq 0 ]; then - pidof -s $NAME > $PIDFILE - fi - ;; - stop) - if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` - rm -f $PIDFILE - status - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: $DAEMON {start|stop|reload|restart}" - exit 1 - ;; + start) + if active_pidfile $PIDFILE $NAME ; then + _ '%s is already running.' $NAME + exit 1 + fi + + check_conf + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS + status + + # registering PID + if [ $? -eq 0 ]; then + pidof -s $NAME > $PIDFILE + fi + ;; + stop) + if ! active_pidfile $PIDFILE $NAME ; then + _ '%s is not running.' $NAME + exit 1 + fi + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + rm -f $PIDFILE + status + ;; + restart) + $0 stop + $0 start + ;; + *) + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline + exit 1 + ;; esac exit 0 - diff -r f7dd646afeb9 -r 7f188676b59c pcsc-lite/stuff/init.d/pcscd --- a/pcsc-lite/stuff/init.d/pcscd Wed May 25 23:07:05 2016 +0200 +++ b/pcsc-lite/stuff/init.d/pcscd Thu May 26 20:16:45 2016 +0300 @@ -7,25 +7,26 @@ . /etc/daemons.conf NAME=Pcscd -DESC="PC/SC smart card daemon" +DESC="$(_ 'PC/SC smart card daemon')" DAEMON=/usr/sbin/pcscd PIDFILE=/run/pcscd/pcscd.pid case "$1" in start) if active_pidfile $PIDFILE pcscd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME mkdir -p $(dirname $PIDFILE) - $DAEMON $PCSCD_OPTIONS ;; + $DAEMON $PCSCD_OPTIONS + status ;; stop) if ! active_pidfile $PIDFILE pcscd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) [ -e $PIDFILE ] && rm -f $PIDFILE status ;; @@ -34,9 +35,8 @@ sleep 2 $0 start ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/$(basename $0) [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c perdition/stuff/etc/init.d/perdition --- a/perdition/stuff/etc/init.d/perdition Wed May 25 23:07:05 2016 +0200 +++ b/perdition/stuff/etc/init.d/perdition Thu May 26 20:16:45 2016 +0300 @@ -10,7 +10,7 @@ . /etc/daemons.conf NAME=Perdition -DESC="IMAP/POP3 proxy server" +DESC="$(_ 'IMAP/POP3 proxy server')" DAEMON=/usr/sbin/perdition OPTIONS=$PERDITION_OPTIONS PIDFILE=/var/run/perdition @@ -22,12 +22,12 @@ for i in $PROTOCOLS; do [ -s /etc/perdition/perdition.$i.conf ] || continue if active_pidfile $PIDFILE.$i/perdition.$i.pid perdition.$i ; then - echo "$NAME ($i) already running." - continue + _ '%s is already running.' "$NAME ($i)" + continue fi - echo -n "Starting $DESC: $NAME ($i)... " + action 'Starting %s: %s...' "$DESC" "$NAME ($i)" $DAEMON.$i -f /etc/perdition/perdition.$i.conf $OPTIONS \ - --pid_file $PIDFILE.$i/perdition.$i.pid + --pid_file $PIDFILE.$i/perdition.$i.pid status done ;; @@ -35,11 +35,11 @@ for i in $PROTOCOLS; do [ -s /etc/perdition/perdition.$i.conf ] || continue if ! active_pidfile $PIDFILE.$i/perdition.$i.pid perdition.$i ; then - echo "$NAME ($i) is not running." - continue + _ '%s is not running.' "$NAME ($i)" + continue fi - echo -n "Stopping $DESC: $NAME ($i)... " - kill `cat $PIDFILE.$i/perdition.$i.pid` + action 'Stopping %s: %s...' "$DESC" "$NAME ($i)" + kill $(cat $PIDFILE.$i/perdition.$i.pid) status done ;; @@ -47,14 +47,14 @@ for i in $PROTOCOLS; do [ -s /etc/perdition/perdition.$i.conf ] || continue if ! active_pidfile $PIDFILE.$i/perdition.$i.pid perdition.$i ; then - echo "$NAME ($i) is not running." - continue + _ '%s is not running.' "$NAME ($i)" + continue fi - echo -n "Restarting $DESC: $NAME ($i)... " - kill `cat $PIDFILE.$i/perdition.$i.pid` + action 'Restarting %s: %s...' "$DESC" "$NAME ($i)" + kill $(cat $PIDFILE.$i/perdition.$i.pid) sleep 2 $DAEMON.$i -f /etc/perdition/perdition.$i.conf $OPTIONS \ - --pid_file $PIDFILE.$i/perdition.$i.pid + --pid_file $PIDFILE.$i/perdition.$i.pid status done ;; @@ -62,14 +62,13 @@ for i in $PROTOCOLS; do [ -s /etc/perdition/perdition.$i.conf ] || continue active_pidfile $PIDFILE.$i/perdition.$i.pid perdition.$i && \ - kill -1 `cat $PIDFILE.$i/perdition.$i.pid` + kill -1 $(cat $PIDFILE.$i/perdition.$i.pid) status done ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart|reload]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart|reload]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c phpvirtualbox/stuff/etc/init.d/vboxwebsrv --- a/phpvirtualbox/stuff/etc/init.d/vboxwebsrv Wed May 25 23:07:05 2016 +0200 +++ b/phpvirtualbox/stuff/etc/init.d/vboxwebsrv Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# Start, stop and restart vboxwebsrv deamon on SliTaz, at boot time or +# Start, stop and restart vboxwebsrv deamon on SliTaz, at boot time or # with the command line. # # To start daemon at boot time, just put vboxwebsrv in the $RUN_DAEMONS @@ -8,7 +8,7 @@ . /etc/init.d/rc.functions NAME=$(basename $0) -DESC="$NAME deamon" +DESC="$(_ '%s daemon' $NAME)" DAEMON=$(which $NAME) OPTIONS="-b --logfile /dev/null" eval $(grep -i ^${NAME}_OPTIONS /etc/daemons.conf | sed 's/.*_OPT/OPT/') @@ -17,41 +17,40 @@ case "$1" in start) if active_pidfile $PIDFILE $NAME ; then - echo "$NAME is already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS > /dev/null 2>&1 - [ -f $PIDFILE ] || pidof $NAME | awk '{ print $1 }' > $PIDFILE + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS >/dev/null 2>&1 + [ -f $PIDFILE ] || pidof $NAME | awk '{print $1}' > $PIDFILE active_pidfile $PIDFILE $NAME status ;; stop) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 - $DAEMON $OPTIONS > /dev/null 2>&1 - [ -f $PIDFILE ] || pidof $NAME | awk '{ print $1 }' > $PIDFILE + $DAEMON $OPTIONS >/dev/null 2>&1 + [ -f $PIDFILE ] || pidof $NAME | awk '{print $1}' > $PIDFILE active_pidfile $PIDFILE $NAME status ;; -*) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + *) + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c portmap/stuff/init.d/portmap --- a/portmap/stuff/init.d/portmap Wed May 25 23:07:05 2016 +0200 +++ b/portmap/stuff/init.d/portmap Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=portmap -DESC="RPC portmapper" +DESC="$(_ 'RPC portmapper')" DAEMON=/usr/sbin/portmap OPTIONS= PIDFILE=/var/run/$NAME.pid @@ -18,55 +18,54 @@ test -f $DAEMON || exit 0 case "$1" in - start) - if active_pidfile $PIDFILE portmap ; then - echo "$NAME already running." - exit 1 - fi + start) + if active_pidfile $PIDFILE portmap ; then + _ '%s is already running.' $NAME + exit 1 + fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS - - # registering PID - if [ $? -eq 0 ]; then - pidof -s $NAME > $PIDFILE - fi - status - - if [ -f /var/run/portmap.upgrade-state ]; then - echo -n "Restoring old RPC service information..." - sleep 1 # needs a short pause or pmap_set won't work. :( - pmap_set /var/run/portmap.state - $0 stop - $0 start - if [ ! -f /var/run/portmap.upgrade-state ]; then - sleep 1 - pmap_set $PIDFILE + fi + status + + if [ -f /var/run/portmap.upgrade-state ]; then + action 'Restoring old RPC service information...' + sleep 1 # needs a short pause or pmap_set won't work. :( + pmap_set /var/run/portmap.state + $0 stop + $0 start + if [ ! -f /var/run/portmap.upgrade-state ]; then + sleep 1 + pmap_set $(_ 'Usage:') $0 [start|stop|restart]" + newline + exit 1 + ;; esac exit 0 - diff -r f7dd646afeb9 -r 7f188676b59c postfix/stuff/etc/init.d/postfix --- a/postfix/stuff/etc/init.d/postfix Wed May 25 23:07:05 2016 +0200 +++ b/postfix/stuff/etc/init.d/postfix Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Postfix -DESC="SMTP server" +DESC="$(_ '%s server' SMTP)" DAEMON=/usr/lib/postfix/master OPTIONS=$POSTFIX_OPTIONS PIDFILE=/var/spool/postfix/pid/master.pid @@ -17,47 +17,46 @@ case "$1" in start) if active_pidfile $PIDFILE master ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS & status ;; stop) if ! active_pidfile $PIDFILE master ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` && rm -f $PIDFILE + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) && rm -f $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE master ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` && rm -f $PIDFILE + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) && rm -f $PIDFILE sleep 2 $DAEMON $OPTIONS & status ;; reload) if ! active_pidfile $PIDFILE master ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi postsuper active || exit 1 - kill -HUP `cat $PIDFILE` + kill -HUP $(cat $PIDFILE) postsuper & status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart|reload]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart|reload]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c postgresql/stuff/etc/init.d/postgresql --- a/postgresql/stuff/etc/init.d/postgresql Wed May 25 23:07:05 2016 +0200 +++ b/postgresql/stuff/etc/init.d/postgresql Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Postgresql -DESC="PostgreSQL server" +DESC="$(_ '%s server' PostgreSQL)" OPTIONS=$PGSQL_OPTIONS INIT_OPTIONS=$PGSQLINIT_OPTIONS [ -n "$OPTIONS" ] || OPTIONS="-D /var/lib/pgsql -s" @@ -18,42 +18,41 @@ case "$1" in start) if [ ! -f /var/lib/pgsql/PG_VERSION ]; then - echo "Initializing $DESC database" - rm -rf /var/lib/pgsql/* 2> /dev/null - su -c "initdb $INIT_OPTIONS" - postgres + _ 'Initializing PostgreSQL server database' + rm -rf /var/lib/pgsql/* 2>/dev/null + su -c "initdb $INIT_OPTIONS" - postgres fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME su -c "pg_ctl start -w $OPTIONS -l /var/log/postgresql/postgresql.log" - postgres status sleep 2 for i in /etc/pgsql.d/* ; do - [ -x $i ] || continue - echo -n "Running $i..." - $i - status + [ -x $i ] || continue + action 'Running %s...' $i + $i + status done -# su -c "createdb test" - postgres -# su -c "psql test" - postgres + # su -c "createdb test" - postgres + # su -c "psql test" - postgres ;; stop) - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME su -c "pg_ctl stop $OPTIONS -m smart" - postgres status ;; restart) - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME su -c "pg_ctl restart $OPTIONS -m smart" - postgres status ;; reload) - echo -n "Reloading $DESC: $NAME... " + action 'Reloading %s: %s...' "$DESC" $NAME su -c "pg_ctl reload $OPTIONS" - postgres status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart|reload]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart|reload]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c postgrey/stuff/etc/init.d/postgrey --- a/postgrey/stuff/etc/init.d/postgrey Wed May 25 23:07:05 2016 +0200 +++ b/postgrey/stuff/etc/init.d/postgrey Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/postgrey : Start, stop and restart Grey list server on SliTaz, at +# /etc/init.d/postgrey : Start, stop and restart Grey list server on SliTaz, at # boot time or with the command line. # # To start Grey list server at boot time, just put postgrey in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Postgrey -DESC="Grey list server" +DESC="$(_ 'Postfix Greylisting Policy Server')" DAEMON=/usr/bin/postgrey OPTIONS=$POSTGREY_OPTIONS PIDFILE=/var/run/postgrey.pid @@ -18,11 +18,11 @@ case "$1" in start) if active_pidfile $PIDFILE postgrey ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi if ! grep -q ^smtpd_recipient_restrictions /etc/postfix/main.cf; then - echo -n "Updating /etc/postfix/main.cf" + _ 'Updating %s' '/etc/postfix/main.cf' cat >> /etc/postfix/main.cf <$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c privoxy/stuff/daemon-privoxy --- a/privoxy/stuff/daemon-privoxy Wed May 25 23:07:05 2016 +0200 +++ b/privoxy/stuff/daemon-privoxy Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/daemon-name: Start, stop and restart daemon +# /etc/init.d/daemon-name: Start, stop and restart daemon # on SliTaz, at boot time or with the command line. # # To start daemon at boot time, just put the right name in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Privoxy -DESC="Web proxy daemon" +DESC="$(_ 'Web proxy daemon')" DAEMON=/usr/sbin/privoxy OPTIONS="--pidfile /var/run/privoxy.pid" USER="--user privoxy" @@ -19,39 +19,38 @@ case "$1" in start) if active_pidfile $PIDFILE privoxy ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS $USER $CONFIG 2> /dev/null + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS $USER $CONFIG 2>/dev/null status ;; stop) if ! active_pidfile $PIDFILE privoxy ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE privoxy ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - kill `cat $PIDFILE` + kill $(cat $PIDFILE) rm $PIDFILE sleep 2 - echo -n "Restarting $DESC: $NAME... " - $DAEMON $OPTIONS $USER $CONFIG 2> /dev/null + action 'Restarting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS $USER $CONFIG 2>/dev/null status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c pure-ftpd/stuff/pure-ftpd --- a/pure-ftpd/stuff/pure-ftpd Wed May 25 23:07:05 2016 +0200 +++ b/pure-ftpd/stuff/pure-ftpd Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/pure-ftpd : Start, stop and restart pure-FTPd daemon on SliTaz, at +# /etc/init.d/pure-ftpd : Start, stop and restart pure-FTPd daemon on SliTaz, at # boot time or with the command line. # # To start pure-FTPd server at boot time, just put pure-ftpd in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=pure-ftpd -DESC="pure-FTPd Server Daemon" +DESC="$(_ 'pure-FTPd Server Daemon')" DAEMON=/usr/sbin/$NAME PIDFILE=/var/run/$NAME.pid @@ -24,37 +24,36 @@ case "$1" in start) if active_pidfile $PIDFILE $NAME ; then - echo "$NAME already running." + _ '%s is already running.' exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c rsync/stuff/etc/init.d/rsyncd --- a/rsync/stuff/etc/init.d/rsyncd Wed May 25 23:07:05 2016 +0200 +++ b/rsync/stuff/etc/init.d/rsyncd Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Rsyncd -DESC="rsync deamon" +DESC="$(_ '%s daemon' rsync)" DAEMON=/usr/bin/rsync OPTIONS=$RSYNCD_OPTIONS PIDFILE=/var/run/rsyncd.pid @@ -17,39 +17,38 @@ case "$1" in start) if active_pidfile $PIDFILE rsync ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE rsync ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE rsync ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm $PIDFILE sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c samba/stuff/etc/init.d/samba --- a/samba/stuff/etc/init.d/samba Wed May 25 23:07:05 2016 +0200 +++ b/samba/stuff/etc/init.d/samba Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/samba : Start, stop and restart Samba server on SliTaz, at +# /etc/init.d/samba : Start, stop and restart Samba server on SliTaz, at # boot time or with the command line. # # To start Samba server at boot time, just put samba in the $RUN_DAEMONS @@ -9,43 +9,44 @@ . /etc/daemons.conf NAME=Samba -DESC="Samba server" +DESC="$(_ '%s server' Samba)" SMBD=/usr/sbin/smbd NMBD=/usr/sbin/nmbd NMBPIDFILE=/var/run/samba/nmbd.pid SMBPIDFILE=/var/run/samba/smbd.pid [ -d /var/run/samba ] || mkdir -p /var/run/samba + case "$1" in start) if active_pidfile $SMBPIDFILE smbd ; then - echo "$NAME: $SMBD already running." + _ '%s is already running.' "$NAME ($SMBD)" else - echo -n "Starting $DESC: $SMBD... " + action 'Starting %s: %s...' "$DESC" $SMBD $SMBD -D status fi if active_pidfile $NMBPIDFILE nmbd ; then - echo "$NAME: $NMBD already running." + _ '%s is already running.' "$NAME ($NMBD)" else - echo -n "Starting $DESC: $NMBD... " + action 'Starting %s: %s...' "$DESC" $NMBD $NMBD -D status fi ;; stop) if ! active_pidfile $SMBPIDFILE smbd ; then - echo "$NAME: $SMBD is not running." + _ '%s is not running.' "$NAME ($SMBD)" else - echo -n "Stopping $DESC: $SMBD... " - kill `cat $SMBPIDFILE` + action 'Stopping %s: %s...' "$DESC" $SMBD + kill $(cat $SMBPIDFILE) status fi if ! active_pidfile $NMBPIDFILE nmbd ; then - echo "$NAME: $NMBD is not running." + _ '%s is not running.' "$NAME ($NMBD)" else - echo -n "Stopping $DESC: $NMBD... " - kill `cat $NMBPIDFILE` + action 'Stopping %s: %s...' "$DESC" $NMBD + kill $(cat $NMBPIDFILE) status fi ;; @@ -55,17 +56,16 @@ ;; reload) if ! active_pidfile $SMBPIDFILE smbd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Reloading $DESC: $SMBD... " - kill -HUP `cat $SMBPIDFILE` + action 'Reloading %s: %s...' "$DESC" $SMBD + kill -HUP $(cat $SMBPIDFILE) status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart!reload]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart!reload]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c slim/stuff/etc/init.d/slim --- a/slim/stuff/etc/init.d/slim Wed May 25 23:07:05 2016 +0200 +++ b/slim/stuff/etc/init.d/slim Thu May 26 20:16:45 2016 +0300 @@ -8,7 +8,7 @@ . /etc/init.d/rc.functions NAME=SLiM -DESC="Simple login manager" +DESC="$(_ 'Simple login manager')" DAEMON=/usr/bin/slim OPTION="-d" LOCK_FILE=/var/lock/slim.lock @@ -16,29 +16,29 @@ case "$1" in start) if active_pidfile $LOCK_FILE slim ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTION status ;; stop) if ! active_pidfile $LOCK_FILE slim ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME killall slim rm $LOCK_FILE status ;; restart) if ! active_pidfile $LOCK_FILE slim ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME killall slim rm $LOCK_FILE sleep 2 @@ -46,9 +46,8 @@ status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c slitaz-i18n/stuff/locale-pack.conf --- a/slitaz-i18n/stuff/locale-pack.conf Wed May 25 23:07:05 2016 +0200 +++ b/slitaz-i18n/stuff/locale-pack.conf Thu May 26 20:16:45 2016 +0300 @@ -1,6 +1,6 @@ # Packages LC_MESSAGES included in the locale pack. -CORE_PKGS="acl alsaplayer alsa-utils asunder atk attr dialog e2fsprogs \ +CORE_PKGS="acl alsaplayer alsa-utils asunder atk attr busybox dialog e2fsprogs \ elfutils epdfview galculator gdk-pixbuf glib glibc glib-networking gparted \ gpicview gtk+ gvfs kbd leafpad libfm gnutls libgpg-error libidn xz libwebkit \ lxappearance lxinput lxpanel lxrandr lxsession lxsession-edit lxtask \ diff -r f7dd646afeb9 -r 7f188676b59c smartmontools/stuff/etc/init.d/smartd --- a/smartmontools/stuff/etc/init.d/smartd Wed May 25 23:07:05 2016 +0200 +++ b/smartmontools/stuff/etc/init.d/smartd Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/smartd : Start, stop and restart Smartmontools (SMART) daemon on SliTaz, at +# /etc/init.d/smartd : Start, stop and restart Smartmontools (SMART) daemon on SliTaz, at # boot time or with the command line. # # To start SMART monitoring at boot time, just put smartd in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=smartd -DESC="Smartmontools (SMART) Daemon" +DESC="$(_ 'Smartmontools (SMART) Daemon')" DAEMON=/usr/sbin/smartd PIDFILE=/var/run/smartd.pid @@ -18,37 +18,36 @@ case "$1" in start) if active_pidfile $PIDFILE smartd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE smartd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE smartd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c squid/stuff/etc/init.d/squid --- a/squid/stuff/etc/init.d/squid Wed May 25 23:07:05 2016 +0200 +++ b/squid/stuff/etc/init.d/squid Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/squid : Start, stop and restart Squid proxy server on SliTaz, at +# /etc/init.d/squid : Start, stop and restart Squid proxy server on SliTaz, at # boot time or with the command line. # # To start Squid proxy server at boot time, just put squid in the $RUN_DAEMONS @@ -9,38 +9,38 @@ . /etc/daemons.conf NAME=Squid -DESC="Squid proxy server" +DESC="$(_ 'Squid proxy server')" DAEMON=/usr/sbin/squid OPTIONS=$SQUID_OPTIONS PIDFILE=/var/run/squid.pid -http_port=$(grep ^http_port /etc/squid/squid.conf | awk '{ print $2 }') +http_port=$(grep ^http_port /etc/squid/squid.conf | awk '{print $2}') [ -n "$http_port" ] || http_port=3128 [ -n "$OPTIONS" ] || OPTIONS="-a $http_port" case "$1" in start) if active_pidfile $PIDFILE squid ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - cache_dir=$(grep ^cache_dir /etc/squid/squid.conf | awk '{ print $3 }') + cache_dir=$(grep ^cache_dir /etc/squid/squid.conf | awk '{print $3}') [ -n "$cache_dir" ] || cache_dir=/var/cache if [ -d "$cache_dir" -a ! -d "$cache_dir/00" ]; then - echo -n "Creating squid spool directory structure" - $DAEMON -z > /dev/null 2>&1 + action 'Creating squid spool directory structure' + $DAEMON -z >/dev/null 2>&1 status fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status sleep 2 ;; stop) if ! active_pidfile $PIDFILE squid ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME $DAEMON -k kill status rm -f $PIDFILE @@ -48,27 +48,26 @@ ;; reload) if ! active_pidfile $PIDFILE squid ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Reloading $DESC configuration... " + action 'Reloading %s configuration...' $NAME $DAEMON -k reconfigure status ;; restart) if ! active_pidfile $PIDFILE squid ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - $DAEMON -k kill && $DAEMON $OPTIONS + action 'Restarting %s: %s...' "$DESC" $NAME + $DAEMON -k kill && $DAEMON $OPTIONS status sleep 2 ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|reload|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart|reload]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c thttpd/stuff/etc/init.d/thttpd --- a/thttpd/stuff/etc/init.d/thttpd Wed May 25 23:07:05 2016 +0200 +++ b/thttpd/stuff/etc/init.d/thttpd Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/thttpd : Start, stop and restart SSH server on SliTaz, at +# /etc/init.d/thttpd : Start, stop and restart SSH server on SliTaz, at # boot time or with the command line. # # To start SSH server at boot time, just put thttpd in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=thttpd -DESC="Thttpd server" +DESC="$(_ '%s server' thttpd)" DAEMON=/usr/sbin/thttpd CONFIG_FILE=/etc/thttpd/thttpd.conf OPTIONS="-C $CONFIG_FILE -D" @@ -18,37 +18,36 @@ case "$1" in start) if active_pidfile $PIDFILE thttpd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE thttpd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE thttpd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c tinc/stuff/etc/init.d/tinc --- a/tinc/stuff/etc/init.d/tinc Wed May 25 23:07:05 2016 +0200 +++ b/tinc/stuff/etc/init.d/tinc Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=tinc -DESC="tinc deamon" +DESC="$(_ '%s daemon' tinc)" DAEMON=/usr/sbin/tincd OPTIONS=$TINC_OPTIONS PIDFILE=/var/run/tinc.pid @@ -17,37 +17,36 @@ case "$1" in start) if active_pidfile $PIDFILE tincd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE tincd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - $DAEMON -k + action 'Stopping %s: %s...' "$DESC" $NAME + $DAEMON -k status ;; restart) if ! active_pidfile $PIDFILE tincd ; then - echo "$NAME is not running." + _ '%s is not running.' exit 1 fi - echo -n "Restarting $DESC: $NAME... " - $DAEMON -k + action 'Restarting %s: %s...' "$DESC" $NAME + $DAEMON -k sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|reload|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|reload|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c tinyproxy/stuff/tinyproxy --- a/tinyproxy/stuff/tinyproxy Wed May 25 23:07:05 2016 +0200 +++ b/tinyproxy/stuff/tinyproxy Thu May 26 20:16:45 2016 +0300 @@ -4,7 +4,7 @@ . /etc/init.d/rc.functions NAME=Tinyproxy -DESC="Tiny Proxy" +DESC="$(_ 'Tiny Proxy')" DAEMON=/usr/sbin/tinyproxy OPTION="-c" PIDFILE=/var/run/tinyproxy.pid @@ -12,29 +12,29 @@ case "$1" in start) if active_pidfile $PIDFILE tinyproxy ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTION /etc/tinyproxy/tinyproxy.conf status ;; stop) if ! active_pidfile $PIDFILE tinyproxy ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME killall tinyproxy rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE tinyproxy ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME killall tinyproxy rm $PIDFILE sleep 2 @@ -42,11 +42,10 @@ status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac -exit 0 \ No newline at end of file +exit 0 diff -r f7dd646afeb9 -r 7f188676b59c transmission-daemon/stuff/transmission-daemon --- a/transmission-daemon/stuff/transmission-daemon Wed May 25 23:07:05 2016 +0200 +++ b/transmission-daemon/stuff/transmission-daemon Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Transmission -DESC="transmission daemon" +DESC="$(_ '%s daemon' Transmission)" DAEMON=/usr/bin/transmission-daemon OPTIONS="-g /var/transmission-daemon/ -x /var/run/transmission-daemon.pid" PIDFILE=/var/run/transmission-daemon.pid @@ -17,29 +17,29 @@ case "$1" in start) if active_pidfile $PIDFILE transmission-daemon ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE transmission-daemon ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME killall transmission-daemon rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE transmission-daemon ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME killall transmission-daemon rm $PIDFILE sleep 2 @@ -47,9 +47,8 @@ status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c unfs3/stuff/etc/init.d/unfsd --- a/unfs3/stuff/etc/init.d/unfsd Wed May 25 23:07:05 2016 +0200 +++ b/unfs3/stuff/etc/init.d/unfsd Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=unfsd -DESC="NFSv3 Server" +DESC="$(_ '%s server' NFSv3)" DAEMON=/usr/bin/unfsd OPTIONS= PIDFILE=/var/run/$NAME.pid @@ -18,40 +18,40 @@ test -f $DAEMON || exit 0 case "$1" in - start) - if active_pidfile $PIDFILE unfsd ; then - echo "$NAME already running." - exit 1 - fi + start) + if active_pidfile $PIDFILE unfsd ; then + _ '%s is already running.' $NAME + exit 1 + fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS - status - - # registering PID - if [ $? -eq 0 ]; then - pidof -s $NAME > $PIDFILE - fi - ;; - stop) - if ! active_pidfile $PIDFILE unfsd ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` - rm -f $PIDFILE - status - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: $DAEMON {start|stop|reload|restart}" - exit 1 - ;; + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS + status + + # registering PID + if [ $? -eq 0 ]; then + pidof -s $NAME > $PIDFILE + fi + ;; + stop) + if ! active_pidfile $PIDFILE unfsd ; then + _ '%s is not running.' $NAME + exit 1 + fi + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + rm -f $PIDFILE + status + ;; + restart) + $0 stop + $0 start + ;; + *) + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline + exit 1 + ;; esac exit 0 - diff -r f7dd646afeb9 -r 7f188676b59c virtualbox-ose-guestutils/stuff/VBoxService --- a/virtualbox-ose-guestutils/stuff/VBoxService Wed May 25 23:07:05 2016 +0200 +++ b/virtualbox-ose-guestutils/stuff/VBoxService Thu May 26 20:16:45 2016 +0300 @@ -7,7 +7,7 @@ . /etc/daemons.conf NAME=VBoxService -DESC="VirtualBox Guest Service" +DESC="$(_ 'VirtualBox Guest Service')" DAEMON=/usr/bin/VBoxService OPTIONS=$VBOXSERVICE_OPTIONS PIDFILE=/var/run/VBoxService.pid @@ -15,37 +15,36 @@ case "$1" in start) if active_pidfile $PIDFILE VBoxService ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME mkdir -p $(dirname $PIDFILE) $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE VBoxService ; then - echo "$NAME is not running." + _ '%s is not running.' exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) rm $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE VBoxService ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) rm $PIDFILE sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c wicd/stuff/wicd --- a/wicd/stuff/wicd Wed May 25 23:07:05 2016 +0200 +++ b/wicd/stuff/wicd Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=Wicd -DESC="Network connection manager" +DESC="$(_ 'Network connection manager')" DAEMON=/usr/sbin/wicd OPTIONS=$WICD_OPTIONS PIDFILE=/var/run/wicd/wicd.pid @@ -17,39 +17,38 @@ case "$1" in start) if active_pidfile $PIDFILE wicd ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE wicd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm -f $PIDFILE status ;; restart) if ! active_pidfile $PIDFILE wicd ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) rm -f $PIDFILE sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c wpa_supplicant/stuff/etc/init.d/wpa_supplicant --- a/wpa_supplicant/stuff/etc/init.d/wpa_supplicant Wed May 25 23:07:05 2016 +0200 +++ b/wpa_supplicant/stuff/etc/init.d/wpa_supplicant Thu May 26 20:16:45 2016 +0300 @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=wpa_supplicant -DESC="wpa_supplicant deamon" +DESC="$(_ '%s daemon' wpa_supplicant)" DAEMON=/usr/bin/wpa_supplicant OPTIONS=$WPA_OPTIONS PIDFILE=/var/run/wpa_supplicant.pid @@ -17,37 +17,36 @@ case "$1" in start) if active_pidfile $PIDFILE $NAME ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS status ;; stop) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE $NAME ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c x11vnc/stuff/x11vnc --- a/x11vnc/stuff/x11vnc Wed May 25 23:07:05 2016 +0200 +++ b/x11vnc/stuff/x11vnc Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/x11vnc: Start, stop and restart web server on SliTaz, +# /etc/init.d/x11vnc: Start, stop and restart web server on SliTaz, # at boot time or with the command line. Daemons options are configured # with /etc/daemons.conf # @@ -7,44 +7,43 @@ . /etc/daemons.conf NAME=x11vnc -DESC="VNC server" +DESC="$(_ '%s server' VNC)" DAEMON=/usr/bin/x11vnc OPTIONS=$X11VNC_OPTIONS case "$1" in start) if ps x | grep -v grep | grep -q $DAEMON; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS & status ;; stop) if ! ps x | grep -v grep | grep -q $DAEMON; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " + action 'Stopping %s: %s...' "$DESC" $NAME killall $(basename $DAEMON) status ;; restart) if ! ps x | grep -v grep | grep -q $DAEMON; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Restarting $DESC: $NAME... " + action 'Restarting %s: %s...' "$DESC" $NAME killall $(basename $DAEMON) sleep 2 $DAEMON $OPTIONS & status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac diff -r f7dd646afeb9 -r 7f188676b59c ypserv/stuff/ypserv --- a/ypserv/stuff/ypserv Wed May 25 23:07:05 2016 +0200 +++ b/ypserv/stuff/ypserv Thu May 26 20:16:45 2016 +0300 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/ypserv: Start, stop and restart YP (NIS) Server on SliTaz, at +# /etc/init.d/ypserv: Start, stop and restart YP (NIS) Server on SliTaz, at # boot time or with the command line. # # To start YP (NIS) Server at boot time, just put ypserver in the $RUN_DAEMONS @@ -9,7 +9,7 @@ . /etc/daemons.conf NAME=ypserv -DESC="YP (NIS) Server" +DESC="$(_ '%s server' 'YP (NIS)')" DAEMON=/usr/sbin/ypserv OPTIONS=$YPSERV_OPTIONS PIDFILE=/var/run/ypserv.pid @@ -17,38 +17,37 @@ case "$1" in start) if active_pidfile $PIDFILE ypserv ; then - echo "$NAME already running." + _ '%s is already running.' $NAME exit 1 fi - echo -n "Starting $DESC: $NAME... " + action 'Starting %s: %s...' "$DESC" $NAME $DAEMON $OPTIONS - echo "$(pidof ypserv)" > $PIDFILE + pidof ypserv > $PIDFILE status ;; stop) if ! active_pidfile $PIDFILE ypserv ; then - echo "$NAME is not running." + _ '%s is not running.' $NAME exit 1 fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) status ;; restart) if ! active_pidfile $PIDFILE ypserv ; then - echo "$NAME is not running." + _ '%s is not running.' exit 1 fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) sleep 2 $DAEMON $OPTIONS status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline exit 1 ;; esac