wok-next rev 19159

/etc/init.d/*: use 'action' in pair with 'status'.
'action' returns translated message, so why not to add full translatable /etc/init.d/* content
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu May 26 20:16:45 2016 +0300 (2016-05-26)
parents f7dd646afeb9
children 8bca3631ec66
files 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 busybox/receipt busybox/stuff/daemon busybox/stuff/po/LINGUAS busybox/stuff/po/Makefile busybox/stuff/po/POTFILES busybox/stuff/po/daemon.pot busybox/stuff/po/ru.po c_icap/stuff/c-icapd cherokee/stuff/cherokee chillispot/stuff/chilli 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/receipt 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/applications/lighttpd-status.desktop lighttpd/stuff/etc/init.d/lighttpd linux-zram/stuff/compcache linux64-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-nrpe/stuff/nrpe nagios/stuff/nagios netatalk-pam/stuff/etc/init.d/netatalk netatalk/stuff/etc/init.d/netatalk nfs-utils/stuff/etc/init.d/nfsd nginx-extras/stuff/etc/init.d/nginx nginx/stuff/etc/init.d/nginx nscd/stuff/nscd ntop/stuff/etc/init.d/ntop ntp/stuff/ntp ofono/stuff/etc/init.d/ofono open-vm-tools/stuff/vmtoolsd 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 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 slitaz-i18n/stuff/locale-pack.conf 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
line diff
     1.1 --- a/acpid/stuff/init.d/acpid	Wed May 25 23:07:05 2016 +0200
     1.2 +++ b/acpid/stuff/init.d/acpid	Thu May 26 20:16:45 2016 +0300
     1.3 @@ -9,7 +9,7 @@
     1.4  . /etc/daemons.conf
     1.5  
     1.6  NAME=acpid
     1.7 -DESC="ACPI event deamon"
     1.8 +DESC="$(_ 'ACPI event deamon')"
     1.9  DAEMON=/usr/sbin/acpid
    1.10  OPTIONS=$ACPID_OPTIONS
    1.11  PIDFILE=/var/run/acpid.pid
    1.12 @@ -17,37 +17,36 @@
    1.13  case "$1" in
    1.14    start)
    1.15      if active_pidfile $PIDFILE $NAME ; then
    1.16 -      echo "$NAME already running."
    1.17 +      _ '%s is already running.' $NAME
    1.18        exit 1
    1.19      fi
    1.20 -    echo -n "Starting $DESC: $NAME... "
    1.21 +    action 'Starting %s: %s...' "$DESC" $NAME
    1.22      $DAEMON $OPTIONS
    1.23      status
    1.24      ;;
    1.25    stop)
    1.26      if ! active_pidfile $PIDFILE $NAME ; then
    1.27 -      echo "$NAME is not running."
    1.28 +      _ '%s is not running.' $NAME
    1.29        exit 1
    1.30      fi
    1.31 -    echo -n "Stopping $DESC: $NAME... "
    1.32 -    kill `cat $PIDFILE`
    1.33 +    action 'Stopping %s: %s...' "$DESC" $NAME
    1.34 +    kill $(cat $PIDFILE)
    1.35      status
    1.36      ;;
    1.37    restart)
    1.38      if ! active_pidfile $PIDFILE $NAME ; then
    1.39 -      echo "$NAME is not running."
    1.40 +      _ '%s is not running.' $NAME
    1.41        exit 1
    1.42      fi
    1.43 -    echo -n "Restarting $DESC: $NAME... "
    1.44 -    kill `cat $PIDFILE`
    1.45 +    action 'Restarting %s: %s...' "$DESC" $NAME
    1.46 +    kill $(cat $PIDFILE)
    1.47      sleep 2
    1.48      $DAEMON $OPTIONS
    1.49      status
    1.50      ;;
    1.51    *)
    1.52 -    echo ""
    1.53 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
    1.54 -    echo ""
    1.55 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    1.56 +    newline
    1.57      exit 1
    1.58      ;;
    1.59  esac
     2.1 --- a/ajaxterm/stuff/etc/init.d/ajaxterm	Wed May 25 23:07:05 2016 +0200
     2.2 +++ b/ajaxterm/stuff/etc/init.d/ajaxterm	Thu May 26 20:16:45 2016 +0300
     2.3 @@ -1,5 +1,5 @@
     2.4  #!/bin/sh
     2.5 -# /etc/init.d/ajaxterm : Start, stop and restart AjaxTerm server on SliTaz, at 
     2.6 +# /etc/init.d/ajaxterm : Start, stop and restart AjaxTerm server on SliTaz, at
     2.7  # boot time or with the command line.
     2.8  #
     2.9  # To start AjaxTerm server at boot time, just put ajaxterm in the $RUN_DAEMONS
    2.10 @@ -9,7 +9,7 @@
    2.11  . /etc/daemons.conf
    2.12  
    2.13  NAME=AjaxTerm
    2.14 -DESC="AjaxTerm server"
    2.15 +DESC="$(_ '%s server' AjaxTerm)"
    2.16  DAEMON="/usr/share/ajaxterm/ajaxterm.py"
    2.17  OPTIONS=$AJAXTERM_OPTIONS
    2.18  PIDFILE=/var/run/ajaxterm.pid
    2.19 @@ -19,32 +19,32 @@
    2.20  case "$1" in
    2.21    start)
    2.22      if active_pidfile $PIDFILE python ; then
    2.23 -      echo "$NAME already running."
    2.24 +      _ '%s is already running.' $NAME
    2.25        exit 1
    2.26      fi
    2.27 -    echo -n "Starting $DESC: $NAME... "
    2.28 +    action 'Starting %s: %s...' "$DESC" $NAME
    2.29      $DAEMON $OPTIONS
    2.30      status
    2.31      sleep 2
    2.32      ;;
    2.33    stop)
    2.34      if ! active_pidfile $PIDFILE python ; then
    2.35 -      echo "$NAME is not running."
    2.36 +      _ '%s is not running.' $NAME
    2.37        exit 1
    2.38      fi
    2.39 -    echo -n "Stopping $DESC: $NAME... "
    2.40 -    kill `cat $PIDFILE`
    2.41 +    action 'Stopping %s: %s...' "$DESC" $NAME
    2.42 +    kill $(cat $PIDFILE)
    2.43      status
    2.44      rm -f $PIDFILE
    2.45      sleep 2
    2.46      ;;
    2.47    restart)
    2.48      if ! active_pidfile $PIDFILE python ; then
    2.49 -      echo "$NAME is not running."
    2.50 +      _ '%s is not running.' $NAME
    2.51        exit 1
    2.52      fi
    2.53 -    echo -n "Restarting $DESC: $NAME... "
    2.54 -    kill `cat $PIDFILE`
    2.55 +    action 'Restarting %s: %s...' "$DESC" $NAME
    2.56 +    kill $(cat $PIDFILE)
    2.57      rm -f $PIDFILE
    2.58      sleep 2
    2.59      $DAEMON $OPTIONS
    2.60 @@ -52,9 +52,8 @@
    2.61      sleep 2
    2.62      ;;
    2.63    *)
    2.64 -    echo ""
    2.65 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
    2.66 -    echo ""
    2.67 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    2.68 +    newline
    2.69      exit 1
    2.70      ;;
    2.71  esac
     3.1 --- a/apache/stuff/apache	Wed May 25 23:07:05 2016 +0200
     3.2 +++ b/apache/stuff/apache	Thu May 26 20:16:45 2016 +0300
     3.3 @@ -1,5 +1,5 @@
     3.4  #!/bin/sh
     3.5 -# /etc/init.d/apache: Start, stop and restart Apache web server on SliTaz, 
     3.6 +# /etc/init.d/apache: Start, stop and restart Apache web server on SliTaz,
     3.7  # at boot time or with the command line. Daemons options are configured
     3.8  # with /etc/daemons.conf
     3.9  #
    3.10 @@ -7,7 +7,7 @@
    3.11  . /etc/daemons.conf
    3.12  
    3.13  NAME=Apache
    3.14 -DESC="Apache Web Server"
    3.15 +DESC="$(_ 'Apache Web Server')"
    3.16  DAEMON=/usr/bin/apachectl
    3.17  OPTIONS=$APACHE_OPTIONS
    3.18  PIDFILE=/var/run/apache/httpd.pid
    3.19 @@ -15,45 +15,44 @@
    3.20  case "$1" in
    3.21    start)
    3.22      if active_pidfile $PIDFILE httpd ; then
    3.23 -      echo "$NAME already running."
    3.24 +      _ '%s is already running.' $NAME
    3.25        exit 1
    3.26      fi
    3.27 -    echo -n "Starting $DESC: $NAME... "
    3.28 -    $DAEMON $OPTIONS -k start 
    3.29 +    action 'Starting %s: %s...' "$DESC" $NAME
    3.30 +    $DAEMON $OPTIONS -k start
    3.31      status
    3.32      ;;
    3.33    stop)
    3.34      if ! active_pidfile $PIDFILE httpd ; then
    3.35 -      echo "$NAME is not running."
    3.36 +      _ '%s is not running.' $NAME
    3.37        exit 1
    3.38      fi
    3.39 -    echo -n "Stopping $DESC: $NAME... "
    3.40 +    action 'Stopping %s: %s...' "$DESC" $NAME
    3.41      $DAEMON $OPTIONS -k stop
    3.42      rm $PIDFILE
    3.43      status
    3.44      ;;
    3.45    reload)
    3.46      if ! active_pidfile $PIDFILE httpd ; then
    3.47 -      echo "$NAME is not running."
    3.48 +      _ '%s is not running.' $NAME
    3.49        exit 1
    3.50      fi
    3.51 -    echo -n "Stopping $DESC: $NAME... "
    3.52 +    action 'Stopping %s: %s...' "$DESC" $NAME
    3.53      $DAEMON $OPTIONS -k graceful
    3.54      status
    3.55      ;;
    3.56    restart)
    3.57      if ! active_pidfile $PIDFILE httpd ; then
    3.58 -      echo "$NAME is not running."
    3.59 +      _ '%s is not running.' $NAME
    3.60        exit 1
    3.61      fi
    3.62 -    echo -n "Restarting $DESC: $NAME... "
    3.63 +    action 'Restarting %s: %s...' "$DESC" $NAME
    3.64      $DAEMON $OPTIONS -k restart
    3.65      status
    3.66      ;;
    3.67    *)
    3.68 -    echo ""
    3.69 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|reload|restart]"
    3.70 -    echo ""
    3.71 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|reload|restart]"
    3.72 +    newline
    3.73      exit 1
    3.74      ;;
    3.75  esac
     4.1 --- a/at/stuff/atd	Wed May 25 23:07:05 2016 +0200
     4.2 +++ b/at/stuff/atd	Thu May 26 20:16:45 2016 +0300
     4.3 @@ -1,5 +1,5 @@
     4.4  #!/bin/sh
     4.5 -# Start, stop and restart a atd deamon on SliTaz, at boot time or 
     4.6 +# Start, stop and restart a atd deamon on SliTaz, at boot time or
     4.7  # with the command line.
     4.8  #
     4.9  # To start daemon at boot time, just put the right name in the $RUN_DAEMONS
    4.10 @@ -8,7 +8,7 @@
    4.11  . /etc/init.d/rc.functions
    4.12  
    4.13  NAME=$(basename $0)
    4.14 -DESC="$NAME deamon"
    4.15 +DESC="$(_ '%s daemon' $NAME)"
    4.16  DAEMON=$(which $NAME)
    4.17  eval $(grep -i ^${NAME}_OPTIONS /etc/daemons.conf | sed 's/.*_OPT/OPT/')
    4.18  PIDFILE=/var/run/$NAME.pid
    4.19 @@ -16,41 +16,40 @@
    4.20  case "$1" in
    4.21    start)
    4.22      if active_pidfile $PIDFILE $NAME ; then
    4.23 -      echo "$NAME is already running."
    4.24 +      _ '%s is already running.' $NAME
    4.25        exit 1
    4.26      fi
    4.27 -    echo -n "Starting $DESC: $NAME... "
    4.28 -    $DAEMON $OPTIONS 
    4.29 -    [ -f $PIDFILE ] || pidof $NAME | awk '{ print $1 }' > $PIDFILE
    4.30 +    action 'Starting %s: %s...' "$DESC" $NAME
    4.31 +    $DAEMON $OPTIONS
    4.32 +    [ -f $PIDFILE ] || pidof $NAME | awk '{print $1}' > $PIDFILE
    4.33      active_pidfile $PIDFILE $NAME
    4.34      status
    4.35      ;;
    4.36    stop)
    4.37      if ! active_pidfile $PIDFILE $NAME ; then
    4.38 -      echo "$NAME is not running."
    4.39 +      _ '%s is not running.' $NAME
    4.40        exit 1
    4.41      fi
    4.42 -    echo -n "Stopping $DESC: $NAME... "
    4.43 -    kill `cat $PIDFILE`
    4.44 +    action 'Stopping %s: %s...' "$DESC" $NAME
    4.45 +    kill $(cat $PIDFILE)
    4.46      status
    4.47      ;;
    4.48    restart)
    4.49      if ! active_pidfile $PIDFILE $NAME ; then
    4.50 -      echo "$NAME is not running."
    4.51 +      _ '%s is not running.' $NAME
    4.52        exit 1
    4.53      fi
    4.54 -    echo -n "Restarting $DESC: $NAME... "
    4.55 -    kill `cat $PIDFILE`
    4.56 +    action 'Restarting %s: %s...' "$DESC" $NAME
    4.57 +    kill $(cat $PIDFILE)
    4.58      sleep 2
    4.59      $DAEMON $OPTIONS
    4.60 -    [ -f $PIDFILE ] || pidof $NAME | awk '{ print $1 }' > $PIDFILE
    4.61 +    [ -f $PIDFILE ] || pidof $NAME | awk '{print $1}' > $PIDFILE
    4.62      active_pidfile $PIDFILE $NAME
    4.63      status
    4.64      ;;
    4.65 -*)
    4.66 -    echo ""
    4.67 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
    4.68 -    echo ""
    4.69 +  *)
    4.70 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    4.71 +    newline
    4.72      exit 1
    4.73      ;;
    4.74  esac
     5.1 --- a/autofs/stuff/etc/init.d/autofs	Wed May 25 23:07:05 2016 +0200
     5.2 +++ b/autofs/stuff/etc/init.d/autofs	Thu May 26 20:16:45 2016 +0300
     5.3 @@ -1,5 +1,5 @@
     5.4  #!/bin/sh
     5.5 -# /etc/init.d/autofs : Start, stop and restart automounter on SliTaz, at 
     5.6 +# /etc/init.d/autofs : Start, stop and restart automounter on SliTaz, at
     5.7  # boot time or with the command line.
     5.8  #
     5.9  # To start automounter at boot time, just put dropbear in the $RUN_DAEMONS
    5.10 @@ -9,7 +9,7 @@
    5.11  . /etc/daemons.conf
    5.12  
    5.13  NAME=Automount
    5.14 -DESC="Automount server"
    5.15 +DESC="$(_ '%s server' Automount)"
    5.16  DAEMON=/usr/sbin/automount
    5.17  OPTIONS=$AUTOMOUNT_OPTIONS
    5.18  PIDFILE=/var/run/automount.pid
    5.19 @@ -17,39 +17,38 @@
    5.20  case "$1" in
    5.21    start)
    5.22      if active_pidfile $PIDFILE automount ; then
    5.23 -      echo "$NAME already running."
    5.24 +      _ '%s is already running.' $NAME
    5.25        exit 1
    5.26      fi
    5.27 -    echo -n "Starting $DESC: $NAME... "
    5.28 +    action 'Starting %s: %s...' "$DESC" $NAME
    5.29      modprobe autofs4
    5.30      $DAEMON $OPTIONS
    5.31      status
    5.32      ;;
    5.33    stop)
    5.34      if ! active_pidfile $PIDFILE automount ; then
    5.35 -      echo "$NAME is not running."
    5.36 +      _ '%s is not running.' $NAME
    5.37        exit 1
    5.38      fi
    5.39 -    echo -n "Stopping $DESC: $NAME... "
    5.40 -    kill `cat $PIDFILE`
    5.41 +    action 'Stopping %s: %s...' "$DESC" $NAME
    5.42 +    kill $(cat $PIDFILE)
    5.43      rmmod autofs4
    5.44      status
    5.45      ;;
    5.46    restart)
    5.47      if ! active_pidfile $PIDFILE automount ; then
    5.48 -      echo "$NAME is not running."
    5.49 +      _ '%s is not running.' $NAME
    5.50        exit 1
    5.51      fi
    5.52 -    echo -n "Restarting $DESC: $NAME... "
    5.53 -    kill `cat $PIDFILE`
    5.54 +    action 'Restarting %s: %s...' "$DESC" $NAME
    5.55 +    kill $(cat $PIDFILE)
    5.56      sleep 2
    5.57      $DAEMON $OPTIONS
    5.58      status
    5.59      ;;
    5.60    *)
    5.61 -    echo ""
    5.62 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
    5.63 -    echo ""
    5.64 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    5.65 +    newline
    5.66      exit 1
    5.67      ;;
    5.68  esac
     6.1 --- a/backuppc/stuff/etc/init.d/backuppc	Wed May 25 23:07:05 2016 +0200
     6.2 +++ b/backuppc/stuff/etc/init.d/backuppc	Thu May 26 20:16:45 2016 +0300
     6.3 @@ -9,7 +9,7 @@
     6.4  . /etc/daemons.conf
     6.5  
     6.6  NAME=BackupPC
     6.7 -DESC="backuppc deamon"
     6.8 +DESC="$(_ '%s daemon' backuppc)"
     6.9  DAEMON=/usr/bin/BackupPC
    6.10  OPTIONS=$BACKUPPC_OPTIONS
    6.11  [ -n "$OPTIONS" ] || OPTIONS="-d"
    6.12 @@ -18,45 +18,44 @@
    6.13  case "$1" in
    6.14    start)
    6.15      if active_pidfile $PIDFILE $NAME ; then
    6.16 -      echo "$NAME already running."
    6.17 +      _ '%s is already running.' $NAME
    6.18        exit 1
    6.19      fi
    6.20 -    echo -n "Starting $DESC: $NAME... "
    6.21 +    action 'Starting %s: %s...' "$DESC" $NAME
    6.22      su -s /bin/sh -c "$DAEMON $OPTIONS" www
    6.23 -    pidof $NAME | awk '{ print $1 }' > $PIDFILE
    6.24 +    pidof $NAME | awk '{print $1}' > $PIDFILE
    6.25      status
    6.26      ;;
    6.27    stop)
    6.28      if ! active_pidfile $PIDFILE $NAME ; then
    6.29 -      echo "$NAME is not running."
    6.30 +      _ '%s is not running.' $NAME
    6.31        exit 1
    6.32      fi
    6.33 -    echo -n "Stopping $DESC: $NAME... "
    6.34 -    kill `cat $PIDFILE`
    6.35 +    action 'Stopping %s: %s...' "$DESC" $NAME
    6.36 +    kill $(cat $PIDFILE)
    6.37      rm $PIDFILE
    6.38      status
    6.39      ;;
    6.40    restart)
    6.41      if ! active_pidfile $PIDFILE $NAME ; then
    6.42 -      echo "$NAME is not running."
    6.43 +      _ '%s is not running.' $NAME
    6.44        exit 1
    6.45      fi
    6.46 -    echo -n "Restarting $DESC: $NAME... "
    6.47 -    kill `cat $PIDFILE`
    6.48 +    action 'Restarting %s: %s...' "$DESC" $NAME
    6.49 +    kill $(cat $PIDFILE)
    6.50      rm $PIDFILE
    6.51      sleep 2
    6.52      su -c "$DAEMON $OPTIONS" www
    6.53 -    pidof $NAME | awk '{ print $1 }' > $PIDFILE
    6.54 +    pidof $NAME | awk '{print $1}' > $PIDFILE
    6.55      status
    6.56      ;;
    6.57    reload)
    6.58 -    kill -1 `cat $PIDFILE`
    6.59 +    kill -1 $(cat $PIDFILE)
    6.60      status
    6.61      ;;
    6.62    *)
    6.63 -    echo ""
    6.64 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
    6.65 -    echo ""
    6.66 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart|reload]"
    6.67 +    newline
    6.68      exit 1
    6.69      ;;
    6.70  esac
     7.1 --- a/bind/stuff/etc/init.d/named	Wed May 25 23:07:05 2016 +0200
     7.2 +++ b/bind/stuff/etc/init.d/named	Thu May 26 20:16:45 2016 +0300
     7.3 @@ -9,7 +9,7 @@
     7.4  . /etc/daemons.conf
     7.5  
     7.6  NAME=Named
     7.7 -DESC="Named deamon"
     7.8 +DESC="$(_ '%s daemon' Named)"
     7.9  DAEMON=/usr/sbin/named
    7.10  OPTIONS=$NAMED_OPTIONS
    7.11  PIDFILE=/var/run/named.pid
    7.12 @@ -19,19 +19,19 @@
    7.13  case "$1" in
    7.14    start)
    7.15      if active_pidfile $PIDFILE named ; then
    7.16 -      echo "$NAME already running."
    7.17 +      _ '%s is already running.' $NAME
    7.18        exit 1
    7.19      fi
    7.20 -    echo -n "Starting $DESC: $NAME... "
    7.21 -    $DAEMON $OPTIONS 
    7.22 +    action 'Starting %s: %s...' "$DESC" $NAME
    7.23 +    $DAEMON $OPTIONS
    7.24      status
    7.25      ;;
    7.26    stop)
    7.27      if ! active_pidfile $PIDFILE named ; then
    7.28 -      echo "$NAME is not running."
    7.29 +      _ '%s is not running.' $NAME
    7.30        exit 1
    7.31      fi
    7.32 -    echo -n "Stopping $DESC: $NAME... "
    7.33 +    action 'Stopping %s: %s...' "$DESC" $NAME
    7.34      /usr/sbin/rndc stop
    7.35      status
    7.36      ;;
    7.37 @@ -41,19 +41,18 @@
    7.38      ;;
    7.39    restart)
    7.40      if ! active_pidfile $PIDFILE named ; then
    7.41 -      echo "$NAME is not running."
    7.42 +      _ '%s is not running.' $NAME
    7.43        exit 1
    7.44      fi
    7.45 -    echo -n "Restarting $DESC: $NAME... "
    7.46 +    action 'Restarting %s: %s...' "$DESC" $NAME
    7.47      /usr/sbin/rndc stop
    7.48      sleep 2
    7.49      $DAEMON $OPTIONS
    7.50      status
    7.51      ;;
    7.52    *)
    7.53 -    echo ""
    7.54 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|reload|restart]"
    7.55 -    echo ""
    7.56 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart|reload]"
    7.57 +    newline
    7.58      exit 1
    7.59      ;;
    7.60  esac
     8.1 --- a/boxbackup-client/stuff/bbackupd	Wed May 25 23:07:05 2016 +0200
     8.2 +++ b/boxbackup-client/stuff/bbackupd	Thu May 26 20:16:45 2016 +0300
     8.3 @@ -9,7 +9,7 @@
     8.4  . /etc/daemons.conf
     8.5  
     8.6  NAME=BBackupd
     8.7 -DESC="BoxBackup deamon"
     8.8 +DESC="$(_ '%s daemon' BoxBackup)"
     8.9  DAEMON=/usr/bin/bbackupd
    8.10  OPTIONS=$BBSTORED_OPTIONS
    8.11  PIDFILE=/var/run/bbackupd.pid
    8.12 @@ -17,39 +17,38 @@
    8.13  case "$1" in
    8.14    start)
    8.15      if active_pidfile $PIDFILE bbackupd ; then
    8.16 -      echo "$NAME already running."
    8.17 +      _ '%s is already running.' $NAME
    8.18        exit 1
    8.19      fi
    8.20 -    echo -n "Starting $DESC: $NAME... "
    8.21 -    $DAEMON $OPTIONS > /dev/null
    8.22 +    action 'Starting %s: %s...' "$DESC" $NAME
    8.23 +    $DAEMON $OPTIONS >/dev/null
    8.24      status
    8.25      ;;
    8.26    stop)
    8.27      if ! active_pidfile $PIDFILE bbackupd ; then
    8.28 -      echo "$NAME is not running."
    8.29 +      _ '%s is not running.' $NAME
    8.30        exit 1
    8.31      fi
    8.32 -    echo -n "Stopping $DESC: $NAME... "
    8.33 -    kill `cat $PIDFILE`
    8.34 -	rm -f $PIDFILE
    8.35 +    action 'Stopping %s: %s...' "$DESC" $NAME
    8.36 +    kill $(cat $PIDFILE)
    8.37 +    rm -f $PIDFILE
    8.38      status
    8.39      ;;
    8.40    restart)
    8.41      if ! active_pidfile $PIDFILE bbackupd ; then
    8.42 -      echo "$NAME is not running."
    8.43 +      _ '%s is not running.' $NAME
    8.44        exit 1
    8.45      fi
    8.46 -    echo -n "Restarting $DESC: $NAME... "
    8.47 -    kill `cat $PIDFILE`
    8.48 -	rm -f $PIDFILE
    8.49 +    action 'Restarting %s: %s...' "$DESC" $NAME
    8.50 +    kill $(cat $PIDFILE)
    8.51 +    rm -f $PIDFILE
    8.52      sleep 2
    8.53 -    $DAEMON $OPTIONS > /dev/null
    8.54 +    $DAEMON $OPTIONS >/dev/null
    8.55      status
    8.56      ;;
    8.57    *)
    8.58 -    echo ""
    8.59 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
    8.60 -    echo ""
    8.61 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    8.62 +    newline
    8.63      exit 1
    8.64      ;;
    8.65  esac
     9.1 --- a/boxbackup-server/stuff/bbstored	Wed May 25 23:07:05 2016 +0200
     9.2 +++ b/boxbackup-server/stuff/bbstored	Thu May 26 20:16:45 2016 +0300
     9.3 @@ -9,7 +9,7 @@
     9.4  . /etc/daemons.conf
     9.5  
     9.6  NAME=BBstored
     9.7 -DESC="BoxBackup server deamon"
     9.8 +DESC="$(_ 'BoxBackup server deamon')"
     9.9  DAEMON=/usr/bin/bbstored
    9.10  OPTIONS=$BBSTORED_OPTIONS
    9.11  PIDFILE=/var/run/bbstored.pid
    9.12 @@ -17,39 +17,38 @@
    9.13  case "$1" in
    9.14    start)
    9.15      if active_pidfile $PIDFILE bbstored ; then
    9.16 -      echo "$NAME already running."
    9.17 +      _ '%s is already running.' $NAME
    9.18        exit 1
    9.19      fi
    9.20 -    echo -n "Starting $DESC: $NAME... "
    9.21 -    $DAEMON $OPTIONS > /dev/null
    9.22 +    action 'Starting %s: %s...' "$DESC" $NAME
    9.23 +    $DAEMON $OPTIONS >/dev/null
    9.24      status
    9.25      ;;
    9.26    stop)
    9.27      if ! active_pidfile $PIDFILE bbstored ; then
    9.28 -      echo "$NAME is not running."
    9.29 +      _ '%s is not running.' $NAME
    9.30        exit 1
    9.31      fi
    9.32 -    echo -n "Stopping $DESC: $NAME... "
    9.33 -    kill `cat $PIDFILE`
    9.34 -	rm -f $PIDFILE
    9.35 +    action 'Stopping %s: %s...' "$DESC" $NAME
    9.36 +    kill $(cat $PIDFILE)
    9.37 +    rm -f $PIDFILE
    9.38      status
    9.39      ;;
    9.40    restart)
    9.41      if ! active_pidfile $PIDFILE bbstored ; then
    9.42 -      echo "$NAME is not running."
    9.43 +      _ '%s is not running.' $NAME
    9.44        exit 1
    9.45      fi
    9.46 -    echo -n "Restarting $DESC: $NAME... "
    9.47 -    kill `cat $PIDFILE`
    9.48 -	rm -f $PIDFILE
    9.49 +    action 'Restarting %s: %s...' "$DESC" $NAME
    9.50 +    kill $(cat $PIDFILE)
    9.51 +    rm -f $PIDFILE
    9.52      sleep 2
    9.53 -    $DAEMON $OPTIONS > /dev/null
    9.54 +    $DAEMON $OPTIONS >/dev/null
    9.55      status
    9.56      ;;
    9.57    *)
    9.58 -    echo ""
    9.59 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
    9.60 -    echo ""
    9.61 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    9.62 +    newline
    9.63      exit 1
    9.64      ;;
    9.65  esac
    10.1 --- a/busybox/receipt	Wed May 25 23:07:05 2016 +0200
    10.2 +++ b/busybox/receipt	Thu May 26 20:16:45 2016 +0300
    10.3 @@ -109,7 +109,13 @@
    10.4  		    cp $stuff/busybox.conf-ssfs $rootfs/etc/busybox.conf
    10.5  		    chown -R 0.0 $rootfs/etc
    10.6  		    chmod 0600 $rootfs/etc/busybox.conf
    10.7 -		    chmod 4755 $rootfs/bin/busybox ;;
    10.8 +		    chmod 4755 $rootfs/bin/busybox
    10.9 +
   10.10 +			# Compile translations
   10.11 +			make -C $stuff/po install
   10.12 +
   10.13 +			;;
   10.14 +
   10.15  	esac
   10.16  }
   10.17  
    11.1 --- a/busybox/stuff/daemon	Wed May 25 23:07:05 2016 +0200
    11.2 +++ b/busybox/stuff/daemon	Thu May 26 20:16:45 2016 +0300
    11.3 @@ -1,5 +1,5 @@
    11.4  #!/bin/sh
    11.5 -# Start, stop and restart a busybox deamon on SliTaz, at boot time or 
    11.6 +# Start, stop and restart a busybox deamon on SliTaz, at boot time or
    11.7  # with the command line.
    11.8  #
    11.9  # To start daemon at boot time, just put the right name in the $RUN_DAEMONS
   11.10 @@ -8,12 +8,13 @@
   11.11  . /etc/init.d/rc.functions
   11.12  
   11.13  NAME=$(basename $0)
   11.14 -DESC="$NAME deamon"
   11.15 +DESC="$(_ '%s daemon' $NAME)"
   11.16  DAEMON=$(which $NAME)
   11.17  for p in ${PATH//:/ }; do
   11.18  	[ -L $p/$NAME ] || continue
   11.19  	case "$(readlink $p/$NAME)" in
   11.20 -	*busybox)	DAEMON=$p/$NAME
   11.21 +		*busybox)
   11.22 +			DAEMON=$p/$NAME
   11.23  			break
   11.24  	esac
   11.25  done
   11.26 @@ -24,10 +25,10 @@
   11.27  {
   11.28  if grep $DAEMON /etc/inetd.conf | grep -q ^\#; then
   11.29      sed -i "s,^#\(.*$DAEMON.*\)$,\1," /etc/inetd.conf
   11.30 -    /etc/init.d/inetd stop > /dev/null
   11.31 +    /etc/init.d/inetd stop >/dev/null
   11.32      exec /etc/init.d/inetd start
   11.33  else
   11.34 -    echo "$NAME is already active."
   11.35 +    _ '%s is already active.' $NAME
   11.36      exit 1
   11.37  fi
   11.38  }
   11.39 @@ -35,11 +36,11 @@
   11.40  inactive_inetd()
   11.41  {
   11.42  if grep $DAEMON /etc/inetd.conf | grep -q ^\#; then
   11.43 -    echo "$NAME is not active."
   11.44 +    _ '%s is not active.' $NAME
   11.45      exit 1
   11.46  else
   11.47      sed -i "s,^.*$DAEMON.*$,#&," /etc/inetd.conf
   11.48 -    /etc/init.d/inetd stop > /dev/null
   11.49 +    /etc/init.d/inetd stop >/dev/null
   11.50      exec /etc/init.d/inetd start
   11.51  fi
   11.52  }
   11.53 @@ -48,43 +49,42 @@
   11.54    start)
   11.55      grep -qs $DAEMON /etc/inetd.conf && active_inetd
   11.56      if active_pidfile $PIDFILE $NAME ; then
   11.57 -      echo "$NAME is already running."
   11.58 +      _ '%s is already running.' $NAME
   11.59        exit 1
   11.60      fi
   11.61 -    echo -n "Starting $DESC: $NAME... "
   11.62 -    $DAEMON $OPTIONS 
   11.63 -    [ -f $PIDFILE ] || pidof $NAME | awk '{ print $1 }' > $PIDFILE
   11.64 +    action 'Starting %s: %s...' "$DESC" $NAME
   11.65 +    $DAEMON $OPTIONS
   11.66 +    [ -f $PIDFILE ] || pidof $NAME | awk '{print $1}' > $PIDFILE
   11.67      active_pidfile $PIDFILE $NAME
   11.68      status
   11.69      ;;
   11.70    stop)
   11.71      grep -qs $DAEMON /etc/inetd.conf && inactive_inetd
   11.72      if ! active_pidfile $PIDFILE $NAME ; then
   11.73 -      echo "$NAME is not running."
   11.74 +      _ '%s is not running.' $NAME
   11.75        exit 1
   11.76      fi
   11.77 -    echo -n "Stopping $DESC: $NAME... "
   11.78 -    kill `cat $PIDFILE`
   11.79 +    action 'Stopping %s: %s...' "$DESC" $NAME
   11.80 +    kill $(cat $PIDFILE)
   11.81      status
   11.82      ;;
   11.83    restart)
   11.84      grep -qs $DAEMON /etc/inetd.conf && exit 0
   11.85      if ! active_pidfile $PIDFILE $NAME ; then
   11.86 -      echo "$NAME is not running."
   11.87 +      _ '%s is not running.' $NAME
   11.88        exit 1
   11.89      fi
   11.90 -    echo -n "Restarting $DESC: $NAME... "
   11.91 -    kill `cat $PIDFILE`
   11.92 +    action 'Restarting %s: %s...' "$DESC" $NAME
   11.93 +    kill $(cat $PIDFILE)
   11.94      sleep 2
   11.95      $DAEMON $OPTIONS
   11.96 -    [ -f $PIDFILE ] || pidof $NAME | awk '{ print $1 }' > $PIDFILE
   11.97 +    [ -f $PIDFILE ] || pidof $NAME | awk '{print $1}' > $PIDFILE
   11.98      active_pidfile $PIDFILE $NAME
   11.99      status
  11.100      ;;
  11.101 -*)
  11.102 -    echo ""
  11.103 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
  11.104 -    echo ""
  11.105 +  *)
  11.106 +    emsg "<n><b>$(_ 'Usage:')</b> /etc/init.d/$(basename $0) [start|stop|restart]"
  11.107 +    newline
  11.108      exit 1
  11.109      ;;
  11.110  esac
    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/busybox/stuff/po/LINGUAS	Thu May 26 20:16:45 2016 +0300
    12.3 @@ -0,0 +1,1 @@
    12.4 +ru
    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/busybox/stuff/po/Makefile	Thu May 26 20:16:45 2016 +0300
    13.3 @@ -0,0 +1,51 @@
    13.4 +# Makefile for daemon.
    13.5 +#
    13.6 +prefix      ?= /usr
    13.7 +datarootdir ?= $(prefix)/share
    13.8 +localedir   ?= $(datarootdir)/locale
    13.9 +DESTDIR     ?=
   13.10 +LINGUAS     ?= $(shell cat LINGUAS)
   13.11 +POTFILES    ?= $(shell cat POTFILES)
   13.12 +VERSION     ?= 1.0
   13.13 +
   13.14 +.PHONY: all pot msgmerge msgfmt
   13.15 +
   13.16 +all: msgfmt
   13.17 +
   13.18 +pot:
   13.19 +	xgettext -o daemon.pot -L Shell \
   13.20 +		--package-name=daemon \
   13.21 +		--package-version="$(VERSION)" \
   13.22 +		-kaction -k_ -k_n \
   13.23 +		$(POTFILES)
   13.24 +
   13.25 +msgmerge:
   13.26 +	@for l in $(LINGUAS); do \
   13.27 +		if [ -f "$$l.po" ]; then \
   13.28 +			echo -n "Updating $$l po file."; \
   13.29 +			msgmerge -U $$l.po daemon.pot ; \
   13.30 +		fi; \
   13.31 +	done
   13.32 +
   13.33 +msgfmt:
   13.34 +	@for l in $(LINGUAS); do \
   13.35 +		if [ -f "$$l.po" ]; then \
   13.36 +			echo -n "Compiling daemon $$l mo file... "; \
   13.37 +			msgfmt -o $$l.mo $$l.po ; \
   13.38 +			echo "done"; \
   13.39 +		fi; \
   13.40 +	done;
   13.41 +
   13.42 +install: msgfmt
   13.43 +	@for l in $(LINGUAS); do \
   13.44 +		install -m 0755 -d $(DESTDIR)$(localedir)/$$l/LC_MESSAGES; \
   13.45 +		install -m 0644 $$l.mo \
   13.46 +			$(DESTDIR)$(localedir)/$$l/LC_MESSAGES/daemon.mo; \
   13.47 +	done;
   13.48 +
   13.49 +clean:
   13.50 +	rm -f *~
   13.51 +	rm -f *.mo
   13.52 +
   13.53 +help:
   13.54 +	@echo "make [ pot | msgmerge | msgfmt | all | install | clean ]"
    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/busybox/stuff/po/POTFILES	Thu May 26 20:16:45 2016 +0300
    14.3 @@ -0,0 +1,86 @@
    14.4 +../daemon
    14.5 +../../../acpid/stuff/init.d/acpid
    14.6 +../../../ajaxterm/stuff/etc/init.d/ajaxterm
    14.7 +../../../apache/stuff/apache
    14.8 +../../../at/stuff/atd
    14.9 +../../../autofs/stuff/etc/init.d/autofs
   14.10 +../../../backuppc/stuff/etc/init.d/backuppc
   14.11 +../../../bind/stuff/etc/init.d/named
   14.12 +../../../boxbackup-client/stuff/bbackupd
   14.13 +../../../boxbackup-server/stuff/bbstored
   14.14 +../../../cherokee/stuff/cherokee
   14.15 +../../../chillispot/stuff/chilli
   14.16 +../../../c_icap/stuff/c-icapd
   14.17 +../../../clamav/stuff/daemon-clamd
   14.18 +../../../collectd/stuff/collectd
   14.19 +../../../connman/stuff/etc/init.d/connman
   14.20 +../../../cups/stuff/etc/init.d/cupsd
   14.21 +../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd
   14.22 +../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl
   14.23 +../../../dbus/stuff/etc/init.d/dbus
   14.24 +../../../ddclient/stuff/ddclient
   14.25 +../../../dhcp/stuff/dhcpd
   14.26 +../../../dhid/stuff/init.d/dhid
   14.27 +../../../distcc/stuff/distccd
   14.28 +../../../dnsmasq/stuff/etc/init.d/dnsmasq
   14.29 +../../../dovecot/stuff/init.d/dovecot
   14.30 +../../../dropbear/stuff/init.d/dropbear
   14.31 +../../../fail2ban/stuff/etc/init.d/fail2ban
   14.32 +../../../fcron/stuff/fcron
   14.33 +../../../git/stuff/git-daemon
   14.34 +../../../gpm/stuff/etc/init.d/gpm
   14.35 +../../../hal/stuff/etc/init.d/hald
   14.36 +../../../hostapd/stuff/hostapd
   14.37 +../../../knock/stuff/etc/init.d/knock
   14.38 +../../../lighttpd/stuff/etc/init.d/lighttpd
   14.39 +../../../linux64-zram/stuff/compcache
   14.40 +../../../linux-zram/stuff/compcache
   14.41 +../../../lxdm/stuff/init.d/lxdm
   14.42 +../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon
   14.43 +../../../mariadb/stuff/etc/init.d/mysql
   14.44 +../../../motion/stuff/init.d/motion
   14.45 +../../../mpd/stuff/etc/init.d/mpd
   14.46 +../../../mysql/stuff/etc/init.d/mysql
   14.47 +../../../nagios/stuff/nagios
   14.48 +../../../nagios-nrpe/stuff/nrpe
   14.49 +../../../netatalk/stuff/etc/init.d/netatalk
   14.50 +../../../netatalk-pam/stuff/etc/init.d/netatalk
   14.51 +../../../nfs-utils/stuff/etc/init.d/nfsd
   14.52 +../../../nginx/stuff/etc/init.d/nginx
   14.53 +../../../nginx-extras/stuff/etc/init.d/nginx
   14.54 +../../../nscd/stuff/nscd
   14.55 +../../../ntop/stuff/etc/init.d/ntop
   14.56 +../../../ntp/stuff/ntp
   14.57 +../../../ofono/stuff/etc/init.d/ofono
   14.58 +../../../openerp-server/stuff/etc/init.d/openerp-server
   14.59 +../../../openerp-web/stuff/etc/init.d/openerp-web
   14.60 +../../../openldap/stuff/etc/init.d/openldap
   14.61 +../../../openssh/stuff/openssh
   14.62 +../../../open-vm-tools/stuff/vmtoolsd
   14.63 +../../../openvpn/stuff/etc/init.d/openvpn-client
   14.64 +../../../openvpn/stuff/etc/init.d/openvpn-server
   14.65 +../../../partimage/stuff/etc/init.d/partimaged
   14.66 +../../../pcsc-lite/stuff/init.d/pcscd
   14.67 +../../../perdition/stuff/etc/init.d/perdition
   14.68 +../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv
   14.69 +../../../portmap/stuff/init.d/portmap
   14.70 +../../../postfix/stuff/etc/init.d/postfix
   14.71 +../../../postgresql/stuff/etc/init.d/postgresql
   14.72 +../../../postgrey/stuff/etc/init.d/postgrey
   14.73 +../../../privoxy/stuff/daemon-privoxy
   14.74 +../../../pure-ftpd/stuff/pure-ftpd
   14.75 +../../../rsync/stuff/etc/init.d/rsyncd
   14.76 +../../../samba/stuff/etc/init.d/samba
   14.77 +../../../slim/stuff/etc/init.d/slim
   14.78 +../../../smartmontools/stuff/etc/init.d/smartd
   14.79 +../../../squid/stuff/etc/init.d/squid
   14.80 +../../../thttpd/stuff/etc/init.d/thttpd
   14.81 +../../../tinc/stuff/etc/init.d/tinc
   14.82 +../../../tinyproxy/stuff/tinyproxy
   14.83 +../../../transmission-daemon/stuff/transmission-daemon
   14.84 +../../../unfs3/stuff/etc/init.d/unfsd
   14.85 +../../../virtualbox-ose-guestutils/stuff/VBoxService
   14.86 +../../../wicd/stuff/wicd
   14.87 +../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant
   14.88 +../../../x11vnc/stuff/x11vnc
   14.89 +../../../ypserv/stuff/ypserv
    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/busybox/stuff/po/daemon.pot	Thu May 26 20:16:45 2016 +0300
    15.3 @@ -0,0 +1,784 @@
    15.4 +# SOME DESCRIPTIVE TITLE.
    15.5 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
    15.6 +# This file is distributed under the same license as the PACKAGE package.
    15.7 +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
    15.8 +#
    15.9 +#, fuzzy
   15.10 +msgid ""
   15.11 +msgstr ""
   15.12 +"Project-Id-Version: daemon 1.0\n"
   15.13 +"Report-Msgid-Bugs-To: \n"
   15.14 +"POT-Creation-Date: 2016-05-26 19:12+0300\n"
   15.15 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
   15.16 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
   15.17 +"Language-Team: LANGUAGE <LL@li.org>\n"
   15.18 +"Language: \n"
   15.19 +"MIME-Version: 1.0\n"
   15.20 +"Content-Type: text/plain; charset=CHARSET\n"
   15.21 +"Content-Transfer-Encoding: 8bit\n"
   15.22 +
   15.23 +#: ../daemon:11 ../../../at/stuff/atd:11
   15.24 +#: ../../../backuppc/stuff/etc/init.d/backuppc:12
   15.25 +#: ../../../bind/stuff/etc/init.d/named:12
   15.26 +#: ../../../boxbackup-client/stuff/bbackupd:12
   15.27 +#: ../../../clamav/stuff/daemon-clamd:12
   15.28 +#: ../../../cups/stuff/etc/init.d/cupsd:12 ../../../dhcp/stuff/dhcpd:12
   15.29 +#: ../../../distcc/stuff/distccd:23
   15.30 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:12
   15.31 +#: ../../../dovecot/stuff/init.d/dovecot:12 ../../../fcron/stuff/fcron:12
   15.32 +#: ../../../git/stuff/git-daemon:12 ../../../linux64-zram/stuff/compcache:10
   15.33 +#: ../../../linux-zram/stuff/compcache:10 ../../../nagios-nrpe/stuff/nrpe:12
   15.34 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:11
   15.35 +#: ../../../open-vm-tools/stuff/vmtoolsd:12
   15.36 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:12
   15.37 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:12
   15.38 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:11
   15.39 +#: ../../../rsync/stuff/etc/init.d/rsyncd:12
   15.40 +#: ../../../tinc/stuff/etc/init.d/tinc:12
   15.41 +#: ../../../transmission-daemon/stuff/transmission-daemon:12
   15.42 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:12
   15.43 +msgid "%s daemon"
   15.44 +msgstr ""
   15.45 +
   15.46 +#: ../daemon:31
   15.47 +msgid "%s is already active."
   15.48 +msgstr ""
   15.49 +
   15.50 +#: ../daemon:39
   15.51 +msgid "%s is not active."
   15.52 +msgstr ""
   15.53 +
   15.54 +#: ../daemon:52 ../../../acpid/stuff/init.d/acpid:20
   15.55 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:22
   15.56 +#: ../../../apache/stuff/apache:18 ../../../at/stuff/atd:19
   15.57 +#: ../../../autofs/stuff/etc/init.d/autofs:20
   15.58 +#: ../../../backuppc/stuff/etc/init.d/backuppc:21
   15.59 +#: ../../../bind/stuff/etc/init.d/named:22
   15.60 +#: ../../../boxbackup-client/stuff/bbackupd:20
   15.61 +#: ../../../boxbackup-server/stuff/bbstored:20
   15.62 +#: ../../../cherokee/stuff/cherokee:18 ../../../chillispot/stuff/chilli:21
   15.63 +#: ../../../c_icap/stuff/c-icapd:21 ../../../clamav/stuff/daemon-clamd:20
   15.64 +#: ../../../collectd/stuff/collectd:20
   15.65 +#: ../../../connman/stuff/etc/init.d/connman:21
   15.66 +#: ../../../cups/stuff/etc/init.d/cupsd:31
   15.67 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:21
   15.68 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:21
   15.69 +#: ../../../dbus/stuff/etc/init.d/dbus:23 ../../../ddclient/stuff/ddclient:19
   15.70 +#: ../../../dhcp/stuff/dhcpd:20 ../../../dhid/stuff/init.d/dhid:17
   15.71 +#: ../../../distcc/stuff/distccd:38
   15.72 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:20
   15.73 +#: ../../../dovecot/stuff/init.d/dovecot:24
   15.74 +#: ../../../dropbear/stuff/init.d/dropbear:35
   15.75 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:19
   15.76 +#: ../../../fcron/stuff/fcron:20 ../../../git/stuff/git-daemon:20
   15.77 +#: ../../../gpm/stuff/etc/init.d/gpm:20 ../../../hal/stuff/etc/init.d/hald:18
   15.78 +#: ../../../hostapd/stuff/hostapd:18 ../../../knock/stuff/etc/init.d/knock:22
   15.79 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:18
   15.80 +#: ../../../linux64-zram/stuff/compcache:16
   15.81 +#: ../../../linux-zram/stuff/compcache:16 ../../../lxdm/stuff/init.d/lxdm:18
   15.82 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:19
   15.83 +#: ../../../mariadb/stuff/etc/init.d/mysql:25
   15.84 +#: ../../../motion/stuff/init.d/motion:16 ../../../mpd/stuff/etc/init.d/mpd:19
   15.85 +#: ../../../mysql/stuff/etc/init.d/mysql:25 ../../../nagios/stuff/nagios:30
   15.86 +#: ../../../nagios-nrpe/stuff/nrpe:25
   15.87 +#: ../../../netatalk/stuff/etc/init.d/netatalk:45
   15.88 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:45
   15.89 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:25
   15.90 +#: ../../../nginx/stuff/etc/init.d/nginx:18
   15.91 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:18 ../../../nscd/stuff/nscd:23
   15.92 +#: ../../../ntop/stuff/etc/init.d/ntop:26 ../../../ntp/stuff/ntp:21
   15.93 +#: ../../../ofono/stuff/etc/init.d/ofono:21
   15.94 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:33
   15.95 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:22
   15.96 +#: ../../../openldap/stuff/etc/init.d/openldap:20
   15.97 +#: ../../../openssh/stuff/openssh:35 ../../../open-vm-tools/stuff/vmtoolsd:20
   15.98 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:42
   15.99 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:42
  15.100 +#: ../../../partimage/stuff/etc/init.d/partimaged:24
  15.101 +#: ../../../pcsc-lite/stuff/init.d/pcscd:17
  15.102 +#: ../../../perdition/stuff/etc/init.d/perdition:25
  15.103 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:20
  15.104 +#: ../../../portmap/stuff/init.d/portmap:23
  15.105 +#: ../../../postfix/stuff/etc/init.d/postfix:20
  15.106 +#: ../../../postgrey/stuff/etc/init.d/postgrey:21
  15.107 +#: ../../../privoxy/stuff/daemon-privoxy:22
  15.108 +#: ../../../pure-ftpd/stuff/pure-ftpd:27
  15.109 +#: ../../../rsync/stuff/etc/init.d/rsyncd:20
  15.110 +#: ../../../samba/stuff/etc/init.d/samba:23
  15.111 +#: ../../../samba/stuff/etc/init.d/samba:30
  15.112 +#: ../../../slim/stuff/etc/init.d/slim:19
  15.113 +#: ../../../smartmontools/stuff/etc/init.d/smartd:21
  15.114 +#: ../../../squid/stuff/etc/init.d/squid:23
  15.115 +#: ../../../thttpd/stuff/etc/init.d/thttpd:21
  15.116 +#: ../../../tinc/stuff/etc/init.d/tinc:20
  15.117 +#: ../../../tinyproxy/stuff/tinyproxy:15
  15.118 +#: ../../../transmission-daemon/stuff/transmission-daemon:20
  15.119 +#: ../../../unfs3/stuff/etc/init.d/unfsd:23
  15.120 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:18
  15.121 +#: ../../../wicd/stuff/wicd:20
  15.122 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:20
  15.123 +#: ../../../x11vnc/stuff/x11vnc:17 ../../../ypserv/stuff/ypserv:20
  15.124 +msgid "%s is already running."
  15.125 +msgstr ""
  15.126 +
  15.127 +#: ../daemon:55 ../../../acpid/stuff/init.d/acpid:23
  15.128 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:25
  15.129 +#: ../../../apache/stuff/apache:21 ../../../at/stuff/atd:22
  15.130 +#: ../../../autofs/stuff/etc/init.d/autofs:23
  15.131 +#: ../../../backuppc/stuff/etc/init.d/backuppc:24
  15.132 +#: ../../../bind/stuff/etc/init.d/named:25
  15.133 +#: ../../../boxbackup-client/stuff/bbackupd:23
  15.134 +#: ../../../boxbackup-server/stuff/bbstored:23
  15.135 +#: ../../../cherokee/stuff/cherokee:21 ../../../chillispot/stuff/chilli:24
  15.136 +#: ../../../c_icap/stuff/c-icapd:24 ../../../clamav/stuff/daemon-clamd:23
  15.137 +#: ../../../collectd/stuff/collectd:23
  15.138 +#: ../../../connman/stuff/etc/init.d/connman:25
  15.139 +#: ../../../cups/stuff/etc/init.d/cupsd:27
  15.140 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:66
  15.141 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:24
  15.142 +#: ../../../dbus/stuff/etc/init.d/dbus:27 ../../../ddclient/stuff/ddclient:22
  15.143 +#: ../../../dhcp/stuff/dhcpd:23 ../../../dhid/stuff/init.d/dhid:20
  15.144 +#: ../../../distcc/stuff/distccd:41
  15.145 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:23
  15.146 +#: ../../../dovecot/stuff/init.d/dovecot:27
  15.147 +#: ../../../dropbear/stuff/init.d/dropbear:38
  15.148 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:22
  15.149 +#: ../../../fcron/stuff/fcron:23 ../../../git/stuff/git-daemon:23
  15.150 +#: ../../../gpm/stuff/etc/init.d/gpm:23 ../../../hal/stuff/etc/init.d/hald:21
  15.151 +#: ../../../hostapd/stuff/hostapd:21 ../../../knock/stuff/etc/init.d/knock:25
  15.152 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:21
  15.153 +#: ../../../linux64-zram/stuff/compcache:24
  15.154 +#: ../../../linux-zram/stuff/compcache:24 ../../../lxdm/stuff/init.d/lxdm:21
  15.155 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:22
  15.156 +#: ../../../mariadb/stuff/etc/init.d/mysql:34
  15.157 +#: ../../../motion/stuff/init.d/motion:19 ../../../mpd/stuff/etc/init.d/mpd:22
  15.158 +#: ../../../mysql/stuff/etc/init.d/mysql:34 ../../../nagios/stuff/nagios:33
  15.159 +#: ../../../nagios-nrpe/stuff/nrpe:28
  15.160 +#: ../../../netatalk/stuff/etc/init.d/netatalk:48
  15.161 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:48
  15.162 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:28
  15.163 +#: ../../../nginx/stuff/etc/init.d/nginx:21
  15.164 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:21 ../../../nscd/stuff/nscd:26
  15.165 +#: ../../../ntop/stuff/etc/init.d/ntop:33 ../../../ntp/stuff/ntp:24
  15.166 +#: ../../../ofono/stuff/etc/init.d/ofono:24
  15.167 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:36
  15.168 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:25
  15.169 +#: ../../../openldap/stuff/etc/init.d/openldap:23
  15.170 +#: ../../../openssh/stuff/openssh:38 ../../../open-vm-tools/stuff/vmtoolsd:23
  15.171 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:45
  15.172 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:45
  15.173 +#: ../../../partimage/stuff/etc/init.d/partimaged:29
  15.174 +#: ../../../pcsc-lite/stuff/init.d/pcscd:20
  15.175 +#: ../../../perdition/stuff/etc/init.d/perdition:28
  15.176 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:23
  15.177 +#: ../../../portmap/stuff/init.d/portmap:27
  15.178 +#: ../../../postfix/stuff/etc/init.d/postfix:23
  15.179 +#: ../../../postgresql/stuff/etc/init.d/postgresql:25
  15.180 +#: ../../../postgrey/stuff/etc/init.d/postgrey:36
  15.181 +#: ../../../privoxy/stuff/daemon-privoxy:25
  15.182 +#: ../../../pure-ftpd/stuff/pure-ftpd:30
  15.183 +#: ../../../rsync/stuff/etc/init.d/rsyncd:23
  15.184 +#: ../../../samba/stuff/etc/init.d/samba:25
  15.185 +#: ../../../samba/stuff/etc/init.d/samba:32
  15.186 +#: ../../../slim/stuff/etc/init.d/slim:22
  15.187 +#: ../../../smartmontools/stuff/etc/init.d/smartd:24
  15.188 +#: ../../../squid/stuff/etc/init.d/squid:33
  15.189 +#: ../../../thttpd/stuff/etc/init.d/thttpd:24
  15.190 +#: ../../../tinc/stuff/etc/init.d/tinc:23
  15.191 +#: ../../../tinyproxy/stuff/tinyproxy:18
  15.192 +#: ../../../transmission-daemon/stuff/transmission-daemon:23
  15.193 +#: ../../../unfs3/stuff/etc/init.d/unfsd:27
  15.194 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:21
  15.195 +#: ../../../wicd/stuff/wicd:23
  15.196 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:23
  15.197 +#: ../../../x11vnc/stuff/x11vnc:20 ../../../ypserv/stuff/ypserv:23
  15.198 +msgid "Starting %s: %s..."
  15.199 +msgstr ""
  15.200 +
  15.201 +#: ../daemon:64 ../daemon:74 ../../../acpid/stuff/init.d/acpid:29
  15.202 +#: ../../../acpid/stuff/init.d/acpid:38
  15.203 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:32
  15.204 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:43
  15.205 +#: ../../../apache/stuff/apache:27 ../../../apache/stuff/apache:37
  15.206 +#: ../../../apache/stuff/apache:46 ../../../at/stuff/atd:30
  15.207 +#: ../../../at/stuff/atd:39 ../../../autofs/stuff/etc/init.d/autofs:30
  15.208 +#: ../../../autofs/stuff/etc/init.d/autofs:40
  15.209 +#: ../../../backuppc/stuff/etc/init.d/backuppc:31
  15.210 +#: ../../../backuppc/stuff/etc/init.d/backuppc:41
  15.211 +#: ../../../bind/stuff/etc/init.d/named:31
  15.212 +#: ../../../bind/stuff/etc/init.d/named:44
  15.213 +#: ../../../boxbackup-client/stuff/bbackupd:29
  15.214 +#: ../../../boxbackup-client/stuff/bbackupd:39
  15.215 +#: ../../../boxbackup-server/stuff/bbstored:29
  15.216 +#: ../../../boxbackup-server/stuff/bbstored:39
  15.217 +#: ../../../cherokee/stuff/cherokee:27 ../../../cherokee/stuff/cherokee:36
  15.218 +#: ../../../chillispot/stuff/chilli:30 ../../../chillispot/stuff/chilli:39
  15.219 +#: ../../../c_icap/stuff/c-icapd:30 ../../../c_icap/stuff/c-icapd:39
  15.220 +#: ../../../clamav/stuff/daemon-clamd:29 ../../../clamav/stuff/daemon-clamd:39
  15.221 +#: ../../../collectd/stuff/collectd:29 ../../../collectd/stuff/collectd:38
  15.222 +#: ../../../connman/stuff/etc/init.d/connman:31
  15.223 +#: ../../../connman/stuff/etc/init.d/connman:41
  15.224 +#: ../../../connman/stuff/etc/init.d/connman:55
  15.225 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:73
  15.226 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:83
  15.227 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:30
  15.228 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:39
  15.229 +#: ../../../dbus/stuff/etc/init.d/dbus:33
  15.230 +#: ../../../dbus/stuff/etc/init.d/dbus:43 ../../../ddclient/stuff/ddclient:28
  15.231 +#: ../../../ddclient/stuff/ddclient:38 ../../../dhcp/stuff/dhcpd:29
  15.232 +#: ../../../dhcp/stuff/dhcpd:38 ../../../dhid/stuff/init.d/dhid:26
  15.233 +#: ../../../dhid/stuff/init.d/dhid:36 ../../../distcc/stuff/distccd:47
  15.234 +#: ../../../distcc/stuff/distccd:56
  15.235 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:29
  15.236 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:39
  15.237 +#: ../../../dovecot/stuff/init.d/dovecot:33
  15.238 +#: ../../../dovecot/stuff/init.d/dovecot:42
  15.239 +#: ../../../dropbear/stuff/init.d/dropbear:44
  15.240 +#: ../../../dropbear/stuff/init.d/dropbear:53
  15.241 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:35
  15.242 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:44
  15.243 +#: ../../../fcron/stuff/fcron:29 ../../../fcron/stuff/fcron:38
  15.244 +#: ../../../git/stuff/git-daemon:29 ../../../git/stuff/git-daemon:38
  15.245 +#: ../../../gpm/stuff/etc/init.d/gpm:29 ../../../gpm/stuff/etc/init.d/gpm:38
  15.246 +#: ../../../hal/stuff/etc/init.d/hald:27 ../../../hal/stuff/etc/init.d/hald:36
  15.247 +#: ../../../hostapd/stuff/hostapd:27 ../../../hostapd/stuff/hostapd:36
  15.248 +#: ../../../knock/stuff/etc/init.d/knock:31
  15.249 +#: ../../../knock/stuff/etc/init.d/knock:40
  15.250 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:27
  15.251 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:37
  15.252 +#: ../../../linux64-zram/stuff/compcache:30
  15.253 +#: ../../../linux-zram/stuff/compcache:30 ../../../lxdm/stuff/init.d/lxdm:26
  15.254 +#: ../../../lxdm/stuff/init.d/lxdm:35
  15.255 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:29
  15.256 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:39
  15.257 +#: ../../../mariadb/stuff/etc/init.d/mysql:47
  15.258 +#: ../../../mariadb/stuff/etc/init.d/mysql:57
  15.259 +#: ../../../motion/stuff/init.d/motion:26 ../../../mpd/stuff/etc/init.d/mpd:29
  15.260 +#: ../../../mpd/stuff/etc/init.d/mpd:38
  15.261 +#: ../../../mysql/stuff/etc/init.d/mysql:47
  15.262 +#: ../../../mysql/stuff/etc/init.d/mysql:57 ../../../nagios/stuff/nagios:40
  15.263 +#: ../../../nagios/stuff/nagios:49 ../../../nagios-nrpe/stuff/nrpe:34
  15.264 +#: ../../../nagios-nrpe/stuff/nrpe:43
  15.265 +#: ../../../netatalk/stuff/etc/init.d/netatalk:58
  15.266 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:58
  15.267 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:45
  15.268 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:60
  15.269 +#: ../../../nginx/stuff/etc/init.d/nginx:27
  15.270 +#: ../../../nginx/stuff/etc/init.d/nginx:37
  15.271 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:27
  15.272 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:37 ../../../nscd/stuff/nscd:33
  15.273 +#: ../../../nscd/stuff/nscd:43 ../../../ntop/stuff/etc/init.d/ntop:39
  15.274 +#: ../../../ntop/stuff/etc/init.d/ntop:48 ../../../ntp/stuff/ntp:31
  15.275 +#: ../../../ntp/stuff/ntp:41 ../../../ofono/stuff/etc/init.d/ofono:31
  15.276 +#: ../../../ofono/stuff/etc/init.d/ofono:41
  15.277 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:47
  15.278 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:57
  15.279 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:31
  15.280 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:40
  15.281 +#: ../../../openldap/stuff/etc/init.d/openldap:35
  15.282 +#: ../../../openldap/stuff/etc/init.d/openldap:44
  15.283 +#: ../../../openssh/stuff/openssh:44 ../../../openssh/stuff/openssh:53
  15.284 +#: ../../../open-vm-tools/stuff/vmtoolsd:34
  15.285 +#: ../../../open-vm-tools/stuff/vmtoolsd:43
  15.286 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:51
  15.287 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:61
  15.288 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:51
  15.289 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:61
  15.290 +#: ../../../partimage/stuff/etc/init.d/partimaged:40
  15.291 +#: ../../../pcsc-lite/stuff/init.d/pcscd:26
  15.292 +#: ../../../perdition/stuff/etc/init.d/perdition:38
  15.293 +#: ../../../perdition/stuff/etc/init.d/perdition:50
  15.294 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:31
  15.295 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:40
  15.296 +#: ../../../portmap/stuff/init.d/portmap:46
  15.297 +#: ../../../postfix/stuff/etc/init.d/postfix:29
  15.298 +#: ../../../postfix/stuff/etc/init.d/postfix:38
  15.299 +#: ../../../postfix/stuff/etc/init.d/postfix:49
  15.300 +#: ../../../postgrey/stuff/etc/init.d/postgrey:42
  15.301 +#: ../../../postgrey/stuff/etc/init.d/postgrey:51
  15.302 +#: ../../../privoxy/stuff/daemon-privoxy:31
  15.303 +#: ../../../privoxy/stuff/daemon-privoxy:41
  15.304 +#: ../../../pure-ftpd/stuff/pure-ftpd:36 ../../../pure-ftpd/stuff/pure-ftpd:45
  15.305 +#: ../../../rsync/stuff/etc/init.d/rsyncd:29
  15.306 +#: ../../../rsync/stuff/etc/init.d/rsyncd:39
  15.307 +#: ../../../samba/stuff/etc/init.d/samba:39
  15.308 +#: ../../../samba/stuff/etc/init.d/samba:46
  15.309 +#: ../../../samba/stuff/etc/init.d/samba:59
  15.310 +#: ../../../slim/stuff/etc/init.d/slim:28
  15.311 +#: ../../../slim/stuff/etc/init.d/slim:38
  15.312 +#: ../../../smartmontools/stuff/etc/init.d/smartd:30
  15.313 +#: ../../../smartmontools/stuff/etc/init.d/smartd:39
  15.314 +#: ../../../squid/stuff/etc/init.d/squid:40
  15.315 +#: ../../../squid/stuff/etc/init.d/squid:51
  15.316 +#: ../../../squid/stuff/etc/init.d/squid:60
  15.317 +#: ../../../thttpd/stuff/etc/init.d/thttpd:30
  15.318 +#: ../../../thttpd/stuff/etc/init.d/thttpd:39
  15.319 +#: ../../../tinc/stuff/etc/init.d/tinc:29
  15.320 +#: ../../../tinc/stuff/etc/init.d/tinc:38
  15.321 +#: ../../../tinyproxy/stuff/tinyproxy:24 ../../../tinyproxy/stuff/tinyproxy:34
  15.322 +#: ../../../transmission-daemon/stuff/transmission-daemon:29
  15.323 +#: ../../../transmission-daemon/stuff/transmission-daemon:39
  15.324 +#: ../../../unfs3/stuff/etc/init.d/unfsd:38
  15.325 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:27
  15.326 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:36
  15.327 +#: ../../../wicd/stuff/wicd:29 ../../../wicd/stuff/wicd:39
  15.328 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:29
  15.329 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:38
  15.330 +#: ../../../x11vnc/stuff/x11vnc:26 ../../../x11vnc/stuff/x11vnc:35
  15.331 +#: ../../../ypserv/stuff/ypserv:30 ../../../ypserv/stuff/ypserv:39
  15.332 +msgid "%s is not running."
  15.333 +msgstr ""
  15.334 +
  15.335 +#: ../daemon:67 ../../../acpid/stuff/init.d/acpid:32
  15.336 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:35
  15.337 +#: ../../../apache/stuff/apache:30 ../../../apache/stuff/apache:40
  15.338 +#: ../../../at/stuff/atd:33 ../../../autofs/stuff/etc/init.d/autofs:33
  15.339 +#: ../../../backuppc/stuff/etc/init.d/backuppc:34
  15.340 +#: ../../../bind/stuff/etc/init.d/named:34
  15.341 +#: ../../../boxbackup-client/stuff/bbackupd:32
  15.342 +#: ../../../boxbackup-server/stuff/bbstored:32
  15.343 +#: ../../../cherokee/stuff/cherokee:30 ../../../chillispot/stuff/chilli:33
  15.344 +#: ../../../c_icap/stuff/c-icapd:33 ../../../clamav/stuff/daemon-clamd:32
  15.345 +#: ../../../collectd/stuff/collectd:32
  15.346 +#: ../../../connman/stuff/etc/init.d/connman:34
  15.347 +#: ../../../cups/stuff/etc/init.d/cupsd:19
  15.348 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:76
  15.349 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:33
  15.350 +#: ../../../dbus/stuff/etc/init.d/dbus:36 ../../../ddclient/stuff/ddclient:31
  15.351 +#: ../../../dhcp/stuff/dhcpd:32 ../../../dhid/stuff/init.d/dhid:29
  15.352 +#: ../../../distcc/stuff/distccd:50
  15.353 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:32
  15.354 +#: ../../../dovecot/stuff/init.d/dovecot:36
  15.355 +#: ../../../dropbear/stuff/init.d/dropbear:47
  15.356 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:28
  15.357 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:38
  15.358 +#: ../../../fcron/stuff/fcron:32 ../../../git/stuff/git-daemon:32
  15.359 +#: ../../../gpm/stuff/etc/init.d/gpm:32 ../../../hal/stuff/etc/init.d/hald:30
  15.360 +#: ../../../hostapd/stuff/hostapd:30 ../../../knock/stuff/etc/init.d/knock:34
  15.361 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:30
  15.362 +#: ../../../linux64-zram/stuff/compcache:33
  15.363 +#: ../../../linux-zram/stuff/compcache:33 ../../../lxdm/stuff/init.d/lxdm:29
  15.364 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:32
  15.365 +#: ../../../mariadb/stuff/etc/init.d/mysql:50
  15.366 +#: ../../../motion/stuff/init.d/motion:29 ../../../mpd/stuff/etc/init.d/mpd:32
  15.367 +#: ../../../mysql/stuff/etc/init.d/mysql:50 ../../../nagios-nrpe/stuff/nrpe:37
  15.368 +#: ../../../netatalk/stuff/etc/init.d/netatalk:61
  15.369 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:61
  15.370 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:48
  15.371 +#: ../../../nginx/stuff/etc/init.d/nginx:30
  15.372 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:30 ../../../nscd/stuff/nscd:36
  15.373 +#: ../../../ntop/stuff/etc/init.d/ntop:42 ../../../ntp/stuff/ntp:34
  15.374 +#: ../../../ofono/stuff/etc/init.d/ofono:34
  15.375 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:50
  15.376 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:34
  15.377 +#: ../../../openldap/stuff/etc/init.d/openldap:38
  15.378 +#: ../../../openssh/stuff/openssh:47 ../../../open-vm-tools/stuff/vmtoolsd:37
  15.379 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:54
  15.380 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:54
  15.381 +#: ../../../partimage/stuff/etc/init.d/partimaged:43
  15.382 +#: ../../../pcsc-lite/stuff/init.d/pcscd:29
  15.383 +#: ../../../perdition/stuff/etc/init.d/perdition:41
  15.384 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:34
  15.385 +#: ../../../portmap/stuff/init.d/portmap:49
  15.386 +#: ../../../postfix/stuff/etc/init.d/postfix:32
  15.387 +#: ../../../postgresql/stuff/etc/init.d/postgresql:39
  15.388 +#: ../../../postgrey/stuff/etc/init.d/postgrey:45
  15.389 +#: ../../../privoxy/stuff/daemon-privoxy:34
  15.390 +#: ../../../pure-ftpd/stuff/pure-ftpd:39
  15.391 +#: ../../../rsync/stuff/etc/init.d/rsyncd:32
  15.392 +#: ../../../samba/stuff/etc/init.d/samba:41
  15.393 +#: ../../../samba/stuff/etc/init.d/samba:48
  15.394 +#: ../../../slim/stuff/etc/init.d/slim:31
  15.395 +#: ../../../smartmontools/stuff/etc/init.d/smartd:33
  15.396 +#: ../../../squid/stuff/etc/init.d/squid:43
  15.397 +#: ../../../thttpd/stuff/etc/init.d/thttpd:33
  15.398 +#: ../../../tinc/stuff/etc/init.d/tinc:32
  15.399 +#: ../../../tinyproxy/stuff/tinyproxy:27
  15.400 +#: ../../../transmission-daemon/stuff/transmission-daemon:32
  15.401 +#: ../../../unfs3/stuff/etc/init.d/unfsd:41
  15.402 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:30
  15.403 +#: ../../../wicd/stuff/wicd:32
  15.404 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:32
  15.405 +#: ../../../x11vnc/stuff/x11vnc:29 ../../../ypserv/stuff/ypserv:33
  15.406 +msgid "Stopping %s: %s..."
  15.407 +msgstr ""
  15.408 +
  15.409 +#: ../daemon:77 ../../../acpid/stuff/init.d/acpid:41
  15.410 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:46
  15.411 +#: ../../../apache/stuff/apache:49 ../../../at/stuff/atd:42
  15.412 +#: ../../../autofs/stuff/etc/init.d/autofs:43
  15.413 +#: ../../../backuppc/stuff/etc/init.d/backuppc:44
  15.414 +#: ../../../bind/stuff/etc/init.d/named:47
  15.415 +#: ../../../boxbackup-client/stuff/bbackupd:42
  15.416 +#: ../../../boxbackup-server/stuff/bbstored:42
  15.417 +#: ../../../cherokee/stuff/cherokee:39 ../../../chillispot/stuff/chilli:42
  15.418 +#: ../../../c_icap/stuff/c-icapd:42 ../../../clamav/stuff/daemon-clamd:42
  15.419 +#: ../../../collectd/stuff/collectd:41
  15.420 +#: ../../../connman/stuff/etc/init.d/connman:44
  15.421 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:86
  15.422 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:42
  15.423 +#: ../../../dbus/stuff/etc/init.d/dbus:47 ../../../ddclient/stuff/ddclient:41
  15.424 +#: ../../../dhcp/stuff/dhcpd:41 ../../../dhid/stuff/init.d/dhid:39
  15.425 +#: ../../../distcc/stuff/distccd:59
  15.426 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:42
  15.427 +#: ../../../dovecot/stuff/init.d/dovecot:45
  15.428 +#: ../../../dropbear/stuff/init.d/dropbear:56
  15.429 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:47
  15.430 +#: ../../../fcron/stuff/fcron:41 ../../../git/stuff/git-daemon:41
  15.431 +#: ../../../gpm/stuff/etc/init.d/gpm:41 ../../../hal/stuff/etc/init.d/hald:39
  15.432 +#: ../../../hostapd/stuff/hostapd:39 ../../../knock/stuff/etc/init.d/knock:43
  15.433 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:40
  15.434 +#: ../../../lxdm/stuff/init.d/lxdm:38
  15.435 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:42
  15.436 +#: ../../../mariadb/stuff/etc/init.d/mysql:60
  15.437 +#: ../../../motion/stuff/init.d/motion:39 ../../../mpd/stuff/etc/init.d/mpd:41
  15.438 +#: ../../../mysql/stuff/etc/init.d/mysql:60 ../../../nagios/stuff/nagios:52
  15.439 +#: ../../../nagios-nrpe/stuff/nrpe:46
  15.440 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:63
  15.441 +#: ../../../nginx/stuff/etc/init.d/nginx:40
  15.442 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:40 ../../../nscd/stuff/nscd:46
  15.443 +#: ../../../ntop/stuff/etc/init.d/ntop:51 ../../../ntp/stuff/ntp:44
  15.444 +#: ../../../ofono/stuff/etc/init.d/ofono:44
  15.445 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:60
  15.446 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:43
  15.447 +#: ../../../openldap/stuff/etc/init.d/openldap:47
  15.448 +#: ../../../openssh/stuff/openssh:56 ../../../open-vm-tools/stuff/vmtoolsd:46
  15.449 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:64
  15.450 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:64
  15.451 +#: ../../../perdition/stuff/etc/init.d/perdition:53
  15.452 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:43
  15.453 +#: ../../../postfix/stuff/etc/init.d/postfix:41
  15.454 +#: ../../../postgresql/stuff/etc/init.d/postgresql:44
  15.455 +#: ../../../postgrey/stuff/etc/init.d/postgrey:54
  15.456 +#: ../../../privoxy/stuff/daemon-privoxy:47
  15.457 +#: ../../../pure-ftpd/stuff/pure-ftpd:48
  15.458 +#: ../../../rsync/stuff/etc/init.d/rsyncd:42
  15.459 +#: ../../../slim/stuff/etc/init.d/slim:41
  15.460 +#: ../../../smartmontools/stuff/etc/init.d/smartd:42
  15.461 +#: ../../../squid/stuff/etc/init.d/squid:63
  15.462 +#: ../../../thttpd/stuff/etc/init.d/thttpd:42
  15.463 +#: ../../../tinc/stuff/etc/init.d/tinc:41
  15.464 +#: ../../../tinyproxy/stuff/tinyproxy:37
  15.465 +#: ../../../transmission-daemon/stuff/transmission-daemon:42
  15.466 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:39
  15.467 +#: ../../../wicd/stuff/wicd:42
  15.468 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:41
  15.469 +#: ../../../x11vnc/stuff/x11vnc:38 ../../../ypserv/stuff/ypserv:42
  15.470 +msgid "Restarting %s: %s..."
  15.471 +msgstr ""
  15.472 +
  15.473 +#: ../daemon:86 ../../../acpid/stuff/init.d/acpid:48
  15.474 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:55
  15.475 +#: ../../../apache/stuff/apache:54 ../../../at/stuff/atd:51
  15.476 +#: ../../../autofs/stuff/etc/init.d/autofs:50
  15.477 +#: ../../../backuppc/stuff/etc/init.d/backuppc:57
  15.478 +#: ../../../bind/stuff/etc/init.d/named:54
  15.479 +#: ../../../boxbackup-client/stuff/bbackupd:50
  15.480 +#: ../../../boxbackup-server/stuff/bbstored:50
  15.481 +#: ../../../cherokee/stuff/cherokee:47 ../../../chillispot/stuff/chilli:49
  15.482 +#: ../../../c_icap/stuff/c-icapd:51 ../../../clamav/stuff/daemon-clamd:50
  15.483 +#: ../../../collectd/stuff/collectd:48
  15.484 +#: ../../../connman/stuff/etc/init.d/connman:59
  15.485 +#: ../../../cups/stuff/etc/init.d/cupsd:35
  15.486 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:98
  15.487 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:49
  15.488 +#: ../../../dbus/stuff/etc/init.d/dbus:55 ../../../ddclient/stuff/ddclient:49
  15.489 +#: ../../../dhcp/stuff/dhcpd:48 ../../../dhid/stuff/init.d/dhid:47
  15.490 +#: ../../../distcc/stuff/distccd:64
  15.491 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:50
  15.492 +#: ../../../dovecot/stuff/init.d/dovecot:52
  15.493 +#: ../../../dropbear/stuff/init.d/dropbear:63
  15.494 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:53
  15.495 +#: ../../../fcron/stuff/fcron:48 ../../../git/stuff/git-daemon:48
  15.496 +#: ../../../gpm/stuff/etc/init.d/gpm:48 ../../../hal/stuff/etc/init.d/hald:46
  15.497 +#: ../../../hostapd/stuff/hostapd:46 ../../../knock/stuff/etc/init.d/knock:50
  15.498 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:48
  15.499 +#: ../../../linux64-zram/stuff/compcache:41
  15.500 +#: ../../../linux-zram/stuff/compcache:41 ../../../lxdm/stuff/init.d/lxdm:45
  15.501 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:51
  15.502 +#: ../../../mariadb/stuff/etc/init.d/mysql:68
  15.503 +#: ../../../motion/stuff/init.d/motion:47 ../../../mpd/stuff/etc/init.d/mpd:48
  15.504 +#: ../../../mysql/stuff/etc/init.d/mysql:68 ../../../nagios/stuff/nagios:62
  15.505 +#: ../../../nagios-nrpe/stuff/nrpe:53
  15.506 +#: ../../../netatalk/stuff/etc/init.d/netatalk:74
  15.507 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:74
  15.508 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:77
  15.509 +#: ../../../nginx/stuff/etc/init.d/nginx:48
  15.510 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:48 ../../../nscd/stuff/nscd:54
  15.511 +#: ../../../ntop/stuff/etc/init.d/ntop:58 ../../../ntp/stuff/ntp:51
  15.512 +#: ../../../ofono/stuff/etc/init.d/ofono:52
  15.513 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:68
  15.514 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:50
  15.515 +#: ../../../openldap/stuff/etc/init.d/openldap:54
  15.516 +#: ../../../openssh/stuff/openssh:63 ../../../open-vm-tools/stuff/vmtoolsd:53
  15.517 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:72
  15.518 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:72
  15.519 +#: ../../../partimage/stuff/etc/init.d/partimaged:53
  15.520 +#: ../../../pcsc-lite/stuff/init.d/pcscd:38
  15.521 +#: ../../../perdition/stuff/etc/init.d/perdition:70
  15.522 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:52
  15.523 +#: ../../../portmap/stuff/init.d/portmap:65
  15.524 +#: ../../../postfix/stuff/etc/init.d/postfix:58
  15.525 +#: ../../../postgresql/stuff/etc/init.d/postgresql:54
  15.526 +#: ../../../postgrey/stuff/etc/init.d/postgrey:61
  15.527 +#: ../../../privoxy/stuff/daemon-privoxy:52
  15.528 +#: ../../../pure-ftpd/stuff/pure-ftpd:55
  15.529 +#: ../../../rsync/stuff/etc/init.d/rsyncd:50
  15.530 +#: ../../../samba/stuff/etc/init.d/samba:67
  15.531 +#: ../../../slim/stuff/etc/init.d/slim:49
  15.532 +#: ../../../smartmontools/stuff/etc/init.d/smartd:49
  15.533 +#: ../../../squid/stuff/etc/init.d/squid:69
  15.534 +#: ../../../thttpd/stuff/etc/init.d/thttpd:49
  15.535 +#: ../../../tinc/stuff/etc/init.d/tinc:48
  15.536 +#: ../../../tinyproxy/stuff/tinyproxy:45
  15.537 +#: ../../../transmission-daemon/stuff/transmission-daemon:50
  15.538 +#: ../../../unfs3/stuff/etc/init.d/unfsd:51
  15.539 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:46
  15.540 +#: ../../../wicd/stuff/wicd:50
  15.541 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:48
  15.542 +#: ../../../x11vnc/stuff/x11vnc:45 ../../../ypserv/stuff/ypserv:49
  15.543 +msgid "Usage:"
  15.544 +msgstr ""
  15.545 +
  15.546 +#: ../../../acpid/stuff/init.d/acpid:12
  15.547 +msgid "ACPI event deamon"
  15.548 +msgstr ""
  15.549 +
  15.550 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:12
  15.551 +#: ../../../autofs/stuff/etc/init.d/autofs:12
  15.552 +#: ../../../chillispot/stuff/chilli:12 ../../../c_icap/stuff/c-icapd:12
  15.553 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:12
  15.554 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:12
  15.555 +#: ../../../dropbear/stuff/init.d/dropbear:12
  15.556 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:10
  15.557 +#: ../../../gpm/stuff/etc/init.d/gpm:12
  15.558 +#: ../../../knock/stuff/etc/init.d/knock:12
  15.559 +#: ../../../mariadb/stuff/etc/init.d/mysql:12
  15.560 +#: ../../../mysql/stuff/etc/init.d/mysql:12
  15.561 +#: ../../../ntop/stuff/etc/init.d/ntop:12 ../../../ntp/stuff/ntp:12
  15.562 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:12
  15.563 +#: ../../../openldap/stuff/etc/init.d/openldap:12
  15.564 +#: ../../../openssh/stuff/openssh:12
  15.565 +#: ../../../partimage/stuff/etc/init.d/partimaged:12
  15.566 +#: ../../../postfix/stuff/etc/init.d/postfix:12
  15.567 +#: ../../../postgresql/stuff/etc/init.d/postgresql:12
  15.568 +#: ../../../samba/stuff/etc/init.d/samba:12
  15.569 +#: ../../../thttpd/stuff/etc/init.d/thttpd:12
  15.570 +#: ../../../unfs3/stuff/etc/init.d/unfsd:12 ../../../x11vnc/stuff/x11vnc:10
  15.571 +#: ../../../ypserv/stuff/ypserv:12
  15.572 +msgid "%s server"
  15.573 +msgstr ""
  15.574 +
  15.575 +#: ../../../apache/stuff/apache:10
  15.576 +msgid "Apache Web Server"
  15.577 +msgstr ""
  15.578 +
  15.579 +#: ../../../boxbackup-server/stuff/bbstored:12
  15.580 +msgid "BoxBackup server deamon"
  15.581 +msgstr ""
  15.582 +
  15.583 +#: ../../../cherokee/stuff/cherokee:10
  15.584 +msgid "Cherokee Web Server"
  15.585 +msgstr ""
  15.586 +
  15.587 +#: ../../../collectd/stuff/collectd:12
  15.588 +msgid "Statistics collection daemon"
  15.589 +msgstr ""
  15.590 +
  15.591 +#: ../../../connman/stuff/etc/init.d/connman:13
  15.592 +msgid "Connection Manager"
  15.593 +msgstr ""
  15.594 +
  15.595 +#: ../../../connman/stuff/etc/init.d/connman:53
  15.596 +msgid "%s is running."
  15.597 +msgstr ""
  15.598 +
  15.599 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:26
  15.600 +msgid "Initialize %s..."
  15.601 +msgstr ""
  15.602 +
  15.603 +#: ../../../dbus/stuff/etc/init.d/dbus:10
  15.604 +msgid "message bus daemon"
  15.605 +msgstr ""
  15.606 +
  15.607 +#: ../../../ddclient/stuff/ddclient:11
  15.608 +msgid "dynamic IP manager"
  15.609 +msgstr ""
  15.610 +
  15.611 +#: ../../../dhid/stuff/init.d/dhid:9
  15.612 +msgid "DHIS client daemon"
  15.613 +msgstr ""
  15.614 +
  15.615 +#: ../../../dropbear/stuff/init.d/dropbear:21
  15.616 +#: ../../../dropbear/stuff/init.d/dropbear:28
  15.617 +msgid "Generating Dropbear %s key..."
  15.618 +msgstr ""
  15.619 +
  15.620 +#: ../../../hal/stuff/etc/init.d/hald:10
  15.621 +msgid "Hardware Abstraction Layer"
  15.622 +msgstr ""
  15.623 +
  15.624 +#: ../../../hostapd/stuff/hostapd:10
  15.625 +msgid "daemon for wireless software access points"
  15.626 +msgstr ""
  15.627 +
  15.628 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:10
  15.629 +#: ../../../nginx/stuff/etc/init.d/nginx:10
  15.630 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:10
  15.631 +msgid "web server"
  15.632 +msgstr ""
  15.633 +
  15.634 +#: ../../../linux64-zram/stuff/compcache:19
  15.635 +#: ../../../linux-zram/stuff/compcache:19
  15.636 +msgid "Loading module..."
  15.637 +msgstr ""
  15.638 +
  15.639 +#: ../../../linux64-zram/stuff/compcache:36
  15.640 +#: ../../../linux-zram/stuff/compcache:36
  15.641 +msgid "Unloading module..."
  15.642 +msgstr ""
  15.643 +
  15.644 +#: ../../../lxdm/stuff/init.d/lxdm:11
  15.645 +msgid "LXDE login manager"
  15.646 +msgstr ""
  15.647 +
  15.648 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:12
  15.649 +msgid "Network daemon"
  15.650 +msgstr ""
  15.651 +
  15.652 +#: ../../../mariadb/stuff/etc/init.d/mysql:29
  15.653 +#: ../../../mysql/stuff/etc/init.d/mysql:29
  15.654 +msgid "Initializing %s..."
  15.655 +msgstr ""
  15.656 +
  15.657 +#: ../../../mariadb/stuff/etc/init.d/mysql:40
  15.658 +#: ../../../mysql/stuff/etc/init.d/mysql:40
  15.659 +#: ../../../openldap/stuff/etc/init.d/openldap:28
  15.660 +#: ../../../postgresql/stuff/etc/init.d/postgresql:31
  15.661 +msgid "Running %s..."
  15.662 +msgstr ""
  15.663 +
  15.664 +#: ../../../motion/stuff/init.d/motion:9
  15.665 +msgid "Video detection daemon"
  15.666 +msgstr ""
  15.667 +
  15.668 +#: ../../../mpd/stuff/etc/init.d/mpd:11
  15.669 +msgid "Music Player Daemon"
  15.670 +msgstr ""
  15.671 +
  15.672 +#: ../../../nagios/stuff/nagios:12
  15.673 +msgid "Network Monitoring Server"
  15.674 +msgstr ""
  15.675 +
  15.676 +#: ../../../netatalk/stuff/etc/init.d/netatalk:11
  15.677 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:11
  15.678 +msgid "Netatalk daemons"
  15.679 +msgstr ""
  15.680 +
  15.681 +#: ../../../nscd/stuff/nscd:12
  15.682 +msgid "name-server caching daemon"
  15.683 +msgstr ""
  15.684 +
  15.685 +#: ../../../ofono/stuff/etc/init.d/ofono:13
  15.686 +msgid "Mobile telephony Manager"
  15.687 +msgstr ""
  15.688 +
  15.689 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:12
  15.690 +msgid "openerp-web server"
  15.691 +msgstr ""
  15.692 +
  15.693 +#: ../../../openssh/stuff/openssh:23 ../../../openssh/stuff/openssh:27
  15.694 +#: ../../../openssh/stuff/openssh:31
  15.695 +msgid "Generating OpenSSH %s key... "
  15.696 +msgstr ""
  15.697 +
  15.698 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:20
  15.699 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:20
  15.700 +msgid "TUN/TAP support is not available in this Kernel"
  15.701 +msgstr ""
  15.702 +
  15.703 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:25
  15.704 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:25
  15.705 +msgid "Detected broken %s symlink, fixing..."
  15.706 +msgstr ""
  15.707 +
  15.708 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:38
  15.709 +msgid "Missing OpenVPN client config."
  15.710 +msgstr ""
  15.711 +
  15.712 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:38
  15.713 +msgid "Missing OpenVPN server config."
  15.714 +msgstr ""
  15.715 +
  15.716 +#: ../../../pcsc-lite/stuff/init.d/pcscd:10
  15.717 +msgid "PC/SC smart card daemon"
  15.718 +msgstr ""
  15.719 +
  15.720 +#: ../../../perdition/stuff/etc/init.d/perdition:13
  15.721 +msgid "IMAP/POP3 proxy server"
  15.722 +msgstr ""
  15.723 +
  15.724 +#: ../../../portmap/stuff/init.d/portmap:12
  15.725 +msgid "RPC portmapper"
  15.726 +msgstr ""
  15.727 +
  15.728 +#: ../../../portmap/stuff/init.d/portmap:37
  15.729 +msgid "Restoring old RPC service information..."
  15.730 +msgstr ""
  15.731 +
  15.732 +#: ../../../postgresql/stuff/etc/init.d/postgresql:21
  15.733 +msgid "Initializing PostgreSQL server database"
  15.734 +msgstr ""
  15.735 +
  15.736 +#: ../../../postgresql/stuff/etc/init.d/postgresql:49
  15.737 +#: ../../../samba/stuff/etc/init.d/samba:62
  15.738 +msgid "Reloading %s: %s..."
  15.739 +msgstr ""
  15.740 +
  15.741 +#: ../../../postgrey/stuff/etc/init.d/postgrey:12
  15.742 +msgid "Postfix Greylisting Policy Server"
  15.743 +msgstr ""
  15.744 +
  15.745 +#: ../../../postgrey/stuff/etc/init.d/postgrey:25
  15.746 +msgid "Updating %s"
  15.747 +msgstr ""
  15.748 +
  15.749 +#: ../../../privoxy/stuff/daemon-privoxy:12
  15.750 +msgid "Web proxy daemon"
  15.751 +msgstr ""
  15.752 +
  15.753 +#: ../../../pure-ftpd/stuff/pure-ftpd:12
  15.754 +msgid "pure-FTPd Server Daemon"
  15.755 +msgstr ""
  15.756 +
  15.757 +#: ../../../slim/stuff/etc/init.d/slim:11
  15.758 +msgid "Simple login manager"
  15.759 +msgstr ""
  15.760 +
  15.761 +#: ../../../smartmontools/stuff/etc/init.d/smartd:12
  15.762 +msgid "Smartmontools (SMART) Daemon"
  15.763 +msgstr ""
  15.764 +
  15.765 +#: ../../../squid/stuff/etc/init.d/squid:12
  15.766 +msgid "Squid proxy server"
  15.767 +msgstr ""
  15.768 +
  15.769 +#: ../../../squid/stuff/etc/init.d/squid:29
  15.770 +msgid "Creating squid spool directory structure"
  15.771 +msgstr ""
  15.772 +
  15.773 +#: ../../../squid/stuff/etc/init.d/squid:54
  15.774 +msgid "Reloading %s configuration..."
  15.775 +msgstr ""
  15.776 +
  15.777 +#: ../../../tinyproxy/stuff/tinyproxy:7
  15.778 +msgid "Tiny Proxy"
  15.779 +msgstr ""
  15.780 +
  15.781 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:10
  15.782 +msgid "VirtualBox Guest Service"
  15.783 +msgstr ""
  15.784 +
  15.785 +#: ../../../wicd/stuff/wicd:12
  15.786 +msgid "Network connection manager"
  15.787 +msgstr ""
    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/busybox/stuff/po/ru.po	Thu May 26 20:16:45 2016 +0300
    16.3 @@ -0,0 +1,795 @@
    16.4 +# Russian translations for /etc/init.d/* daemons
    16.5 +# Copyright (C) 2016 SliTaz
    16.6 +# This file is distributed under the same license as the PACKAGE package.
    16.7 +# Aleksej Bobylev <al.bobylev@gmail.com>, 2016.
    16.8 +#
    16.9 +msgid ""
   16.10 +msgstr ""
   16.11 +"Project-Id-Version: daemon\n"
   16.12 +"Report-Msgid-Bugs-To: \n"
   16.13 +"POT-Creation-Date: 2016-05-26 18:37+0300\n"
   16.14 +"PO-Revision-Date: 2016-05-26 19:11+0300\n"
   16.15 +"Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n"
   16.16 +"Language-Team: \n"
   16.17 +"Language: ru\n"
   16.18 +"MIME-Version: 1.0\n"
   16.19 +"Content-Type: text/plain; charset=UTF-8\n"
   16.20 +"Content-Transfer-Encoding: 8bit\n"
   16.21 +"X-Generator: Poedit 1.8.6\n"
   16.22 +"X-Poedit-SourceCharset: UTF-8\n"
   16.23 +
   16.24 +#: ../daemon:11 ../../../at/stuff/atd:11
   16.25 +#: ../../../backuppc/stuff/etc/init.d/backuppc:12
   16.26 +#: ../../../bind/stuff/etc/init.d/named:12
   16.27 +#: ../../../boxbackup-client/stuff/bbackupd:12
   16.28 +#: ../../../clamav/stuff/daemon-clamd:12
   16.29 +#: ../../../cups/stuff/etc/init.d/cupsd:12 ../../../dhcp/stuff/dhcpd:12
   16.30 +#: ../../../distcc/stuff/distccd:23
   16.31 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:12
   16.32 +#: ../../../dovecot/stuff/init.d/dovecot:12 ../../../fcron/stuff/fcron:12
   16.33 +#: ../../../git/stuff/git-daemon:12 ../../../linux64-zram/stuff/compcache:10
   16.34 +#: ../../../linux-zram/stuff/compcache:10 ../../../nagios-nrpe/stuff/nrpe:12
   16.35 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:11
   16.36 +#: ../../../open-vm-tools/stuff/vmtoolsd:12
   16.37 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:12
   16.38 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:12
   16.39 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:11
   16.40 +#: ../../../rsync/stuff/etc/init.d/rsyncd:12
   16.41 +#: ../../../tinc/stuff/etc/init.d/tinc:12
   16.42 +#: ../../../transmission-daemon/stuff/transmission-daemon:12
   16.43 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:12
   16.44 +msgid "%s daemon"
   16.45 +msgstr "служба %s"
   16.46 +
   16.47 +#: ../daemon:31
   16.48 +msgid "%s is already active."
   16.49 +msgstr "%s уже активен."
   16.50 +
   16.51 +#: ../daemon:39
   16.52 +msgid "%s is not active."
   16.53 +msgstr "%s неактивен."
   16.54 +
   16.55 +#: ../daemon:52 ../../../acpid/stuff/init.d/acpid:20
   16.56 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:22
   16.57 +#: ../../../apache/stuff/apache:18 ../../../at/stuff/atd:19
   16.58 +#: ../../../autofs/stuff/etc/init.d/autofs:20
   16.59 +#: ../../../backuppc/stuff/etc/init.d/backuppc:21
   16.60 +#: ../../../bind/stuff/etc/init.d/named:22
   16.61 +#: ../../../boxbackup-client/stuff/bbackupd:20
   16.62 +#: ../../../boxbackup-server/stuff/bbstored:20
   16.63 +#: ../../../cherokee/stuff/cherokee:18 ../../../chillispot/stuff/chilli:21
   16.64 +#: ../../../c_icap/stuff/c-icapd:21 ../../../clamav/stuff/daemon-clamd:20
   16.65 +#: ../../../collectd/stuff/collectd:20
   16.66 +#: ../../../connman/stuff/etc/init.d/connman:21
   16.67 +#: ../../../cups/stuff/etc/init.d/cupsd:31
   16.68 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:21
   16.69 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:21
   16.70 +#: ../../../dbus/stuff/etc/init.d/dbus:23 ../../../ddclient/stuff/ddclient:19
   16.71 +#: ../../../dhcp/stuff/dhcpd:20 ../../../dhid/stuff/init.d/dhid:17
   16.72 +#: ../../../distcc/stuff/distccd:38
   16.73 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:20
   16.74 +#: ../../../dovecot/stuff/init.d/dovecot:24
   16.75 +#: ../../../dropbear/stuff/init.d/dropbear:35
   16.76 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:19
   16.77 +#: ../../../fcron/stuff/fcron:20 ../../../git/stuff/git-daemon:20
   16.78 +#: ../../../gpm/stuff/etc/init.d/gpm:20 ../../../hal/stuff/etc/init.d/hald:18
   16.79 +#: ../../../hostapd/stuff/hostapd:18 ../../../knock/stuff/etc/init.d/knock:22
   16.80 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:18
   16.81 +#: ../../../linux64-zram/stuff/compcache:16
   16.82 +#: ../../../linux-zram/stuff/compcache:16 ../../../lxdm/stuff/init.d/lxdm:18
   16.83 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:19
   16.84 +#: ../../../mariadb/stuff/etc/init.d/mysql:25
   16.85 +#: ../../../motion/stuff/init.d/motion:16
   16.86 +#: ../../../mpd/stuff/etc/init.d/mpd:19
   16.87 +#: ../../../mysql/stuff/etc/init.d/mysql:25 ../../../nagios/stuff/nagios:30
   16.88 +#: ../../../nagios-nrpe/stuff/nrpe:25
   16.89 +#: ../../../netatalk/stuff/etc/init.d/netatalk:45
   16.90 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:45
   16.91 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:25
   16.92 +#: ../../../nginx/stuff/etc/init.d/nginx:18
   16.93 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:18
   16.94 +#: ../../../nscd/stuff/nscd:23 ../../../ntop/stuff/etc/init.d/ntop:26
   16.95 +#: ../../../ntp/stuff/ntp:21 ../../../ofono/stuff/etc/init.d/ofono:21
   16.96 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:33
   16.97 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:22
   16.98 +#: ../../../openldap/stuff/etc/init.d/openldap:20
   16.99 +#: ../../../openssh/stuff/openssh:35 ../../../open-vm-tools/stuff/vmtoolsd:20
  16.100 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:42
  16.101 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:42
  16.102 +#: ../../../partimage/stuff/etc/init.d/partimaged:24
  16.103 +#: ../../../pcsc-lite/stuff/init.d/pcscd:17
  16.104 +#: ../../../perdition/stuff/etc/init.d/perdition:25
  16.105 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:20
  16.106 +#: ../../../portmap/stuff/init.d/portmap:23
  16.107 +#: ../../../postfix/stuff/etc/init.d/postfix:20
  16.108 +#: ../../../postgrey/stuff/etc/init.d/postgrey:21
  16.109 +#: ../../../privoxy/stuff/daemon-privoxy:22
  16.110 +#: ../../../pure-ftpd/stuff/pure-ftpd:27
  16.111 +#: ../../../rsync/stuff/etc/init.d/rsyncd:20
  16.112 +#: ../../../samba/stuff/etc/init.d/samba:23
  16.113 +#: ../../../samba/stuff/etc/init.d/samba:30
  16.114 +#: ../../../slim/stuff/etc/init.d/slim:19
  16.115 +#: ../../../smartmontools/stuff/etc/init.d/smartd:21
  16.116 +#: ../../../squid/stuff/etc/init.d/squid:23
  16.117 +#: ../../../thttpd/stuff/etc/init.d/thttpd:21
  16.118 +#: ../../../tinc/stuff/etc/init.d/tinc:20
  16.119 +#: ../../../tinyproxy/stuff/tinyproxy:15
  16.120 +#: ../../../transmission-daemon/stuff/transmission-daemon:20
  16.121 +#: ../../../unfs3/stuff/etc/init.d/unfsd:23
  16.122 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:18
  16.123 +#: ../../../wicd/stuff/wicd:20
  16.124 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:20
  16.125 +#: ../../../x11vnc/stuff/x11vnc:17 ../../../ypserv/stuff/ypserv:20
  16.126 +msgid "%s is already running."
  16.127 +msgstr "%s уже запущен."
  16.128 +
  16.129 +#: ../daemon:55 ../../../acpid/stuff/init.d/acpid:23
  16.130 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:25
  16.131 +#: ../../../apache/stuff/apache:21 ../../../at/stuff/atd:22
  16.132 +#: ../../../autofs/stuff/etc/init.d/autofs:23
  16.133 +#: ../../../backuppc/stuff/etc/init.d/backuppc:24
  16.134 +#: ../../../bind/stuff/etc/init.d/named:25
  16.135 +#: ../../../boxbackup-client/stuff/bbackupd:23
  16.136 +#: ../../../boxbackup-server/stuff/bbstored:23
  16.137 +#: ../../../cherokee/stuff/cherokee:21 ../../../chillispot/stuff/chilli:24
  16.138 +#: ../../../c_icap/stuff/c-icapd:24 ../../../clamav/stuff/daemon-clamd:23
  16.139 +#: ../../../collectd/stuff/collectd:23
  16.140 +#: ../../../connman/stuff/etc/init.d/connman:25
  16.141 +#: ../../../cups/stuff/etc/init.d/cupsd:27
  16.142 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:66
  16.143 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:24
  16.144 +#: ../../../dbus/stuff/etc/init.d/dbus:27 ../../../ddclient/stuff/ddclient:22
  16.145 +#: ../../../dhcp/stuff/dhcpd:23 ../../../dhid/stuff/init.d/dhid:20
  16.146 +#: ../../../distcc/stuff/distccd:41
  16.147 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:23
  16.148 +#: ../../../dovecot/stuff/init.d/dovecot:27
  16.149 +#: ../../../dropbear/stuff/init.d/dropbear:38
  16.150 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:22
  16.151 +#: ../../../fcron/stuff/fcron:23 ../../../git/stuff/git-daemon:23
  16.152 +#: ../../../gpm/stuff/etc/init.d/gpm:23 ../../../hal/stuff/etc/init.d/hald:21
  16.153 +#: ../../../hostapd/stuff/hostapd:21 ../../../knock/stuff/etc/init.d/knock:25
  16.154 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:21
  16.155 +#: ../../../linux64-zram/stuff/compcache:24
  16.156 +#: ../../../linux-zram/stuff/compcache:24 ../../../lxdm/stuff/init.d/lxdm:21
  16.157 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:22
  16.158 +#: ../../../mariadb/stuff/etc/init.d/mysql:34
  16.159 +#: ../../../motion/stuff/init.d/motion:19
  16.160 +#: ../../../mpd/stuff/etc/init.d/mpd:22
  16.161 +#: ../../../mysql/stuff/etc/init.d/mysql:34 ../../../nagios/stuff/nagios:33
  16.162 +#: ../../../nagios-nrpe/stuff/nrpe:28
  16.163 +#: ../../../netatalk/stuff/etc/init.d/netatalk:48
  16.164 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:48
  16.165 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:28
  16.166 +#: ../../../nginx/stuff/etc/init.d/nginx:21
  16.167 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:21
  16.168 +#: ../../../nscd/stuff/nscd:26 ../../../ntop/stuff/etc/init.d/ntop:33
  16.169 +#: ../../../ntp/stuff/ntp:24 ../../../ofono/stuff/etc/init.d/ofono:24
  16.170 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:36
  16.171 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:25
  16.172 +#: ../../../openldap/stuff/etc/init.d/openldap:23
  16.173 +#: ../../../openssh/stuff/openssh:38 ../../../open-vm-tools/stuff/vmtoolsd:23
  16.174 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:45
  16.175 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:45
  16.176 +#: ../../../partimage/stuff/etc/init.d/partimaged:29
  16.177 +#: ../../../pcsc-lite/stuff/init.d/pcscd:20
  16.178 +#: ../../../perdition/stuff/etc/init.d/perdition:28
  16.179 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:23
  16.180 +#: ../../../portmap/stuff/init.d/portmap:27
  16.181 +#: ../../../postfix/stuff/etc/init.d/postfix:23
  16.182 +#: ../../../postgresql/stuff/etc/init.d/postgresql:25
  16.183 +#: ../../../postgrey/stuff/etc/init.d/postgrey:36
  16.184 +#: ../../../privoxy/stuff/daemon-privoxy:25
  16.185 +#: ../../../pure-ftpd/stuff/pure-ftpd:30
  16.186 +#: ../../../rsync/stuff/etc/init.d/rsyncd:23
  16.187 +#: ../../../samba/stuff/etc/init.d/samba:25
  16.188 +#: ../../../samba/stuff/etc/init.d/samba:32
  16.189 +#: ../../../slim/stuff/etc/init.d/slim:22
  16.190 +#: ../../../smartmontools/stuff/etc/init.d/smartd:24
  16.191 +#: ../../../squid/stuff/etc/init.d/squid:33
  16.192 +#: ../../../thttpd/stuff/etc/init.d/thttpd:24
  16.193 +#: ../../../tinc/stuff/etc/init.d/tinc:23
  16.194 +#: ../../../tinyproxy/stuff/tinyproxy:18
  16.195 +#: ../../../transmission-daemon/stuff/transmission-daemon:23
  16.196 +#: ../../../unfs3/stuff/etc/init.d/unfsd:27
  16.197 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:21
  16.198 +#: ../../../wicd/stuff/wicd:23
  16.199 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:23
  16.200 +#: ../../../x11vnc/stuff/x11vnc:20 ../../../ypserv/stuff/ypserv:23
  16.201 +msgid "Starting %s: %s..."
  16.202 +msgstr "Запускается %s: %s…"
  16.203 +
  16.204 +#: ../daemon:64 ../daemon:74 ../../../acpid/stuff/init.d/acpid:29
  16.205 +#: ../../../acpid/stuff/init.d/acpid:38
  16.206 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:32
  16.207 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:43
  16.208 +#: ../../../apache/stuff/apache:27 ../../../apache/stuff/apache:37
  16.209 +#: ../../../apache/stuff/apache:46 ../../../at/stuff/atd:30
  16.210 +#: ../../../at/stuff/atd:39 ../../../autofs/stuff/etc/init.d/autofs:30
  16.211 +#: ../../../autofs/stuff/etc/init.d/autofs:40
  16.212 +#: ../../../backuppc/stuff/etc/init.d/backuppc:31
  16.213 +#: ../../../backuppc/stuff/etc/init.d/backuppc:41
  16.214 +#: ../../../bind/stuff/etc/init.d/named:31
  16.215 +#: ../../../bind/stuff/etc/init.d/named:44
  16.216 +#: ../../../boxbackup-client/stuff/bbackupd:29
  16.217 +#: ../../../boxbackup-client/stuff/bbackupd:39
  16.218 +#: ../../../boxbackup-server/stuff/bbstored:29
  16.219 +#: ../../../boxbackup-server/stuff/bbstored:39
  16.220 +#: ../../../cherokee/stuff/cherokee:27 ../../../cherokee/stuff/cherokee:36
  16.221 +#: ../../../chillispot/stuff/chilli:30 ../../../chillispot/stuff/chilli:39
  16.222 +#: ../../../c_icap/stuff/c-icapd:30 ../../../c_icap/stuff/c-icapd:39
  16.223 +#: ../../../clamav/stuff/daemon-clamd:29
  16.224 +#: ../../../clamav/stuff/daemon-clamd:39 ../../../collectd/stuff/collectd:29
  16.225 +#: ../../../collectd/stuff/collectd:38
  16.226 +#: ../../../connman/stuff/etc/init.d/connman:31
  16.227 +#: ../../../connman/stuff/etc/init.d/connman:41
  16.228 +#: ../../../connman/stuff/etc/init.d/connman:55
  16.229 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:73
  16.230 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:83
  16.231 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:30
  16.232 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:39
  16.233 +#: ../../../dbus/stuff/etc/init.d/dbus:33
  16.234 +#: ../../../dbus/stuff/etc/init.d/dbus:43 ../../../ddclient/stuff/ddclient:28
  16.235 +#: ../../../ddclient/stuff/ddclient:38 ../../../dhcp/stuff/dhcpd:29
  16.236 +#: ../../../dhcp/stuff/dhcpd:38 ../../../dhid/stuff/init.d/dhid:26
  16.237 +#: ../../../dhid/stuff/init.d/dhid:36 ../../../distcc/stuff/distccd:47
  16.238 +#: ../../../distcc/stuff/distccd:56
  16.239 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:29
  16.240 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:39
  16.241 +#: ../../../dovecot/stuff/init.d/dovecot:33
  16.242 +#: ../../../dovecot/stuff/init.d/dovecot:42
  16.243 +#: ../../../dropbear/stuff/init.d/dropbear:44
  16.244 +#: ../../../dropbear/stuff/init.d/dropbear:53
  16.245 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:35
  16.246 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:44
  16.247 +#: ../../../fcron/stuff/fcron:29 ../../../fcron/stuff/fcron:38
  16.248 +#: ../../../git/stuff/git-daemon:29 ../../../git/stuff/git-daemon:38
  16.249 +#: ../../../gpm/stuff/etc/init.d/gpm:29 ../../../gpm/stuff/etc/init.d/gpm:38
  16.250 +#: ../../../hal/stuff/etc/init.d/hald:27
  16.251 +#: ../../../hal/stuff/etc/init.d/hald:36 ../../../hostapd/stuff/hostapd:27
  16.252 +#: ../../../hostapd/stuff/hostapd:36 ../../../knock/stuff/etc/init.d/knock:31
  16.253 +#: ../../../knock/stuff/etc/init.d/knock:40
  16.254 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:27
  16.255 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:37
  16.256 +#: ../../../linux64-zram/stuff/compcache:30
  16.257 +#: ../../../linux-zram/stuff/compcache:30 ../../../lxdm/stuff/init.d/lxdm:26
  16.258 +#: ../../../lxdm/stuff/init.d/lxdm:35
  16.259 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:29
  16.260 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:39
  16.261 +#: ../../../mariadb/stuff/etc/init.d/mysql:47
  16.262 +#: ../../../mariadb/stuff/etc/init.d/mysql:57
  16.263 +#: ../../../motion/stuff/init.d/motion:26
  16.264 +#: ../../../mpd/stuff/etc/init.d/mpd:29 ../../../mpd/stuff/etc/init.d/mpd:38
  16.265 +#: ../../../mysql/stuff/etc/init.d/mysql:47
  16.266 +#: ../../../mysql/stuff/etc/init.d/mysql:57 ../../../nagios/stuff/nagios:40
  16.267 +#: ../../../nagios/stuff/nagios:49 ../../../nagios-nrpe/stuff/nrpe:34
  16.268 +#: ../../../nagios-nrpe/stuff/nrpe:43
  16.269 +#: ../../../netatalk/stuff/etc/init.d/netatalk:58
  16.270 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:58
  16.271 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:45
  16.272 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:60
  16.273 +#: ../../../nginx/stuff/etc/init.d/nginx:27
  16.274 +#: ../../../nginx/stuff/etc/init.d/nginx:37
  16.275 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:27
  16.276 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:37
  16.277 +#: ../../../nscd/stuff/nscd:33 ../../../nscd/stuff/nscd:43
  16.278 +#: ../../../ntop/stuff/etc/init.d/ntop:39
  16.279 +#: ../../../ntop/stuff/etc/init.d/ntop:48 ../../../ntp/stuff/ntp:31
  16.280 +#: ../../../ntp/stuff/ntp:41 ../../../ofono/stuff/etc/init.d/ofono:31
  16.281 +#: ../../../ofono/stuff/etc/init.d/ofono:41
  16.282 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:47
  16.283 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:57
  16.284 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:31
  16.285 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:40
  16.286 +#: ../../../openldap/stuff/etc/init.d/openldap:35
  16.287 +#: ../../../openldap/stuff/etc/init.d/openldap:44
  16.288 +#: ../../../openssh/stuff/openssh:44 ../../../openssh/stuff/openssh:53
  16.289 +#: ../../../open-vm-tools/stuff/vmtoolsd:34
  16.290 +#: ../../../open-vm-tools/stuff/vmtoolsd:43
  16.291 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:51
  16.292 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:61
  16.293 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:51
  16.294 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:61
  16.295 +#: ../../../partimage/stuff/etc/init.d/partimaged:40
  16.296 +#: ../../../pcsc-lite/stuff/init.d/pcscd:26
  16.297 +#: ../../../perdition/stuff/etc/init.d/perdition:38
  16.298 +#: ../../../perdition/stuff/etc/init.d/perdition:50
  16.299 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:31
  16.300 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:40
  16.301 +#: ../../../portmap/stuff/init.d/portmap:46
  16.302 +#: ../../../postfix/stuff/etc/init.d/postfix:29
  16.303 +#: ../../../postfix/stuff/etc/init.d/postfix:38
  16.304 +#: ../../../postfix/stuff/etc/init.d/postfix:49
  16.305 +#: ../../../postgrey/stuff/etc/init.d/postgrey:42
  16.306 +#: ../../../postgrey/stuff/etc/init.d/postgrey:51
  16.307 +#: ../../../privoxy/stuff/daemon-privoxy:31
  16.308 +#: ../../../privoxy/stuff/daemon-privoxy:41
  16.309 +#: ../../../pure-ftpd/stuff/pure-ftpd:36
  16.310 +#: ../../../pure-ftpd/stuff/pure-ftpd:45
  16.311 +#: ../../../rsync/stuff/etc/init.d/rsyncd:29
  16.312 +#: ../../../rsync/stuff/etc/init.d/rsyncd:39
  16.313 +#: ../../../samba/stuff/etc/init.d/samba:39
  16.314 +#: ../../../samba/stuff/etc/init.d/samba:46
  16.315 +#: ../../../samba/stuff/etc/init.d/samba:59
  16.316 +#: ../../../slim/stuff/etc/init.d/slim:28
  16.317 +#: ../../../slim/stuff/etc/init.d/slim:38
  16.318 +#: ../../../smartmontools/stuff/etc/init.d/smartd:30
  16.319 +#: ../../../smartmontools/stuff/etc/init.d/smartd:39
  16.320 +#: ../../../squid/stuff/etc/init.d/squid:40
  16.321 +#: ../../../squid/stuff/etc/init.d/squid:51
  16.322 +#: ../../../squid/stuff/etc/init.d/squid:60
  16.323 +#: ../../../thttpd/stuff/etc/init.d/thttpd:30
  16.324 +#: ../../../thttpd/stuff/etc/init.d/thttpd:39
  16.325 +#: ../../../tinc/stuff/etc/init.d/tinc:29
  16.326 +#: ../../../tinc/stuff/etc/init.d/tinc:38
  16.327 +#: ../../../tinyproxy/stuff/tinyproxy:24
  16.328 +#: ../../../tinyproxy/stuff/tinyproxy:34
  16.329 +#: ../../../transmission-daemon/stuff/transmission-daemon:29
  16.330 +#: ../../../transmission-daemon/stuff/transmission-daemon:39
  16.331 +#: ../../../unfs3/stuff/etc/init.d/unfsd:38
  16.332 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:27
  16.333 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:36
  16.334 +#: ../../../wicd/stuff/wicd:29 ../../../wicd/stuff/wicd:39
  16.335 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:29
  16.336 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:38
  16.337 +#: ../../../x11vnc/stuff/x11vnc:26 ../../../x11vnc/stuff/x11vnc:35
  16.338 +#: ../../../ypserv/stuff/ypserv:30 ../../../ypserv/stuff/ypserv:39
  16.339 +msgid "%s is not running."
  16.340 +msgstr "%s не запущен."
  16.341 +
  16.342 +#: ../daemon:67 ../../../acpid/stuff/init.d/acpid:32
  16.343 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:35
  16.344 +#: ../../../apache/stuff/apache:30 ../../../apache/stuff/apache:40
  16.345 +#: ../../../at/stuff/atd:33 ../../../autofs/stuff/etc/init.d/autofs:33
  16.346 +#: ../../../backuppc/stuff/etc/init.d/backuppc:34
  16.347 +#: ../../../bind/stuff/etc/init.d/named:34
  16.348 +#: ../../../boxbackup-client/stuff/bbackupd:32
  16.349 +#: ../../../boxbackup-server/stuff/bbstored:32
  16.350 +#: ../../../cherokee/stuff/cherokee:30 ../../../chillispot/stuff/chilli:33
  16.351 +#: ../../../c_icap/stuff/c-icapd:33 ../../../clamav/stuff/daemon-clamd:32
  16.352 +#: ../../../collectd/stuff/collectd:32
  16.353 +#: ../../../connman/stuff/etc/init.d/connman:34
  16.354 +#: ../../../cups/stuff/etc/init.d/cupsd:19
  16.355 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:76
  16.356 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:33
  16.357 +#: ../../../dbus/stuff/etc/init.d/dbus:36 ../../../ddclient/stuff/ddclient:31
  16.358 +#: ../../../dhcp/stuff/dhcpd:32 ../../../dhid/stuff/init.d/dhid:29
  16.359 +#: ../../../distcc/stuff/distccd:50
  16.360 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:32
  16.361 +#: ../../../dovecot/stuff/init.d/dovecot:36
  16.362 +#: ../../../dropbear/stuff/init.d/dropbear:47
  16.363 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:28
  16.364 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:38
  16.365 +#: ../../../fcron/stuff/fcron:32 ../../../git/stuff/git-daemon:32
  16.366 +#: ../../../gpm/stuff/etc/init.d/gpm:32 ../../../hal/stuff/etc/init.d/hald:30
  16.367 +#: ../../../hostapd/stuff/hostapd:30 ../../../knock/stuff/etc/init.d/knock:34
  16.368 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:30
  16.369 +#: ../../../linux64-zram/stuff/compcache:33
  16.370 +#: ../../../linux-zram/stuff/compcache:33 ../../../lxdm/stuff/init.d/lxdm:29
  16.371 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:32
  16.372 +#: ../../../mariadb/stuff/etc/init.d/mysql:50
  16.373 +#: ../../../motion/stuff/init.d/motion:29
  16.374 +#: ../../../mpd/stuff/etc/init.d/mpd:32
  16.375 +#: ../../../mysql/stuff/etc/init.d/mysql:50
  16.376 +#: ../../../nagios-nrpe/stuff/nrpe:37
  16.377 +#: ../../../netatalk/stuff/etc/init.d/netatalk:61
  16.378 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:61
  16.379 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:48
  16.380 +#: ../../../nginx/stuff/etc/init.d/nginx:30
  16.381 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:30
  16.382 +#: ../../../nscd/stuff/nscd:36 ../../../ntop/stuff/etc/init.d/ntop:42
  16.383 +#: ../../../ntp/stuff/ntp:34 ../../../ofono/stuff/etc/init.d/ofono:34
  16.384 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:50
  16.385 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:34
  16.386 +#: ../../../openldap/stuff/etc/init.d/openldap:38
  16.387 +#: ../../../openssh/stuff/openssh:47 ../../../open-vm-tools/stuff/vmtoolsd:37
  16.388 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:54
  16.389 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:54
  16.390 +#: ../../../partimage/stuff/etc/init.d/partimaged:43
  16.391 +#: ../../../pcsc-lite/stuff/init.d/pcscd:29
  16.392 +#: ../../../perdition/stuff/etc/init.d/perdition:41
  16.393 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:34
  16.394 +#: ../../../portmap/stuff/init.d/portmap:49
  16.395 +#: ../../../postfix/stuff/etc/init.d/postfix:32
  16.396 +#: ../../../postgresql/stuff/etc/init.d/postgresql:39
  16.397 +#: ../../../postgrey/stuff/etc/init.d/postgrey:45
  16.398 +#: ../../../privoxy/stuff/daemon-privoxy:34
  16.399 +#: ../../../pure-ftpd/stuff/pure-ftpd:39
  16.400 +#: ../../../rsync/stuff/etc/init.d/rsyncd:32
  16.401 +#: ../../../samba/stuff/etc/init.d/samba:41
  16.402 +#: ../../../samba/stuff/etc/init.d/samba:48
  16.403 +#: ../../../slim/stuff/etc/init.d/slim:31
  16.404 +#: ../../../smartmontools/stuff/etc/init.d/smartd:33
  16.405 +#: ../../../squid/stuff/etc/init.d/squid:43
  16.406 +#: ../../../thttpd/stuff/etc/init.d/thttpd:33
  16.407 +#: ../../../tinc/stuff/etc/init.d/tinc:32
  16.408 +#: ../../../tinyproxy/stuff/tinyproxy:27
  16.409 +#: ../../../transmission-daemon/stuff/transmission-daemon:32
  16.410 +#: ../../../unfs3/stuff/etc/init.d/unfsd:41
  16.411 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:30
  16.412 +#: ../../../wicd/stuff/wicd:32
  16.413 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:32
  16.414 +#: ../../../x11vnc/stuff/x11vnc:29 ../../../ypserv/stuff/ypserv:33
  16.415 +msgid "Stopping %s: %s..."
  16.416 +msgstr "Останавливается %s: %s…"
  16.417 +
  16.418 +#: ../daemon:77 ../../../acpid/stuff/init.d/acpid:41
  16.419 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:46
  16.420 +#: ../../../apache/stuff/apache:49 ../../../at/stuff/atd:42
  16.421 +#: ../../../autofs/stuff/etc/init.d/autofs:43
  16.422 +#: ../../../backuppc/stuff/etc/init.d/backuppc:44
  16.423 +#: ../../../bind/stuff/etc/init.d/named:47
  16.424 +#: ../../../boxbackup-client/stuff/bbackupd:42
  16.425 +#: ../../../boxbackup-server/stuff/bbstored:42
  16.426 +#: ../../../cherokee/stuff/cherokee:39 ../../../chillispot/stuff/chilli:42
  16.427 +#: ../../../c_icap/stuff/c-icapd:42 ../../../clamav/stuff/daemon-clamd:42
  16.428 +#: ../../../collectd/stuff/collectd:41
  16.429 +#: ../../../connman/stuff/etc/init.d/connman:44
  16.430 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:86
  16.431 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:42
  16.432 +#: ../../../dbus/stuff/etc/init.d/dbus:47 ../../../ddclient/stuff/ddclient:41
  16.433 +#: ../../../dhcp/stuff/dhcpd:41 ../../../dhid/stuff/init.d/dhid:39
  16.434 +#: ../../../distcc/stuff/distccd:59
  16.435 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:42
  16.436 +#: ../../../dovecot/stuff/init.d/dovecot:45
  16.437 +#: ../../../dropbear/stuff/init.d/dropbear:56
  16.438 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:47
  16.439 +#: ../../../fcron/stuff/fcron:41 ../../../git/stuff/git-daemon:41
  16.440 +#: ../../../gpm/stuff/etc/init.d/gpm:41 ../../../hal/stuff/etc/init.d/hald:39
  16.441 +#: ../../../hostapd/stuff/hostapd:39 ../../../knock/stuff/etc/init.d/knock:43
  16.442 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:40
  16.443 +#: ../../../lxdm/stuff/init.d/lxdm:38
  16.444 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:42
  16.445 +#: ../../../mariadb/stuff/etc/init.d/mysql:60
  16.446 +#: ../../../motion/stuff/init.d/motion:39
  16.447 +#: ../../../mpd/stuff/etc/init.d/mpd:41
  16.448 +#: ../../../mysql/stuff/etc/init.d/mysql:60 ../../../nagios/stuff/nagios:52
  16.449 +#: ../../../nagios-nrpe/stuff/nrpe:46
  16.450 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:63
  16.451 +#: ../../../nginx/stuff/etc/init.d/nginx:40
  16.452 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:40
  16.453 +#: ../../../nscd/stuff/nscd:46 ../../../ntop/stuff/etc/init.d/ntop:51
  16.454 +#: ../../../ntp/stuff/ntp:44 ../../../ofono/stuff/etc/init.d/ofono:44
  16.455 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:60
  16.456 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:43
  16.457 +#: ../../../openldap/stuff/etc/init.d/openldap:47
  16.458 +#: ../../../openssh/stuff/openssh:56 ../../../open-vm-tools/stuff/vmtoolsd:46
  16.459 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:64
  16.460 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:64
  16.461 +#: ../../../perdition/stuff/etc/init.d/perdition:53
  16.462 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:43
  16.463 +#: ../../../postfix/stuff/etc/init.d/postfix:41
  16.464 +#: ../../../postgresql/stuff/etc/init.d/postgresql:44
  16.465 +#: ../../../postgrey/stuff/etc/init.d/postgrey:54
  16.466 +#: ../../../privoxy/stuff/daemon-privoxy:47
  16.467 +#: ../../../pure-ftpd/stuff/pure-ftpd:48
  16.468 +#: ../../../rsync/stuff/etc/init.d/rsyncd:42
  16.469 +#: ../../../slim/stuff/etc/init.d/slim:41
  16.470 +#: ../../../smartmontools/stuff/etc/init.d/smartd:42
  16.471 +#: ../../../squid/stuff/etc/init.d/squid:63
  16.472 +#: ../../../thttpd/stuff/etc/init.d/thttpd:42
  16.473 +#: ../../../tinc/stuff/etc/init.d/tinc:41
  16.474 +#: ../../../tinyproxy/stuff/tinyproxy:37
  16.475 +#: ../../../transmission-daemon/stuff/transmission-daemon:42
  16.476 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:39
  16.477 +#: ../../../wicd/stuff/wicd:42
  16.478 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:41
  16.479 +#: ../../../x11vnc/stuff/x11vnc:38 ../../../ypserv/stuff/ypserv:42
  16.480 +msgid "Restarting %s: %s..."
  16.481 +msgstr "Перезапускается %s: %s…"
  16.482 +
  16.483 +#: ../daemon:86 ../../../acpid/stuff/init.d/acpid:48
  16.484 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:55
  16.485 +#: ../../../apache/stuff/apache:54 ../../../at/stuff/atd:51
  16.486 +#: ../../../autofs/stuff/etc/init.d/autofs:50
  16.487 +#: ../../../backuppc/stuff/etc/init.d/backuppc:57
  16.488 +#: ../../../bind/stuff/etc/init.d/named:54
  16.489 +#: ../../../boxbackup-client/stuff/bbackupd:50
  16.490 +#: ../../../boxbackup-server/stuff/bbstored:50
  16.491 +#: ../../../cherokee/stuff/cherokee:47 ../../../chillispot/stuff/chilli:49
  16.492 +#: ../../../c_icap/stuff/c-icapd:51 ../../../clamav/stuff/daemon-clamd:50
  16.493 +#: ../../../collectd/stuff/collectd:48
  16.494 +#: ../../../connman/stuff/etc/init.d/connman:59
  16.495 +#: ../../../cups/stuff/etc/init.d/cupsd:35
  16.496 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:98
  16.497 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:49
  16.498 +#: ../../../dbus/stuff/etc/init.d/dbus:55 ../../../ddclient/stuff/ddclient:49
  16.499 +#: ../../../dhcp/stuff/dhcpd:48 ../../../dhid/stuff/init.d/dhid:47
  16.500 +#: ../../../distcc/stuff/distccd:64
  16.501 +#: ../../../dnsmasq/stuff/etc/init.d/dnsmasq:50
  16.502 +#: ../../../dovecot/stuff/init.d/dovecot:52
  16.503 +#: ../../../dropbear/stuff/init.d/dropbear:63
  16.504 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:53
  16.505 +#: ../../../fcron/stuff/fcron:48 ../../../git/stuff/git-daemon:48
  16.506 +#: ../../../gpm/stuff/etc/init.d/gpm:48 ../../../hal/stuff/etc/init.d/hald:46
  16.507 +#: ../../../hostapd/stuff/hostapd:46 ../../../knock/stuff/etc/init.d/knock:50
  16.508 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:48
  16.509 +#: ../../../linux64-zram/stuff/compcache:41
  16.510 +#: ../../../linux-zram/stuff/compcache:41 ../../../lxdm/stuff/init.d/lxdm:45
  16.511 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:51
  16.512 +#: ../../../mariadb/stuff/etc/init.d/mysql:68
  16.513 +#: ../../../motion/stuff/init.d/motion:47
  16.514 +#: ../../../mpd/stuff/etc/init.d/mpd:48
  16.515 +#: ../../../mysql/stuff/etc/init.d/mysql:68 ../../../nagios/stuff/nagios:62
  16.516 +#: ../../../nagios-nrpe/stuff/nrpe:53
  16.517 +#: ../../../netatalk/stuff/etc/init.d/netatalk:74
  16.518 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:74
  16.519 +#: ../../../nfs-utils/stuff/etc/init.d/nfsd:77
  16.520 +#: ../../../nginx/stuff/etc/init.d/nginx:48
  16.521 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:48
  16.522 +#: ../../../nscd/stuff/nscd:54 ../../../ntop/stuff/etc/init.d/ntop:58
  16.523 +#: ../../../ntp/stuff/ntp:51 ../../../ofono/stuff/etc/init.d/ofono:52
  16.524 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:68
  16.525 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:50
  16.526 +#: ../../../openldap/stuff/etc/init.d/openldap:54
  16.527 +#: ../../../openssh/stuff/openssh:63 ../../../open-vm-tools/stuff/vmtoolsd:53
  16.528 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:72
  16.529 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:72
  16.530 +#: ../../../partimage/stuff/etc/init.d/partimaged:53
  16.531 +#: ../../../pcsc-lite/stuff/init.d/pcscd:38
  16.532 +#: ../../../perdition/stuff/etc/init.d/perdition:70
  16.533 +#: ../../../phpvirtualbox/stuff/etc/init.d/vboxwebsrv:52
  16.534 +#: ../../../portmap/stuff/init.d/portmap:65
  16.535 +#: ../../../postfix/stuff/etc/init.d/postfix:58
  16.536 +#: ../../../postgresql/stuff/etc/init.d/postgresql:54
  16.537 +#: ../../../postgrey/stuff/etc/init.d/postgrey:61
  16.538 +#: ../../../privoxy/stuff/daemon-privoxy:52
  16.539 +#: ../../../pure-ftpd/stuff/pure-ftpd:55
  16.540 +#: ../../../rsync/stuff/etc/init.d/rsyncd:50
  16.541 +#: ../../../samba/stuff/etc/init.d/samba:67
  16.542 +#: ../../../slim/stuff/etc/init.d/slim:49
  16.543 +#: ../../../smartmontools/stuff/etc/init.d/smartd:49
  16.544 +#: ../../../squid/stuff/etc/init.d/squid:69
  16.545 +#: ../../../thttpd/stuff/etc/init.d/thttpd:49
  16.546 +#: ../../../tinc/stuff/etc/init.d/tinc:48
  16.547 +#: ../../../tinyproxy/stuff/tinyproxy:45
  16.548 +#: ../../../transmission-daemon/stuff/transmission-daemon:50
  16.549 +#: ../../../unfs3/stuff/etc/init.d/unfsd:51
  16.550 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:46
  16.551 +#: ../../../wicd/stuff/wicd:50
  16.552 +#: ../../../wpa_supplicant/stuff/etc/init.d/wpa_supplicant:48
  16.553 +#: ../../../x11vnc/stuff/x11vnc:45 ../../../ypserv/stuff/ypserv:49
  16.554 +msgid "Usage:"
  16.555 +msgstr "Использование:"
  16.556 +
  16.557 +#: ../../../acpid/stuff/init.d/acpid:12
  16.558 +msgid "ACPI event deamon"
  16.559 +msgstr "служба событий ACPI"
  16.560 +
  16.561 +#: ../../../ajaxterm/stuff/etc/init.d/ajaxterm:12
  16.562 +#: ../../../autofs/stuff/etc/init.d/autofs:12
  16.563 +#: ../../../chillispot/stuff/chilli:12 ../../../c_icap/stuff/c-icapd:12
  16.564 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:12
  16.565 +#: ../../../cyrus-sasl/stuff/etc/init.d/cyrus-sasl:12
  16.566 +#: ../../../dropbear/stuff/init.d/dropbear:12
  16.567 +#: ../../../fail2ban/stuff/etc/init.d/fail2ban:10
  16.568 +#: ../../../gpm/stuff/etc/init.d/gpm:12
  16.569 +#: ../../../knock/stuff/etc/init.d/knock:12
  16.570 +#: ../../../mariadb/stuff/etc/init.d/mysql:12
  16.571 +#: ../../../mysql/stuff/etc/init.d/mysql:12
  16.572 +#: ../../../ntop/stuff/etc/init.d/ntop:12 ../../../ntp/stuff/ntp:12
  16.573 +#: ../../../openerp-server/stuff/etc/init.d/openerp-server:12
  16.574 +#: ../../../openldap/stuff/etc/init.d/openldap:12
  16.575 +#: ../../../openssh/stuff/openssh:12
  16.576 +#: ../../../partimage/stuff/etc/init.d/partimaged:12
  16.577 +#: ../../../postfix/stuff/etc/init.d/postfix:12
  16.578 +#: ../../../postgresql/stuff/etc/init.d/postgresql:12
  16.579 +#: ../../../samba/stuff/etc/init.d/samba:12
  16.580 +#: ../../../thttpd/stuff/etc/init.d/thttpd:12
  16.581 +#: ../../../unfs3/stuff/etc/init.d/unfsd:12 ../../../x11vnc/stuff/x11vnc:10
  16.582 +#: ../../../ypserv/stuff/ypserv:12
  16.583 +msgid "%s server"
  16.584 +msgstr "сервер %s"
  16.585 +
  16.586 +#: ../../../apache/stuff/apache:10
  16.587 +msgid "Apache Web Server"
  16.588 +msgstr "веб-сервер Apache"
  16.589 +
  16.590 +#: ../../../boxbackup-server/stuff/bbstored:12
  16.591 +msgid "BoxBackup server deamon"
  16.592 +msgstr "служба сервера BoxBackup"
  16.593 +
  16.594 +#: ../../../cherokee/stuff/cherokee:10
  16.595 +msgid "Cherokee Web Server"
  16.596 +msgstr "веб-сервер Cherokee"
  16.597 +
  16.598 +#: ../../../collectd/stuff/collectd:12
  16.599 +msgid "Statistics collection daemon"
  16.600 +msgstr "служба сбора статистики"
  16.601 +
  16.602 +#: ../../../connman/stuff/etc/init.d/connman:13
  16.603 +msgid "Connection Manager"
  16.604 +msgstr "диспетчер подключений"
  16.605 +
  16.606 +#: ../../../connman/stuff/etc/init.d/connman:53
  16.607 +msgid "%s is running."
  16.608 +msgstr "%s запущен."
  16.609 +
  16.610 +#: ../../../cyrus-imapd/stuff/etc/init.d/cyrus-imapd:26
  16.611 +msgid "Initialize %s..."
  16.612 +msgstr "Инициализация %s…"
  16.613 +
  16.614 +#: ../../../dbus/stuff/etc/init.d/dbus:10
  16.615 +msgid "message bus daemon"
  16.616 +msgstr "служба шины сообщений"
  16.617 +
  16.618 +#: ../../../ddclient/stuff/ddclient:11
  16.619 +msgid "dynamic IP manager"
  16.620 +msgstr "диспетчер динамического IP"
  16.621 +
  16.622 +#: ../../../dhid/stuff/init.d/dhid:9
  16.623 +msgid "DHIS client daemon"
  16.624 +msgstr "служба клиента DHIS"
  16.625 +
  16.626 +#: ../../../dropbear/stuff/init.d/dropbear:21
  16.627 +#: ../../../dropbear/stuff/init.d/dropbear:28
  16.628 +msgid "Generating Dropbear %s key..."
  16.629 +msgstr "Создание %s-ключа Dropbear…"
  16.630 +
  16.631 +#: ../../../hal/stuff/etc/init.d/hald:10
  16.632 +msgid "Hardware Abstraction Layer"
  16.633 +msgstr "слой аппаратных абстракций (HAL)"
  16.634 +
  16.635 +#: ../../../hostapd/stuff/hostapd:10
  16.636 +msgid "daemon for wireless software access points"
  16.637 +msgstr "служба программных беспроводных точек доступа"
  16.638 +
  16.639 +#: ../../../lighttpd/stuff/etc/init.d/lighttpd:10
  16.640 +#: ../../../nginx/stuff/etc/init.d/nginx:10
  16.641 +#: ../../../nginx-extras/stuff/etc/init.d/nginx:10
  16.642 +msgid "web server"
  16.643 +msgstr "веб-сервер"
  16.644 +
  16.645 +#: ../../../linux64-zram/stuff/compcache:19
  16.646 +#: ../../../linux-zram/stuff/compcache:19
  16.647 +msgid "Loading module..."
  16.648 +msgstr "Загрузка модуля…"
  16.649 +
  16.650 +#: ../../../linux64-zram/stuff/compcache:36
  16.651 +#: ../../../linux-zram/stuff/compcache:36
  16.652 +msgid "Unloading module..."
  16.653 +msgstr "Выгрузка модуля…"
  16.654 +
  16.655 +#: ../../../lxdm/stuff/init.d/lxdm:11
  16.656 +msgid "LXDE login manager"
  16.657 +msgstr "диспетчер входа LXDE"
  16.658 +
  16.659 +#: ../../../lxnetdaemon/stuff/etc/init.d/lxnetdaemon:12
  16.660 +msgid "Network daemon"
  16.661 +msgstr "сетевая служба"
  16.662 +
  16.663 +#: ../../../mariadb/stuff/etc/init.d/mysql:29
  16.664 +#: ../../../mysql/stuff/etc/init.d/mysql:29
  16.665 +msgid "Initializing %s..."
  16.666 +msgstr "Инициализация %s…"
  16.667 +
  16.668 +#: ../../../mariadb/stuff/etc/init.d/mysql:40
  16.669 +#: ../../../mysql/stuff/etc/init.d/mysql:40
  16.670 +#: ../../../openldap/stuff/etc/init.d/openldap:28
  16.671 +#: ../../../postgresql/stuff/etc/init.d/postgresql:31
  16.672 +msgid "Running %s..."
  16.673 +msgstr "Запуск %s…"
  16.674 +
  16.675 +#: ../../../motion/stuff/init.d/motion:9
  16.676 +msgid "Video detection daemon"
  16.677 +msgstr "служба видео-детектирования"
  16.678 +
  16.679 +#: ../../../mpd/stuff/etc/init.d/mpd:11
  16.680 +msgid "Music Player Daemon"
  16.681 +msgstr "служба MPD"
  16.682 +
  16.683 +#: ../../../nagios/stuff/nagios:12
  16.684 +msgid "Network Monitoring Server"
  16.685 +msgstr "сервер мониторинга сети"
  16.686 +
  16.687 +#: ../../../netatalk/stuff/etc/init.d/netatalk:11
  16.688 +#: ../../../netatalk-pam/stuff/etc/init.d/netatalk:11
  16.689 +msgid "Netatalk daemons"
  16.690 +msgstr "службы Netatalk"
  16.691 +
  16.692 +#: ../../../nscd/stuff/nscd:12
  16.693 +msgid "name-server caching daemon"
  16.694 +msgstr "служба кеширования сервиса имен"
  16.695 +
  16.696 +#: ../../../ofono/stuff/etc/init.d/ofono:13
  16.697 +msgid "Mobile telephony Manager"
  16.698 +msgstr "диспетчер мобильной связи"
  16.699 +
  16.700 +#: ../../../openerp-web/stuff/etc/init.d/openerp-web:12
  16.701 +msgid "openerp-web server"
  16.702 +msgstr "веб-сервер OpenERP"
  16.703 +
  16.704 +#: ../../../openssh/stuff/openssh:23 ../../../openssh/stuff/openssh:27
  16.705 +#: ../../../openssh/stuff/openssh:31
  16.706 +msgid "Generating OpenSSH %s key... "
  16.707 +msgstr "Создание %s-ключа OpenSSH… "
  16.708 +
  16.709 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:20
  16.710 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:20
  16.711 +msgid "TUN/TAP support is not available in this Kernel"
  16.712 +msgstr "Поддержка TUN/TAP недоступна в этом ядре"
  16.713 +
  16.714 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:25
  16.715 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:25
  16.716 +msgid "Detected broken %s symlink, fixing..."
  16.717 +msgstr "Обнаружена битая ссылка на %s. Исправление…"
  16.718 +
  16.719 +#: ../../../openvpn/stuff/etc/init.d/openvpn-client:38
  16.720 +msgid "Missing OpenVPN client config."
  16.721 +msgstr "Отсутствует файл настроек клиента OpenVPN."
  16.722 +
  16.723 +#: ../../../openvpn/stuff/etc/init.d/openvpn-server:38
  16.724 +msgid "Missing OpenVPN server config."
  16.725 +msgstr "Отсутствует файл настроек сервера OpenVPN."
  16.726 +
  16.727 +#: ../../../pcsc-lite/stuff/init.d/pcscd:10
  16.728 +msgid "PC/SC smart card daemon"
  16.729 +msgstr "служба смарт-карт PC/SC"
  16.730 +
  16.731 +#: ../../../perdition/stuff/etc/init.d/perdition:13
  16.732 +msgid "IMAP/POP3 proxy server"
  16.733 +msgstr "прокси-сервер IMAP/POP3"
  16.734 +
  16.735 +#: ../../../portmap/stuff/init.d/portmap:12
  16.736 +msgid "RPC portmapper"
  16.737 +msgstr "RPC portmapper"
  16.738 +
  16.739 +#: ../../../portmap/stuff/init.d/portmap:37
  16.740 +msgid "Restoring old RPC service information..."
  16.741 +msgstr "Восстановление старой информации службы RPC…"
  16.742 +
  16.743 +#: ../../../postgresql/stuff/etc/init.d/postgresql:21
  16.744 +msgid "Initializing PostgreSQL server database"
  16.745 +msgstr "Инициализация базы данных сервера PostgreSQL"
  16.746 +
  16.747 +#: ../../../postgresql/stuff/etc/init.d/postgresql:49
  16.748 +#: ../../../samba/stuff/etc/init.d/samba:62
  16.749 +msgid "Reloading %s: %s..."
  16.750 +msgstr "Перезагружается %s: %s…"
  16.751 +
  16.752 +#: ../../../postgrey/stuff/etc/init.d/postgrey:12
  16.753 +msgid "Postfix Greylisting Policy Server"
  16.754 +msgstr "сервер политики серых списков Postfix"
  16.755 +
  16.756 +#: ../../../postgrey/stuff/etc/init.d/postgrey:25
  16.757 +msgid "Updating %s"
  16.758 +msgstr "Обновление %s"
  16.759 +
  16.760 +#: ../../../privoxy/stuff/daemon-privoxy:12
  16.761 +msgid "Web proxy daemon"
  16.762 +msgstr "служба веб-прокси"
  16.763 +
  16.764 +#: ../../../pure-ftpd/stuff/pure-ftpd:12
  16.765 +msgid "pure-FTPd Server Daemon"
  16.766 +msgstr "служба сервера pure-FTPd"
  16.767 +
  16.768 +#: ../../../slim/stuff/etc/init.d/slim:11
  16.769 +msgid "Simple login manager"
  16.770 +msgstr "простой диспетчер входа"
  16.771 +
  16.772 +#: ../../../smartmontools/stuff/etc/init.d/smartd:12
  16.773 +msgid "Smartmontools (SMART) Daemon"
  16.774 +msgstr "служба Smartmontools (SMART)"
  16.775 +
  16.776 +#: ../../../squid/stuff/etc/init.d/squid:12
  16.777 +msgid "Squid proxy server"
  16.778 +msgstr "прокси-сервер Squid"
  16.779 +
  16.780 +#: ../../../squid/stuff/etc/init.d/squid:29
  16.781 +msgid "Creating squid spool directory structure"
  16.782 +msgstr "Создание структуры спул-папки Squid"
  16.783 +
  16.784 +#: ../../../squid/stuff/etc/init.d/squid:54
  16.785 +msgid "Reloading %s configuration..."
  16.786 +msgstr "Перезагружаются параметры %s…"
  16.787 +
  16.788 +#: ../../../tinyproxy/stuff/tinyproxy:7
  16.789 +msgid "Tiny Proxy"
  16.790 +msgstr "крошечный прокси"
  16.791 +
  16.792 +#: ../../../virtualbox-ose-guestutils/stuff/VBoxService:10
  16.793 +msgid "VirtualBox Guest Service"
  16.794 +msgstr "гостевые службы VirtualBox"
  16.795 +
  16.796 +#: ../../../wicd/stuff/wicd:12
  16.797 +msgid "Network connection manager"
  16.798 +msgstr "диспетчер сетевых подключений"
    17.1 --- a/c_icap/stuff/c-icapd	Wed May 25 23:07:05 2016 +0200
    17.2 +++ b/c_icap/stuff/c-icapd	Thu May 26 20:16:45 2016 +0300
    17.3 @@ -1,5 +1,5 @@
    17.4  #!/bin/sh
    17.5 -# /etc/init.d/nagios : Start, stop and restart ICAP server on SliTaz, at 
    17.6 +# /etc/init.d/nagios : Start, stop and restart ICAP server on SliTaz, at
    17.7  # boot time or with the command line.
    17.8  #
    17.9  # To start ICAP server at boot time, just put c-icapd in the $RUN_DAEMONS
   17.10 @@ -9,7 +9,7 @@
   17.11  . /etc/daemons.conf
   17.12  
   17.13  NAME=c-icap
   17.14 -DESC="ICAP Server"
   17.15 +DESC="$(_ '%s server' ICAP)"
   17.16  DAEMON=/usr/bin/c-icap
   17.17  OPTIONS=""
   17.18  PIDFILE=/var/run/c-icap/c-icap.pid
   17.19 @@ -18,39 +18,38 @@
   17.20  case "$1" in
   17.21    start)
   17.22      if active_pidfile $PIDFILE $NAME ; then
   17.23 -      echo "$NAME already running."
   17.24 +      _ '%s is already running.' $NAME
   17.25        exit 1
   17.26      fi
   17.27 -    echo -n "Starting $DESC: $NAME... "
   17.28 -	$DAEMON $OPTIONS
   17.29 +    action 'Starting %s: %s...' "$DESC" $NAME
   17.30 +    $DAEMON $OPTIONS
   17.31      status
   17.32      ;;
   17.33    stop)
   17.34      if ! active_pidfile $PIDFILE $NAME ; then
   17.35 -      echo "$NAME is not running."
   17.36 +      _ '%s is not running.' $NAME
   17.37        exit 1
   17.38      fi
   17.39 -    echo -n "Stopping $DESC: $NAME... "
   17.40 -    kill `cat $PIDFILE`
   17.41 +    action 'Stopping %s: %s...' "$DESC" $NAME
   17.42 +    kill $(cat $PIDFILE)
   17.43      status
   17.44      ;;
   17.45    restart|reload)
   17.46      if ! active_pidfile $PIDFILE $NAME ; then
   17.47 -      echo "$NAME is not running."
   17.48 +      _ '%s is not running.' $NAME
   17.49        exit 1
   17.50      fi
   17.51 -    echo -n "Restarting $DESC: $NAME... "
   17.52 -    kill `cat $PIDFILE`
   17.53 +    action 'Restarting %s: %s...' "$DESC" $NAME
   17.54 +    kill $(cat $PIDFILE)
   17.55      sleep 2
   17.56      $DAEMON $OPTIONS
   17.57      status
   17.58      ;;
   17.59    test)
   17.60 -	configtest ;;
   17.61 +    configtest ;;
   17.62    *)
   17.63 -    echo ""
   17.64 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart|reload]"
   17.65 -    echo ""
   17.66 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart|reload|test]"
   17.67 +    newline
   17.68      exit 1
   17.69      ;;
   17.70  esac
    18.1 --- a/cherokee/stuff/cherokee	Wed May 25 23:07:05 2016 +0200
    18.2 +++ b/cherokee/stuff/cherokee	Thu May 26 20:16:45 2016 +0300
    18.3 @@ -1,5 +1,5 @@
    18.4  #!/bin/sh
    18.5 -# /etc/init.d/cherokee: Start, stop and restart Cherokee web server on SliTaz, 
    18.6 +# /etc/init.d/cherokee: Start, stop and restart Cherokee web server on SliTaz,
    18.7  # at boot time or with the command line. Daemons options are configured
    18.8  # with /etc/daemons.conf
    18.9  #
   18.10 @@ -7,7 +7,7 @@
   18.11  . /etc/daemons.conf
   18.12  
   18.13  NAME=Cherokee
   18.14 -DESC="Cherokee Web Server"
   18.15 +DESC="$(_ 'Cherokee Web Server')"
   18.16  DAEMON=/usr/sbin/cherokee
   18.17  OPTIONS=
   18.18  PIDFILE=/var/run/cherokee.pid
   18.19 @@ -15,28 +15,28 @@
   18.20  case "$1" in
   18.21    start)
   18.22      if active_pidfile $PIDFILE cherokee ; then
   18.23 -      echo "$NAME already running."
   18.24 +      _ '%s is already running.' $NAME
   18.25        exit 1
   18.26      fi
   18.27 -    echo -n "Starting $DESC: $NAME... "
   18.28 -    $DAEMON $OPTIONS -d &>/dev/null  
   18.29 +    action 'Starting %s: %s...' "$DESC" $NAME
   18.30 +    $DAEMON $OPTIONS -d &>/dev/null
   18.31      status
   18.32      ;;
   18.33    stop)
   18.34      if ! active_pidfile $PIDFILE cherokee ; then
   18.35 -      echo "$NAME is not running."
   18.36 +      _ '%s is not running.' $NAME
   18.37        exit 1
   18.38      fi
   18.39 -    echo -n "Stopping $DESC: $NAME... "
   18.40 +    action 'Stopping %s: %s...' "$DESC" $NAME
   18.41      kill $(cat $PIDFILE)
   18.42      status
   18.43      ;;
   18.44    restart)
   18.45      if ! active_pidfile $PIDFILE cherokee ; then
   18.46 -      echo "$NAME is not running."
   18.47 +      _ '%s is not running.' $NAME
   18.48        exit 1
   18.49      fi
   18.50 -    echo -n "Restarting $DESC: $NAME... "
   18.51 +    action 'Restarting %s: %s...' "$DESC" $NAME
   18.52      kill $(cat $PIDFILE)
   18.53      rm $PIDFILE
   18.54      sleep 2
   18.55 @@ -44,9 +44,8 @@
   18.56      status
   18.57      ;;
   18.58    *)
   18.59 -    echo ""
   18.60 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   18.61 -    echo ""
   18.62 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   18.63 +    newline
   18.64      exit 1
   18.65      ;;
   18.66  esac
    19.1 --- a/chillispot/stuff/chilli	Wed May 25 23:07:05 2016 +0200
    19.2 +++ b/chillispot/stuff/chilli	Thu May 26 20:16:45 2016 +0300
    19.3 @@ -1,5 +1,5 @@
    19.4  #!/bin/sh
    19.5 -# /etc/init.d/chilli : Start, stop and restart ChilliSpot server on SliTaz, at 
    19.6 +# /etc/init.d/chilli : Start, stop and restart ChilliSpot server on SliTaz, at
    19.7  # boot time or with the command line.
    19.8  #
    19.9  # To start ChilliSpot server at boot time, just put chilli in the $RUN_DAEMONS
   19.10 @@ -9,7 +9,7 @@
   19.11  . /etc/daemons.conf
   19.12  
   19.13  NAME=ChilliSpot
   19.14 -DESC="ChilliSpot server"
   19.15 +DESC="$(_ '%s server' ChilliSpot)"
   19.16  DAEMON=/usr/sbin/chilli
   19.17  OPTIONS=$CHILLI_OPTIONS
   19.18  PIDFILE=/var/run/chilli.pid
   19.19 @@ -18,36 +18,36 @@
   19.20  case "$1" in
   19.21    start)
   19.22      if active_pidfile $PIDFILE chilli ; then
   19.23 -      echo "$NAME already running."
   19.24 +      _ '%s is already running.' $NAME
   19.25        exit 1
   19.26      fi
   19.27 +    action 'Starting %s: %s...' "$DESC" $NAME
   19.28      $DAEMON $OPTIONS
   19.29      status
   19.30      ;;
   19.31    stop)
   19.32      if ! active_pidfile $PIDFILE chilli ; then
   19.33 -      echo "$NAME is not running."
   19.34 +      _ '%s is not running.' $NAME
   19.35        exit 1
   19.36      fi
   19.37 -    echo -n "Stopping $DESC: $NAME... "
   19.38 -    kill `cat $PIDFILE`
   19.39 +    action 'Stopping %s: %s...' "$DESC" $NAME
   19.40 +    kill $(cat $PIDFILE)
   19.41      status
   19.42      ;;
   19.43    restart)
   19.44      if ! active_pidfile $PIDFILE chilli ; then
   19.45 -      echo "$NAME is not running."
   19.46 +      _ '%s is not running.' $NAME
   19.47        exit 1
   19.48      fi
   19.49 -    echo -n "Restarting $DESC: $NAME... "
   19.50 -    kill `cat $PIDFILE`
   19.51 +    action 'Restarting %s: %s...' "$DESC" $NAME
   19.52 +    kill $(cat $PIDFILE)
   19.53      sleep 2
   19.54      $DAEMON $OPTIONS
   19.55      status
   19.56      ;;
   19.57    *)
   19.58 -    echo ""
   19.59 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   19.60 -    echo ""
   19.61 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   19.62 +    newline
   19.63      exit 1
   19.64      ;;
   19.65  esac
    20.1 --- a/clamav/stuff/daemon-clamd	Wed May 25 23:07:05 2016 +0200
    20.2 +++ b/clamav/stuff/daemon-clamd	Thu May 26 20:16:45 2016 +0300
    20.3 @@ -1,5 +1,5 @@
    20.4  #!/bin/sh
    20.5 -# /etc/init.d/daemon-name: Start, stop and restart daemon 
    20.6 +# /etc/init.d/daemon-name: Start, stop and restart daemon
    20.7  # on SliTaz, at boot time or with the command line.
    20.8  #
    20.9  # To start daemon at boot time, just put the right name in the $RUN_DAEMONS
   20.10 @@ -9,7 +9,7 @@
   20.11  . /etc/daemons.conf
   20.12  
   20.13  NAME=Clamd
   20.14 -DESC="clamav daemon"
   20.15 +DESC="$(_ '%s daemon' clamav)"
   20.16  DAEMON=/usr/sbin/clamd
   20.17  OPTIONS=$CLAMD_OPTIONS
   20.18  PIDFILE=/run/clamav/clamd.pid
   20.19 @@ -17,39 +17,38 @@
   20.20  case "$1" in
   20.21    start)
   20.22      if active_pidfile $PIDFILE clamd ; then
   20.23 -      echo "$NAME already running."
   20.24 +      _ '%s is already running.' $NAME
   20.25        exit 1
   20.26      fi
   20.27 -    echo -n "Starting $DESC: $NAME... "
   20.28 -    $DAEMON $OPTIONS 
   20.29 +    action 'Starting %s: %s...' "$DESC" $NAME
   20.30 +    $DAEMON $OPTIONS
   20.31      status
   20.32      ;;
   20.33    stop)
   20.34      if ! active_pidfile $PIDFILE clamd ; then
   20.35 -      echo "$NAME is not running."
   20.36 +      _ '%s is not running.' $NAME
   20.37        exit 1
   20.38      fi
   20.39 -    echo -n "Stopping $DESC: $NAME... "
   20.40 -    kill `cat $PIDFILE`
   20.41 +    action 'Stopping %s: %s...' "$DESC" $NAME
   20.42 +    kill $(cat $PIDFILE)
   20.43      rm $PIDFILE
   20.44      status
   20.45      ;;
   20.46    restart)
   20.47      if ! active_pidfile $PIDFILE clamd ; then
   20.48 -      echo "$NAME is not running."
   20.49 +      _ '%s is not running.' $NAME
   20.50        exit 1
   20.51      fi
   20.52 -    echo -n "Restarting $DESC: $NAME... "
   20.53 -    kill `cat $PIDFILE`
   20.54 +    action 'Restarting %s: %s...' "$DESC" $NAME
   20.55 +    kill $(cat $PIDFILE)
   20.56      rm $PIDFILE
   20.57      sleep 2
   20.58      $DAEMON $OPTIONS
   20.59      status
   20.60      ;;
   20.61    *)
   20.62 -    echo ""
   20.63 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   20.64 -    echo ""
   20.65 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   20.66 +    newline
   20.67      exit 1
   20.68      ;;
   20.69  esac
    21.1 --- a/collectd/stuff/collectd	Wed May 25 23:07:05 2016 +0200
    21.2 +++ b/collectd/stuff/collectd	Thu May 26 20:16:45 2016 +0300
    21.3 @@ -1,5 +1,5 @@
    21.4  #!/bin/sh
    21.5 -# /etc/init.d/collectd : Start, stop and restart Collectd server on SliTaz, at 
    21.6 +# /etc/init.d/collectd : Start, stop and restart Collectd server on SliTaz, at
    21.7  # boot time or with the command line.
    21.8  #
    21.9  # To start Collectd server at boot time, just put collectd in the $RUN_DAEMONS
   21.10 @@ -9,7 +9,7 @@
   21.11  . /etc/daemons.conf
   21.12  
   21.13  NAME=collectd
   21.14 -DESC="Statistics collection daemon"
   21.15 +DESC="$(_ 'Statistics collection daemon')"
   21.16  DAEMON=/usr/sbin/collectd
   21.17  OPTIONS=""
   21.18  PIDFILE=/var/run/collectd.pid
   21.19 @@ -17,37 +17,36 @@
   21.20  case "$1" in
   21.21    start)
   21.22      if active_pidfile $PIDFILE collectd ; then
   21.23 -      echo "$NAME already running."
   21.24 +      _ '%s is already running.' $NAME
   21.25        exit 1
   21.26      fi
   21.27 -    echo -n "Starting $DESC: $NAME... "
   21.28 +    action 'Starting %s: %s...' "$DESC" $NAME
   21.29      $DAEMON $OPTIONS
   21.30      status
   21.31      ;;
   21.32    stop)
   21.33      if ! active_pidfile $PIDFILE collectd ; then
   21.34 -      echo "$NAME is not running."
   21.35 +      _ '%s is not running.' $NAME
   21.36        exit 1
   21.37      fi
   21.38 -    echo -n "Stopping $DESC: $NAME... "
   21.39 -    kill `cat $PIDFILE`
   21.40 +    action 'Stopping %s: %s...' "$DESC" $NAME
   21.41 +    kill $(cat $PIDFILE)
   21.42      status
   21.43      ;;
   21.44    restart)
   21.45      if ! active_pidfile $PIDFILE collectd ; then
   21.46 -      echo "$NAME is not running."
   21.47 +      _ '%s is not running.' $NAME
   21.48        exit 1
   21.49      fi
   21.50 -    echo -n "Restarting $DESC: $NAME... "
   21.51 -    kill `cat $PIDFILE`
   21.52 +    action 'Restarting %s: %s...' "$DESC" $NAME
   21.53 +    kill $(cat $PIDFILE)
   21.54      sleep 2
   21.55      $DAEMON $OPTIONS
   21.56      status
   21.57      ;;
   21.58    *)
   21.59 -    echo ""
   21.60 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   21.61 -    echo ""
   21.62 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   21.63 +    newline
   21.64      exit 1
   21.65      ;;
   21.66  esac
    22.1 --- a/connman/stuff/etc/init.d/connman	Wed May 25 23:07:05 2016 +0200
    22.2 +++ b/connman/stuff/etc/init.d/connman	Thu May 26 20:16:45 2016 +0300
    22.3 @@ -10,7 +10,7 @@
    22.4  . /etc/daemons.conf
    22.5  
    22.6  NAME=Connman
    22.7 -DESC="Connection Manager"
    22.8 +DESC="$(_ 'Connection Manager')"
    22.9  DAEMON=connmand
   22.10  OPTIONS=$CONNMAN_OPTIONS
   22.11  PIDFILE="$(pidof $DAEMON)"
   22.12 @@ -18,30 +18,30 @@
   22.13  case "$1" in
   22.14    start)
   22.15      if [ -n "$PIDFILE" ] ; then
   22.16 -      echo "$NAME is already running."
   22.17 +      _ '%s is already running.' $NAME
   22.18        exit 1
   22.19      fi
   22.20      pkill udhcpc 2>/dev/null
   22.21 -    echo -n "Starting $DESC: $NAME... "
   22.22 +    action 'Starting %s: %s...' "$DESC" $NAME
   22.23      $DAEMON $OPTIONS
   22.24      status
   22.25      ;;
   22.26    stop)
   22.27      if [ -z "$PIDFILE" ] ; then
   22.28 -      echo "$NAME is not running."
   22.29 +      _ '%s is not running.' $NAME
   22.30        exit 1
   22.31      fi
   22.32 -    echo -n "Stopping $DESC: $NAME... "
   22.33 +    action 'Stopping %s: %s...' "$DESC" $NAME
   22.34      pkill $DAEMON
   22.35      pkill wpa_supplicant
   22.36      status
   22.37      ;;
   22.38    restart)
   22.39      if [ -z "$PIDFILE" ] ; then
   22.40 -      echo "$NAME is not running."
   22.41 +      _ '%s is not running.' $NAME
   22.42        exit 1
   22.43      fi
   22.44 -    echo -n "Restarting $DESC: $NAME... "
   22.45 +    action 'Restarting %s: %s...' "$DESC" $NAME
   22.46      pkill $DAEMON &&
   22.47      pkill wpa_supplicant &&
   22.48      sleep 2 &&
   22.49 @@ -50,15 +50,14 @@
   22.50      ;;
   22.51    status)
   22.52      if [ -n "$PIDFILE" ] ; then
   22.53 -      echo "$NAME is running."  
   22.54 +      _ '%s is running.' $NAME
   22.55      else
   22.56 -      echo "$NAME is not running."
   22.57 -    fi  
   22.58 +      _ '%s is not running.' $NAME
   22.59 +    fi
   22.60      ;;
   22.61    *)
   22.62 -	printf "\n\033[1mUsage:\033[0m /etc/init.d/%b [start|stop|restart|status]\n" \
   22.63 -		"$(basename $0)"
   22.64 -    exit 1
   22.65 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart|status]"
   22.66 +    newline
   22.67      ;;
   22.68  esac
   22.69  
    23.1 --- a/cups/stuff/etc/init.d/cupsd	Wed May 25 23:07:05 2016 +0200
    23.2 +++ b/cups/stuff/etc/init.d/cupsd	Thu May 26 20:16:45 2016 +0300
    23.3 @@ -9,14 +9,14 @@
    23.4  . /etc/daemons.conf
    23.5  
    23.6  NAME=Cupsd
    23.7 -DESC="cups deamon"
    23.8 +DESC="$(_ '%s daemon' CUPS)"
    23.9  DAEMON=/usr/sbin/cupsd
   23.10  OPTIONS=$CUPSD_OPTIONS
   23.11  PIDFILE=/var/run/cups/cups.sock
   23.12  
   23.13  case "$1" in
   23.14  	stop)
   23.15 -		action 'Stopping $DESC: $NAME... '
   23.16 +		action 'Stopping %s: %s...' "$DESC" $NAME
   23.17  		kill $(pgrep -f cupsd)
   23.18  		sleep 2
   23.19  		[ -e /var/run/cups/cups.sock ] && rm -f $PIDFILE
   23.20 @@ -24,16 +24,15 @@
   23.21  		;;
   23.22  	start)
   23.23  		if ! active_pidfile $PIDFILE cupsd 2>/dev/null; then
   23.24 -			action 'Starting $DESC: $NAME... '
   23.25 +			action 'Starting %s: %s...' "$DESC" $NAME
   23.26  			$DAEMON $OPTIONS
   23.27  			status
   23.28  		else
   23.29 -			action 'Not starting $DESC: $DESC is already running'
   23.30 -			false; status
   23.31 +			_ '%s is already running.' $NAME
   23.32  		fi
   23.33  		;;
   23.34  	*)
   23.35 -		emsg "<n><b>Usage:</b> /etc/init.d/$(basename $0) [start|stop]"
   23.36 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop]"
   23.37  		newline
   23.38  		exit 1
   23.39  		;;
    24.1 --- a/cyrus-imapd/stuff/etc/init.d/cyrus-imapd	Wed May 25 23:07:05 2016 +0200
    24.2 +++ b/cyrus-imapd/stuff/etc/init.d/cyrus-imapd	Thu May 26 20:16:45 2016 +0300
    24.3 @@ -1,5 +1,5 @@
    24.4  #!/bin/sh
    24.5 -# /etc/init.d/cyrus-imapd : Start, stop and restart IMAP server on SliTaz, at 
    24.6 +# /etc/init.d/cyrus-imapd : Start, stop and restart IMAP server on SliTaz, at
    24.7  # boot time or with the command line.
    24.8  #
    24.9  # To start IMAP server at boot time, just put cyrus-imapd in the $RUN_DAEMONS
   24.10 @@ -9,7 +9,7 @@
   24.11  . /etc/daemons.conf
   24.12  
   24.13  NAME=cyrus-imapd
   24.14 -DESC="IMAP server"
   24.15 +DESC="$(_ '%s server' IMAP)"
   24.16  DAEMON=/usr/lib/cyrus/master
   24.17  OPTIONS=$CYRUS_OPTIONS
   24.18  PIDFILE=/var/run/cyrus.master.pid
   24.19 @@ -18,12 +18,12 @@
   24.20  case "$1" in
   24.21    start)
   24.22      if active_pidfile $PIDFILE master ; then
   24.23 -      echo "$NAME already running."
   24.24 +      _ '%s is already running.' $NAME
   24.25        exit 1
   24.26      fi
   24.27 -    dir=$(grep ^configdirectory /etc/imapd.conf | awk '{ print $2 }')
   24.28 +    dir=$(grep ^configdirectory /etc/imapd.conf | awk '{print $2}')
   24.29      if [ ! -f $dir/mailboxes.db ]; then
   24.30 -      echo -n "Initialize $DESC: "
   24.31 +      action 'Initialize %s...' "$DESC"
   24.32        #/usr/cyrus/bin/mkimap
   24.33        for i in db proc socket log msg user quota; do
   24.34          [ -d $dir/$i ] || mkdir -p -m 700 $dir/$i
   24.35 @@ -43,7 +43,7 @@
   24.36              [ -d $i/$j ] || mkdir -p $i/$j
   24.37            done ;;
   24.38          esac
   24.39 -        [ -d $i/stage. ] || mkdir $i/stage. 
   24.40 +        [ -d $i/stage. ] || mkdir $i/stage.
   24.41          chown -R cyrus:mail $i
   24.42        done
   24.43        case "$(grep ^sieveusehomedir /etc/imapd.conf | awk '{ print $2 }')" in
   24.44 @@ -60,44 +60,43 @@
   24.45        su cyrus -c "/usr/cyrus/bin/reconstruct"
   24.46        status
   24.47      fi
   24.48 -    if ! pidof saslauthd > /dev/null; then
   24.49 +    if ! pidof saslauthd >/dev/null; then
   24.50        /etc/init.d/cyrus-sasl start
   24.51      fi
   24.52 -    echo -n "Starting $DESC: $NAME... "
   24.53 +    action 'Starting %s: %s...' "$DESC" $NAME
   24.54      $DAEMON $OPTIONS
   24.55      status
   24.56      sleep 2
   24.57      ;;
   24.58    stop)
   24.59      if ! active_pidfile $PIDFILE master ; then
   24.60 -      echo "$NAME is not running."
   24.61 +      _ '%s is not running.' $NAME
   24.62        exit 1
   24.63      fi
   24.64 -    echo -n "Stopping $DESC: $NAME... "
   24.65 -    kill `cat $PIDFILE`
   24.66 -    ps x | grep -q `cat $PIDFILE` || rm -f $PIDFILE
   24.67 +    action 'Stopping %s: %s...' "$DESC" $NAME
   24.68 +    kill $(cat $PIDFILE)
   24.69 +    ps x | grep -q $(cat $PIDFILE) || rm -f $PIDFILE
   24.70      status
   24.71      ;;
   24.72    restart)
   24.73      if ! active_pidfile $PIDFILE master ; then
   24.74 -      echo "$NAME is not running."
   24.75 +      _ '%s is not running.' $NAME
   24.76        exit 1
   24.77      fi
   24.78 -    echo -n "Restarting $DESC: $NAME... "
   24.79 -    kill `cat $PIDFILE`
   24.80 -    if ps x | grep -q `cat $PIDFILE`; then
   24.81 -    	false
   24.82 +    action 'Restarting %s: %s...' "$DESC" $NAME
   24.83 +    kill $(cat $PIDFILE)
   24.84 +    if ps x | grep -q $(cat $PIDFILE); then
   24.85 +      false
   24.86      else
   24.87 -    	rm -f $PIDFILE
   24.88 -    	sleep 2
   24.89 -    	$DAEMON $OPTIONS
   24.90 +      rm -f $PIDFILE
   24.91 +      sleep 2
   24.92 +      $DAEMON $OPTIONS
   24.93      fi
   24.94      status
   24.95      ;;
   24.96    *)
   24.97 -    echo ""
   24.98 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   24.99 -    echo ""
  24.100 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
  24.101 +    newline
  24.102      exit 1
  24.103      ;;
  24.104  esac
    25.1 --- a/cyrus-sasl/stuff/etc/init.d/cyrus-sasl	Wed May 25 23:07:05 2016 +0200
    25.2 +++ b/cyrus-sasl/stuff/etc/init.d/cyrus-sasl	Thu May 26 20:16:45 2016 +0300
    25.3 @@ -1,5 +1,5 @@
    25.4  #!/bin/sh
    25.5 -# /etc/init.d/cyrus-sasl : Start, stop and restart SASL server on SliTaz, at 
    25.6 +# /etc/init.d/cyrus-sasl : Start, stop and restart SASL server on SliTaz, at
    25.7  # boot time or with the command line.
    25.8  #
    25.9  # To start SASL server at boot time, just put cyrus-sasl in the $RUN_DAEMONS
   25.10 @@ -9,7 +9,7 @@
   25.11  . /etc/daemons.conf
   25.12  
   25.13  NAME=cyrus-sasl
   25.14 -DESC="SASL server"
   25.15 +DESC="$(_ '%s server' SASL)"
   25.16  DAEMON=/usr/sbin/saslauthd
   25.17  OPTIONS=$CYRUS_OPTIONS
   25.18  PIDFILE=/var/state/saslauthd/saslauthd.pid
   25.19 @@ -18,37 +18,36 @@
   25.20  case "$1" in
   25.21    start)
   25.22      if active_pidfile $PIDFILE saslauthd ; then
   25.23 -      echo "$NAME already running."
   25.24 +      _ '%s is already running.' $NAME
   25.25        exit 1
   25.26      fi
   25.27 -    echo -n "Starting $DESC: $NAME... "
   25.28 +    action 'Starting %s: %s...' "$DESC" $NAME
   25.29      $DAEMON $OPTIONS
   25.30      status
   25.31      ;;
   25.32    stop)
   25.33      if ! active_pidfile $PIDFILE saslauthd ; then
   25.34 -      echo "$NAME is not running."
   25.35 +      _ '%s is not running.' $NAME
   25.36        exit 1
   25.37      fi
   25.38 -    echo -n "Stopping $DESC: $NAME... "
   25.39 -    kill `cat $PIDFILE`
   25.40 +    action 'Stopping %s: %s...' "$DESC" $NAME
   25.41 +    kill $(cat $PIDFILE)
   25.42      status
   25.43      ;;
   25.44    restart)
   25.45      if ! active_pidfile $PIDFILE saslauthd ; then
   25.46 -      echo "$NAME is not running."
   25.47 +      _ '%s is not running.' $NAME
   25.48        exit 1
   25.49      fi
   25.50 -    echo -n "Restarting $DESC: $NAME... "
   25.51 -    kill `cat $PIDFILE`
   25.52 +    action 'Restarting %s: %s...' "$DESC" $NAME
   25.53 +    kill $(cat $PIDFILE)
   25.54      sleep 2
   25.55      $DAEMON $OPTIONS
   25.56      status
   25.57      ;;
   25.58    *)
   25.59 -    echo ""
   25.60 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   25.61 -    echo ""
   25.62 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   25.63 +    newline
   25.64      exit 1
   25.65      ;;
   25.66  esac
    26.1 --- a/dbus/stuff/etc/init.d/dbus	Wed May 25 23:07:05 2016 +0200
    26.2 +++ b/dbus/stuff/etc/init.d/dbus	Thu May 26 20:16:45 2016 +0300
    26.3 @@ -7,7 +7,7 @@
    26.4  . /etc/daemons.conf
    26.5  
    26.6  NAME=DBUS
    26.7 -DESC="message bus daemon"
    26.8 +DESC="$(_ 'message bus daemon')"
    26.9  DAEMON=/usr/bin/dbus-daemon
   26.10  OPTIONS=$DBUS_OPTIONS
   26.11  PIDFILE=/run/dbus/pid
   26.12 @@ -20,41 +20,40 @@
   26.13  case "$1" in
   26.14    start)
   26.15      if active_pidfile $PIDFILE dbus-daemon ; then
   26.16 -      echo "$NAME already running."
   26.17 +      _ '%s is already running.' $NAME
   26.18        exit 1
   26.19      fi
   26.20      mkdir -p /run/dbus
   26.21 -    echo -n "Starting $DESC: $NAME... "
   26.22 +    action 'Starting %s: %s...' "$DESC" $NAME
   26.23      $DAEMON $OPTIONS
   26.24      status
   26.25      ;;
   26.26    stop)
   26.27      if ! active_pidfile $PIDFILE dbus-daemon ; then
   26.28 -      echo "$NAME is not running."
   26.29 +      _ '%s is not running.' $NAME
   26.30        exit 1
   26.31      fi
   26.32 -    echo -n "Stopping $DESC: $NAME... "
   26.33 -    kill `cat $PIDFILE`
   26.34 +    action 'Stopping %s: %s...' "$DESC" $NAME
   26.35 +    kill $(cat $PIDFILE)
   26.36      rm $PIDFILE
   26.37      status
   26.38      ;;
   26.39    restart)
   26.40      if ! active_pidfile $PIDFILE dbus-daemon ; then
   26.41 -      echo "$NAME is not running."
   26.42 +      _ '%s is not running.' $NAME
   26.43        exit 1
   26.44      fi
   26.45      mkdir -p /run/dbus
   26.46 -    echo -n "Restarting $DESC: $NAME... "
   26.47 -    kill `cat $PIDFILE`
   26.48 +    action 'Restarting %s: %s...' "$DESC" $NAME
   26.49 +    kill $(cat $PIDFILE)
   26.50      rm $PIDFILE
   26.51      sleep 2
   26.52      $DAEMON $OPTIONS
   26.53      status
   26.54      ;;
   26.55    *)
   26.56 -    echo ""
   26.57 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   26.58 -    echo ""
   26.59 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   26.60 +    newline
   26.61      exit 1
   26.62      ;;
   26.63  esac
    27.1 --- a/ddclient/stuff/ddclient	Wed May 25 23:07:05 2016 +0200
    27.2 +++ b/ddclient/stuff/ddclient	Thu May 26 20:16:45 2016 +0300
    27.3 @@ -8,7 +8,7 @@
    27.4  . /etc/init.d/rc.functions
    27.5  
    27.6  NAME=DDclient
    27.7 -DESC="ddclient dynamic IP manager"
    27.8 +DESC="$(_ 'dynamic IP manager')"
    27.9  DAEMON=/usr/sbin/ddclient
   27.10  PID_FILE=/var/run/ddclient.pid
   27.11  OPTION="-pid $PID_FILE"
   27.12 @@ -16,29 +16,29 @@
   27.13  case "$1" in
   27.14    start)
   27.15      if active_pidfile $PID_FILE ddclient ; then
   27.16 -      echo "$NAME already running."
   27.17 +      _ '%s is already running.' $NAME
   27.18        exit 1
   27.19      fi
   27.20 -    echo -n "Starting $DESC: $NAME... "
   27.21 +    action 'Starting %s: %s...' "$DESC" $NAME
   27.22      $DAEMON $OPTION
   27.23      status
   27.24      ;;
   27.25    stop)
   27.26      if ! active_pidfile $PID_FILE ddclient ; then
   27.27 -      echo "$NAME is not running."
   27.28 +      _ '%s is not running.' $NAME
   27.29        exit 1
   27.30      fi
   27.31 -    echo -n "Stopping $DESC: $NAME... "
   27.32 +    action 'Stopping %s: %s...' "$DESC" $NAME
   27.33      killall ddclient
   27.34      rm $PID_FILE
   27.35      status
   27.36      ;;
   27.37    restart)
   27.38      if ! active_pidfile $PID_FILE ddclient ; then
   27.39 -      echo "$NAME is not running."
   27.40 +      _ '%s is not running.' $NAME
   27.41        exit 1
   27.42      fi
   27.43 -    echo -n "Restarting $DESC: $NAME... "
   27.44 +    action 'Restarting %s: %s...' "$DESC" $NAME
   27.45      killall ddclient
   27.46      rm $PID_FILE
   27.47      sleep 2
   27.48 @@ -46,9 +46,8 @@
   27.49      status
   27.50      ;;
   27.51    *)
   27.52 -    echo ""
   27.53 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   27.54 -    echo ""
   27.55 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   27.56 +    newline
   27.57      exit 1
   27.58      ;;
   27.59  esac
    28.1 --- a/dhcp/stuff/dhcpd	Wed May 25 23:07:05 2016 +0200
    28.2 +++ b/dhcp/stuff/dhcpd	Thu May 26 20:16:45 2016 +0300
    28.3 @@ -9,7 +9,7 @@
    28.4  . /etc/daemons.conf
    28.5  
    28.6  NAME=Dhcpd
    28.7 -DESC="dhcp deamon"
    28.8 +DESC="$(_ '%s daemon' DHCP)"
    28.9  DAEMON=/usr/sbin/dhcpd
   28.10  OPTIONS=$DHCPD_OPTIONS
   28.11  PIDFILE=/var/run/dhcpd.pid
   28.12 @@ -17,37 +17,36 @@
   28.13  case "$1" in
   28.14    start)
   28.15      if active_pidfile $PIDFILE dhcpd ; then
   28.16 -      echo "$NAME already running."
   28.17 +      _ '%s is already running.' $NAME
   28.18        exit 1
   28.19      fi
   28.20 -    echo -n "Starting $DESC: $NAME... "
   28.21 -    $DAEMON $OPTIONS 
   28.22 +    action 'Starting %s: %s...' "$DESC" $NAME
   28.23 +    $DAEMON $OPTIONS
   28.24      status
   28.25      ;;
   28.26    stop)
   28.27      if ! active_pidfile $PIDFILE dhcpd ; then
   28.28 -      echo "$NAME is not running."
   28.29 +      _ '%s is not running.' $NAME
   28.30        exit 1
   28.31      fi
   28.32 -    echo -n "Stopping $DESC: $NAME... "
   28.33 -    kill `cat $PIDFILE`
   28.34 +    action 'Stopping %s: %s...' "$DESC" $NAME
   28.35 +    kill $(cat $PIDFILE)
   28.36      status
   28.37      ;;
   28.38    restart)
   28.39      if ! active_pidfile $PIDFILE dhcpd ; then
   28.40 -      echo "$NAME is not running."
   28.41 +      _ '%s is not running.' $NAME
   28.42        exit 1
   28.43      fi
   28.44 -    echo -n "Restarting $DESC: $NAME... "
   28.45 -    kill `cat $PIDFILE`
   28.46 +    action 'Restarting %s: %s...' "$DESC" $NAME
   28.47 +    kill $(cat $PIDFILE)
   28.48      sleep 2
   28.49      $DAEMON $OPTIONS
   28.50      status
   28.51      ;;
   28.52    *)
   28.53 -    echo ""
   28.54 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   28.55 -    echo ""
   28.56 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   28.57 +    newline
   28.58      exit 1
   28.59      ;;
   28.60  esac
    29.1 --- a/dhid/stuff/init.d/dhid	Wed May 25 23:07:05 2016 +0200
    29.2 +++ b/dhid/stuff/init.d/dhid	Thu May 26 20:16:45 2016 +0300
    29.3 @@ -2,47 +2,52 @@
    29.4  #
    29.5  # /etc/init.d/dhid: Start, stop and restart dhis daemon on SliTaz
    29.6  #
    29.7 -. /lib/libtaz.sh
    29.8 +. /etc/init.d/rc.functions
    29.9  #. /etc/daemons.conf
   29.10  
   29.11  NAME=DHID
   29.12 -DESC="dyn ip"
   29.13 +DESC="$(_ 'DHIS client daemon')"
   29.14  DAEMON=/usr/sbin/dhid
   29.15  PIDFILE=/run/dhid.pid
   29.16  OPTIONS="-P $PIDFILE"
   29.17  
   29.18  case "$1" in
   29.19 -		start)
   29.20 +	start)
   29.21  		if active_pidfile $PIDFILE dhid; then
   29.22 -			echo "$NAME already running."; §exit 1
   29.23 +			_ '%s is already running.' $NAME
   29.24 +			exit 1
   29.25  		fi
   29.26 -		echo -n "Starting $DESC: $NAME... "
   29.27 -		$DAEMON $OPTIONS 
   29.28 -		status ;;
   29.29 -	
   29.30 +		action 'Starting %s: %s...' "$DESC" $NAME
   29.31 +		$DAEMON $OPTIONS
   29.32 +		status
   29.33 +		;;
   29.34  	stop)
   29.35  		if ! active_pidfile $PIDFILE dhid; then
   29.36 -			echo "$NAME is not running."; exit 1
   29.37 +			_ '%s is not running.' $NAME
   29.38 +			exit 1
   29.39  		fi
   29.40 -		echo -n "Stopping $DESC: $NAME... "
   29.41 +		action 'Stopping %s: %s...' "$DESC" $NAME
   29.42  		kill $(cat $PIDFILE)
   29.43  		rm $PIDFILE
   29.44 -		status ;;
   29.45 -	
   29.46 +		status
   29.47 +		;;
   29.48  	restart)
   29.49  		if ! active_pidfile $PIDFILE dhid; then
   29.50 -			echo "$NAME is not running."; exit 1
   29.51 +			_ '%s is not running.' $NAME
   29.52 +			exit 1
   29.53  		fi
   29.54 -		echo -n "Restarting $DESC: $NAME... "
   29.55 +		action 'Restarting %s: %s...' "$DESC" $NAME
   29.56  		kill $(cat $PIDFILE)
   29.57  		rm $PIDFILE
   29.58  		sleep 2
   29.59  		$DAEMON $OPTIONS
   29.60 -		status ;;
   29.61 -	
   29.62 -	*) 
   29.63 -		echo "Usage: /etc/init.d/$(basename $0) [start|stop|restart]"
   29.64 -		exit 1 ;;
   29.65 +		status
   29.66 +		;;
   29.67 +	*)
   29.68 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   29.69 +		newline
   29.70 +		exit 1
   29.71 +		;;
   29.72  esac
   29.73  
   29.74  exit 0
    30.1 --- a/distcc/stuff/distccd	Wed May 25 23:07:05 2016 +0200
    30.2 +++ b/distcc/stuff/distccd	Thu May 26 20:16:45 2016 +0300
    30.3 @@ -1,5 +1,5 @@
    30.4  #!/bin/sh
    30.5 -# /etc/init.d/distccd: Start, stop and restart Distcc daemon on SliTaz, 
    30.6 +# /etc/init.d/distccd: Start, stop and restart Distcc daemon on SliTaz,
    30.7  # at boot time or with the command line. Daemons options are configured
    30.8  # with /etc/daemons.conf
    30.9  #
   30.10 @@ -10,7 +10,7 @@
   30.11  {
   30.12  	if [ -s /etc/distcc/hosts.allow ]; then
   30.13  		for i in $(cat /etc/distcc/clients.allow); do
   30.14 -			( echo $i | grep -q '^#' ) && continue 
   30.15 +			( echo $i | grep -q '^#' ) && continue
   30.16  			ALLOW_HOST="$ALLOW_HOST --allow $i"
   30.17  		done
   30.18  	else
   30.19 @@ -20,7 +20,7 @@
   30.20  }
   30.21  
   30.22  NAME=Distccd
   30.23 -DESC="Distcc daemon"
   30.24 +DESC="$(_ '%s daemon' Distcc)"
   30.25  DAEMON="/usr/bin/distccd"
   30.26  LOGFILE="/var/log/distccd/distccd.log"
   30.27  PIDFILE="/var/run/distccd/distccd.pid"
   30.28 @@ -35,35 +35,34 @@
   30.29  case "$1" in
   30.30    start)
   30.31      if active_pidfile $PIDFILE distccd ; then
   30.32 -      echo "$NAME already running."
   30.33 +      _ '%s is already running.' $NAME
   30.34        exit 1
   30.35      fi
   30.36 -    echo -n "Starting $DESC: $NAME... "
   30.37 -    $DAEMON $OPTIONS 
   30.38 +    action 'Starting %s: %s...' "$DESC" $NAME
   30.39 +    $DAEMON $OPTIONS
   30.40      status
   30.41      ;;
   30.42    stop)
   30.43      if ! active_pidfile $PIDFILE distccd ; then
   30.44 -      echo "$NAME is not running."
   30.45 +      _ '%s is not running.' $NAME
   30.46        exit 1
   30.47      fi
   30.48 -    echo -n "Stopping $DESC: $NAME... "
   30.49 +    action 'Stopping %s: %s...' "$DESC" $NAME
   30.50      kill -15 $(cat $PIDFILE)
   30.51      status
   30.52      ;;
   30.53    restart)
   30.54      if ! active_pidfile $PIDFILE distccd ; then
   30.55 -      echo "$NAME is not running."
   30.56 +      _ '%s is not running.' $NAME
   30.57        exit 1
   30.58      fi
   30.59 -    echo -n "Restarting $DESC: $NAME... "
   30.60 +    action 'Restarting %s: %s...' "$DESC" $NAME
   30.61      $DAEMON $OPTIONS -k restart
   30.62      status
   30.63      ;;
   30.64    *)
   30.65 -    echo ""
   30.66 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   30.67 -    echo ""
   30.68 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   30.69 +    newline
   30.70      exit 1
   30.71      ;;
   30.72  esac
    31.1 --- a/dnsmasq/stuff/etc/init.d/dnsmasq	Wed May 25 23:07:05 2016 +0200
    31.2 +++ b/dnsmasq/stuff/etc/init.d/dnsmasq	Thu May 26 20:16:45 2016 +0300
    31.3 @@ -9,7 +9,7 @@
    31.4  . /etc/daemons.conf
    31.5  
    31.6  NAME=DNSmasq
    31.7 -DESC="dnsmasq deamon"
    31.8 +DESC="$(_ '%s daemon' dnsmasq)"
    31.9  DAEMON=/usr/sbin/dnsmasq
   31.10  OPTIONS=$DNSMASQ_OPTIONS
   31.11  PIDFILE=/var/run/dnsmasq.pid
   31.12 @@ -17,39 +17,38 @@
   31.13  case "$1" in
   31.14    start)
   31.15      if active_pidfile $PIDFILE dnsmasq ; then
   31.16 -      echo "$NAME already running."
   31.17 +      _ '%s is already running.' $NAME
   31.18        exit 1
   31.19      fi
   31.20 -    echo -n "Starting $DESC: $NAME... "
   31.21 -    $DAEMON $OPTIONS 
   31.22 +    action 'Starting %s: %s...' "$DESC" $NAME
   31.23 +    $DAEMON $OPTIONS
   31.24      status
   31.25      ;;
   31.26    stop)
   31.27      if ! active_pidfile $PIDFILE dnsmasq ; then
   31.28 -      echo "$NAME is not running."
   31.29 +      _ '%s is not running.' $NAME
   31.30        exit 1
   31.31      fi
   31.32 -    echo -n "Stopping $DESC: $NAME... "
   31.33 -    kill `cat $PIDFILE`
   31.34 +    action 'Stopping %s: %s...' "$DESC" $NAME
   31.35 +    kill $(cat $PIDFILE)
   31.36      rm $PIDFILE
   31.37      status
   31.38      ;;
   31.39    restart)
   31.40      if ! active_pidfile $PIDFILE dnsmasq ; then
   31.41 -      echo "$NAME is not running."
   31.42 +      _ '%s is not running.' $NAME
   31.43        exit 1
   31.44      fi
   31.45 -    echo -n "Restarting $DESC: $NAME... "
   31.46 -    kill `cat $PIDFILE`
   31.47 +    action 'Restarting %s: %s...' "$DESC" $NAME
   31.48 +    kill $(cat $PIDFILE)
   31.49      rm $PIDFILE
   31.50      sleep 2
   31.51      $DAEMON $OPTIONS
   31.52      status
   31.53      ;;
   31.54    *)
   31.55 -    echo ""
   31.56 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   31.57 -    echo ""
   31.58 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   31.59 +    newline
   31.60      exit 1
   31.61      ;;
   31.62  esac
    32.1 --- a/dovecot/stuff/init.d/dovecot	Wed May 25 23:07:05 2016 +0200
    32.2 +++ b/dovecot/stuff/init.d/dovecot	Thu May 26 20:16:45 2016 +0300
    32.3 @@ -1,5 +1,5 @@
    32.4  #!/bin/sh
    32.5 -# /etc/init.d/dovecot : Start, stop and restart Dovecotserver on SliTaz, at 
    32.6 +# /etc/init.d/dovecot : Start, stop and restart Dovecotserver on SliTaz, at
    32.7  # boot time or with the command line.
    32.8  #
    32.9  # To start SSH server at boot time, just put dovecot in the $RUN_DAEMONS
   32.10 @@ -9,7 +9,7 @@
   32.11  . /etc/daemons.conf
   32.12  
   32.13  NAME=dovecot
   32.14 -DESC="Dovecot daemon"
   32.15 +DESC="$(_ '%s daemon' Dovecot)"
   32.16  DAEMON=/usr/sbin/dovecot
   32.17  OPTIONS=$dovecot_OPTIONS
   32.18  PIDFILE=/var/run/dovecot/master.pid
   32.19 @@ -21,37 +21,36 @@
   32.20  case "$1" in
   32.21    start)
   32.22      if active_pidfile $PIDFILE dovecot ; then
   32.23 -      echo "$NAME already running."
   32.24 +      _ '%s is already running.' $NAME
   32.25        exit 1
   32.26      fi
   32.27 -    echo -n "Starting $DESC: $NAME... "
   32.28 +    action 'Starting %s: %s...' "$DESC" $NAME
   32.29      $DAEMON $OPTIONS
   32.30      status
   32.31      ;;
   32.32    stop)
   32.33      if ! active_pidfile $PIDFILE dovecot ; then
   32.34 -      echo "$NAME is not running."
   32.35 +      _ '%s is not running.' $NAME
   32.36        exit 1
   32.37      fi
   32.38 -    echo -n "Stopping $DESC: $NAME... "
   32.39 -    kill `cat $PIDFILE`
   32.40 +    action 'Stopping %s: %s...' "$DESC" $NAME
   32.41 +    kill $(cat $PIDFILE)
   32.42      status
   32.43      ;;
   32.44    restart)
   32.45      if ! active_pidfile $PIDFILE dovecot ; then
   32.46 -      echo "$NAME is not running."
   32.47 +      _ '%s is not running.' $NAME
   32.48        exit 1
   32.49      fi
   32.50 -    echo -n "Restarting $DESC: $NAME... "
   32.51 -    kill `cat $PIDFILE`
   32.52 +    action 'Restarting %s: %s...' "$DESC" $NAME
   32.53 +    kill $(cat $PIDFILE)
   32.54      sleep 2
   32.55      $DAEMON $OPTIONS
   32.56      status
   32.57      ;;
   32.58    *)
   32.59 -    echo ""
   32.60 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   32.61 -    echo ""
   32.62 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   32.63 +    newline
   32.64      exit 1
   32.65      ;;
   32.66  esac
    33.1 --- a/dropbear/stuff/init.d/dropbear	Wed May 25 23:07:05 2016 +0200
    33.2 +++ b/dropbear/stuff/init.d/dropbear	Thu May 26 20:16:45 2016 +0300
    33.3 @@ -1,5 +1,5 @@
    33.4  #!/bin/sh
    33.5 -# /etc/init.d/dropbear : Start, stop and restart SSH server on SliTaz, at 
    33.6 +# /etc/init.d/dropbear : Start, stop and restart SSH server on SliTaz, at
    33.7  # boot time or with the command line.
    33.8  #
    33.9  # To start SSH server at boot time, just put dropbear in the $RUN_DAEMONS
   33.10 @@ -9,7 +9,7 @@
   33.11  . /etc/daemons.conf
   33.12  
   33.13  NAME=Dropbear
   33.14 -DESC="SSH server"
   33.15 +DESC="$(_ '%s server' SSH)"
   33.16  DAEMON=/usr/sbin/dropbear
   33.17  OPTIONS=$DROPBEAR_OPTIONS
   33.18  PIDFILE=/var/run/dropbear.pid
   33.19 @@ -18,51 +18,50 @@
   33.20    start)
   33.21      # We need rsa and dss host key file to start dropbear.
   33.22      if [ ! -s /etc/dropbear/dropbear_rsa_host_key ] ; then
   33.23 -      echo -n "Generating $NAME rsa key... "
   33.24 +      action 'Generating Dropbear %s key...' RSA
   33.25        # Need to delete key before creating it.
   33.26        rm -f /etc/dropbear/dropbear_rsa_host_key
   33.27 -      dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1
   33.28 +      dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key >/dev/null 2>&1
   33.29        status
   33.30      fi
   33.31      if [ ! -s /etc/dropbear/dropbear_dss_host_key ] ; then
   33.32 -      echo -n "Generating $NAME dss key... "
   33.33 +      action 'Generating Dropbear %s key...' DSS
   33.34        # Need to delete key before creating it.
   33.35        rm -f /etc/dropbear/dropbear_dss_host_key
   33.36 -      dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1
   33.37 +      dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key >/dev/null 2>&1
   33.38        status
   33.39      fi
   33.40      if active_pidfile $PIDFILE dropbear ; then
   33.41 -      echo "$NAME already running."
   33.42 +      _ '%s is already running.' $NAME
   33.43        exit 1
   33.44      fi
   33.45 -    echo -n "Starting $DESC: $NAME... "
   33.46 +    action 'Starting %s: %s...' "$DESC" $NAME
   33.47      $DAEMON $OPTIONS
   33.48      status
   33.49      ;;
   33.50    stop)
   33.51      if ! active_pidfile $PIDFILE dropbear ; then
   33.52 -      echo "$NAME is not running."
   33.53 +      _ '%s is not running.' $NAME
   33.54        exit 1
   33.55      fi
   33.56 -    echo -n "Stopping $DESC: $NAME... "
   33.57 -    kill `cat $PIDFILE`
   33.58 +    action 'Stopping %s: %s...' "$DESC" $NAME
   33.59 +    kill $(cat $PIDFILE)
   33.60      status
   33.61      ;;
   33.62    restart)
   33.63      if ! active_pidfile $PIDFILE dropbear ; then
   33.64 -      echo "$NAME is not running."
   33.65 +      _ '%s is not running.' $NAME
   33.66        exit 1
   33.67      fi
   33.68 -    echo -n "Restarting $DESC: $NAME... "
   33.69 -    kill `cat $PIDFILE`
   33.70 +    action 'Restarting %s: %s...' "$DESC" $NAME
   33.71 +    kill $(cat $PIDFILE)
   33.72      sleep 2
   33.73      $DAEMON $OPTIONS
   33.74      status
   33.75      ;;
   33.76    *)
   33.77 -    echo ""
   33.78 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   33.79 -    echo ""
   33.80 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   33.81 +    newline
   33.82      exit 1
   33.83      ;;
   33.84  esac
    34.1 --- a/fail2ban/stuff/etc/init.d/fail2ban	Wed May 25 23:07:05 2016 +0200
    34.2 +++ b/fail2ban/stuff/etc/init.d/fail2ban	Thu May 26 20:16:45 2016 +0300
    34.3 @@ -1,5 +1,5 @@
    34.4  #!/bin/sh
    34.5 -# /etc/init.d/fail2ban: Start, stop and restart Apache web server on SliTaz, 
    34.6 +# /etc/init.d/fail2ban: Start, stop and restart Apache web server on SliTaz,
    34.7  # at boot time or with the command line. Daemons options are configured
    34.8  # with /etc/daemons.conf
    34.9  #
   34.10 @@ -7,7 +7,7 @@
   34.11  . /etc/daemons.conf
   34.12  
   34.13  NAME=Fail2ban
   34.14 -DESC="Fail2ban Server"
   34.15 +DESC="$(_ '%s server' Fail2ban)"
   34.16  DAEMON=/usr/bin/fail2ban-client
   34.17  OPTIONS=
   34.18  PIDFILE=/var/run/fail2ban/fail2ban.pid
   34.19 @@ -16,43 +16,42 @@
   34.20  case "$1" in
   34.21    start)
   34.22      if active_pidfile $PIDFILE fail2ban-server ; then
   34.23 -      echo "$NAME already running."
   34.24 +      _ '%s is already running.' $NAME
   34.25        exit 1
   34.26      fi
   34.27 -    echo -n "Starting $DESC: $NAME... "
   34.28 +    action 'Starting %s: %s...' "$DESC" $NAME
   34.29      rm -f $SOCKET
   34.30 -    $DAEMON start > /dev/null
   34.31 +    $DAEMON start >/dev/null
   34.32      status
   34.33      ;;
   34.34    stop)
   34.35 -    echo -n "Stopping $DESC: $NAME... "
   34.36 +    action 'Stopping %s: %s...' "$DESC" $NAME
   34.37      $DAEMON stop
   34.38      rm -f $PIDFILE
   34.39      status
   34.40      ;;
   34.41    reload)
   34.42      if ! active_pidfile $PIDFILE fail2ban-server  ; then
   34.43 -      echo "$NAME is not running."
   34.44 +      _ '%s is not running.' $NAME
   34.45        exit 1
   34.46      fi
   34.47 -    echo -n "Stopping $DESC: $NAME... "
   34.48 +    action 'Stopping %s: %s...' "$DESC" $NAME
   34.49      $DAEMON stop
   34.50      status
   34.51      ;;
   34.52    restart)
   34.53      if ! active_pidfile $PIDFILE fail2ban-server ; then
   34.54 -      echo "$NAME is not running."
   34.55 +      _ '%s is not running.' $NAME
   34.56        exit 1
   34.57      fi
   34.58 -    echo -n "Restarting $DESC: $NAME... "
   34.59 +    action 'Restarting %s: %s...' "$DESC" $NAME
   34.60      $0 stop
   34.61      $0 start
   34.62      status
   34.63      ;;
   34.64    *)
   34.65 -    echo ""
   34.66 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|reload|restart]"
   34.67 -    echo ""
   34.68 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart|reload]"
   34.69 +    newline
   34.70      exit 1
   34.71      ;;
   34.72  esac
    35.1 --- a/fcron/receipt	Wed May 25 23:07:05 2016 +0200
    35.2 +++ b/fcron/receipt	Thu May 26 20:16:45 2016 +0300
    35.3 @@ -17,7 +17,6 @@
    35.4  # Rules to configure and make the package.
    35.5  compile_rules()
    35.6  {
    35.7 -	cd $src
    35.8  	./configure \
    35.9  		--prefix=/usr \
   35.10  		--sysconfdir=/etc \
   35.11 @@ -38,11 +37,12 @@
   35.12  # Rules to gen a SliTaz package suitable for Tazpkg.
   35.13  genpkg_rules()
   35.14  {
   35.15 -	mkdir -p $fs/usr/
   35.16 +	mkdir -p $fs/usr/ $fs/etc/init.d
   35.17 +
   35.18  	cp -a $install/usr/bin $fs/usr
   35.19  	cp -a $install/usr/sbin/fcron $fs/usr/bin
   35.20 -	cp -a $install/var $fs/
   35.21 -	cp -a $install/etc $fs/
   35.22 -	
   35.23 +	cp -a $install/var $fs
   35.24 +	cp -a $install/etc $fs
   35.25 +
   35.26  	cp -a stuff/fcron $fs/etc/init.d
   35.27  }
    36.1 --- a/fcron/stuff/fcron	Wed May 25 23:07:05 2016 +0200
    36.2 +++ b/fcron/stuff/fcron	Thu May 26 20:16:45 2016 +0300
    36.3 @@ -1,5 +1,5 @@
    36.4  #!/bin/sh
    36.5 -# /etc/init.d/fcron : Start, stop and fcron on SliTaz, at 
    36.6 +# /etc/init.d/fcron : Start, stop and fcron on SliTaz, at
    36.7  # boot time or with the command line.
    36.8  #
    36.9  # To start SSH server at boot time, just put fcron in the $RUN_DAEMONS
   36.10 @@ -9,7 +9,7 @@
   36.11  . /etc/daemons.conf
   36.12  
   36.13  NAME=fcron
   36.14 -DESC="Cron daemon"
   36.15 +DESC="$(_ '%s daemon' Cron)"
   36.16  DAEMON=/usr/bin/fcron
   36.17  OPTIONS=-b
   36.18  PIDFILE=/var/run/fcron.pid
   36.19 @@ -17,37 +17,36 @@
   36.20  case "$1" in
   36.21    start)
   36.22      if active_pidfile $PIDFILE fcron ; then
   36.23 -      echo "$NAME already running."
   36.24 +      _ '%s is already running.' $NAME
   36.25        exit 1
   36.26      fi
   36.27 -    echo -n "Starting $DESC: $NAME... "
   36.28 +    action 'Starting %s: %s...' "$DESC" $NAME
   36.29      $DAEMON $OPTIONS
   36.30      status
   36.31      ;;
   36.32    stop)
   36.33      if ! active_pidfile $PIDFILE fcron ; then
   36.34 -      echo "$NAME is not running."
   36.35 +      _ '%s is not running.' $NAME
   36.36        exit 1
   36.37      fi
   36.38 -    echo -n "Stopping $DESC: $NAME... "
   36.39 -    kill `cat $PIDFILE`
   36.40 +    action 'Stopping %s: %s...' "$DESC" $NAME
   36.41 +    kill $(cat $PIDFILE)
   36.42      status
   36.43      ;;
   36.44    restart)
   36.45      if ! active_pidfile $PIDFILE fcron ; then
   36.46 -      echo "$NAME is not running."
   36.47 +      _ '%s is not running.' $NAME
   36.48        exit 1
   36.49      fi
   36.50 -    echo -n "Restarting $DESC: $NAME... "
   36.51 -    kill `cat $PIDFILE`
   36.52 +    action 'Restarting %s: %s...' "$DESC" $NAME
   36.53 +    kill $(cat $PIDFILE)
   36.54      sleep 2
   36.55      $DAEMON $OPTIONS
   36.56      status
   36.57      ;;
   36.58    *)
   36.59 -    echo ""
   36.60 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   36.61 -    echo ""
   36.62 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   36.63 +    newline
   36.64      exit 1
   36.65      ;;
   36.66  esac
    37.1 --- a/git/stuff/git-daemon	Wed May 25 23:07:05 2016 +0200
    37.2 +++ b/git/stuff/git-daemon	Thu May 26 20:16:45 2016 +0300
    37.3 @@ -9,7 +9,7 @@
    37.4  . /etc/daemons.conf
    37.5  
    37.6  NAME=git-daemon
    37.7 -DESC="git-daemon daemon"
    37.8 +DESC="$(_ '%s daemon' Git)"
    37.9  DAEMON=/usr/lib/git-core/git-daemon
   37.10  OPTIONS=$GIT_OPTIONS
   37.11  PIDFILE=/var/run/git-daemon.pid
   37.12 @@ -17,37 +17,36 @@
   37.13  case "$1" in
   37.14    start)
   37.15      if active_pidfile $PIDFILE git-daemon ; then
   37.16 -      echo "$NAME already running."
   37.17 +      _ '%s is already running.' $NAME
   37.18        exit 1
   37.19      fi
   37.20 -    echo -n "Starting $DESC: $NAME... "
   37.21 +    action 'Starting %s: %s...' "$DESC" $NAME
   37.22      $DAEMON --pid-file=$PIDFILE $OPTIONS
   37.23      status
   37.24      ;;
   37.25    stop)
   37.26      if ! active_pidfile $PIDFILE git-daemon ; then
   37.27 -      echo "$NAME is not running."
   37.28 +      _ '%s is not running.' $NAME
   37.29        exit 1
   37.30      fi
   37.31 -    echo -n "Stopping $DESC: $NAME... "
   37.32 -    kill `cat $PIDFILE`
   37.33 +    action 'Stopping %s: %s...' "$DESC" $NAME
   37.34 +    kill $(cat $PIDFILE)
   37.35      status
   37.36      ;;
   37.37    restart)
   37.38      if ! active_pidfile $PIDFILE git-daemon ; then
   37.39 -      echo "$NAME is not running."
   37.40 +      _ '%s is not running.' $NAME
   37.41        exit 1
   37.42      fi
   37.43 -    echo -n "Restarting $DESC: $NAME... "
   37.44 -    kill `cat $PIDFILE`
   37.45 +    action 'Restarting %s: %s...' "$DESC" $NAME
   37.46 +    kill $(cat $PIDFILE)
   37.47      sleep 2
   37.48      $DAEMON $OPTIONS
   37.49      status
   37.50      ;;
   37.51    *)
   37.52 -    echo ""
   37.53 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   37.54 -    echo ""
   37.55 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   37.56 +    newline
   37.57      exit 1
   37.58      ;;
   37.59  esac
    38.1 --- a/gpm/stuff/etc/init.d/gpm	Wed May 25 23:07:05 2016 +0200
    38.2 +++ b/gpm/stuff/etc/init.d/gpm	Thu May 26 20:16:45 2016 +0300
    38.3 @@ -1,5 +1,5 @@
    38.4  #!/bin/sh
    38.5 -# /etc/init.d/gpm : Start, stop and restart gpm server on SliTaz, at 
    38.6 +# /etc/init.d/gpm : Start, stop and restart gpm server on SliTaz, at
    38.7  # boot time or with the command line.
    38.8  #
    38.9  # To start gpm server at boot time, just put mysql in the $RUN_DAEMONS
   38.10 @@ -9,7 +9,7 @@
   38.11  . /etc/daemons.conf
   38.12  
   38.13  NAME=gpm
   38.14 -DESC="gpm server"
   38.15 +DESC="$(_ '%s server' GPM)"
   38.16  DAEMON=/usr/sbin/gpm
   38.17  OPTIONS=$GPM_OPTIONS
   38.18  [ -n "$OPTIONS" ] || OPTIONS="-m /dev/psaux -t ps2"
   38.19 @@ -17,34 +17,36 @@
   38.20  case "$1" in
   38.21    start)
   38.22      if active_pidfile $PIDFILE gpm ; then
   38.23 -      echo "$NAME already running."
   38.24 +      _ '%s is already running.' $NAME
   38.25        exit 1
   38.26      fi
   38.27 +    action 'Starting %s: %s...' "$DESC" $NAME
   38.28      $DAEMON $OPTIONS
   38.29      status
   38.30      ;;
   38.31    stop)
   38.32      if ! active_pidfile $PIDFILE gpm ; then
   38.33 -      echo "$NAME is not running."
   38.34 +      _ '%s is not running.' $NAME
   38.35        exit 1
   38.36      fi
   38.37 +    action 'Stopping %s: %s...' "$DESC" $NAME
   38.38      $DAEMON -k
   38.39      status
   38.40      ;;
   38.41    restart)
   38.42      if ! active_pidfile $PIDFILE gpm ; then
   38.43 -      echo "$NAME is not running."
   38.44 +      _ '%s is not running.' $NAME
   38.45        exit 1
   38.46      fi
   38.47 +    action 'Restarting %s: %s...' "$DESC" $NAME
   38.48      $DAEMON -k
   38.49      status
   38.50      $DAEMON $OPTIONS
   38.51      status
   38.52      ;;
   38.53    *)
   38.54 -    echo ""
   38.55 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   38.56 -    echo ""
   38.57 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   38.58 +    newline
   38.59      exit 1
   38.60      ;;
   38.61  esac
    39.1 --- a/hal/stuff/etc/init.d/hald	Wed May 25 23:07:05 2016 +0200
    39.2 +++ b/hal/stuff/etc/init.d/hald	Thu May 26 20:16:45 2016 +0300
    39.3 @@ -7,7 +7,7 @@
    39.4  . /etc/daemons.conf
    39.5  
    39.6  NAME=HAL
    39.7 -DESC="Hardware Abstraction Layer"
    39.8 +DESC="$(_ 'Hardware Abstraction Layer')"
    39.9  DAEMON=/usr/sbin/hald
   39.10  OPTIONS=$HALD_OPTIONS
   39.11  PIDFILE=/run/hald/pid
   39.12 @@ -15,37 +15,36 @@
   39.13  case "$1" in
   39.14  	start)
   39.15  		if active_pidfile $PIDFILE hald ; then
   39.16 -			echo "$NAME already running."
   39.17 +			_ '%s is already running.' $NAME
   39.18  			exit 1
   39.19  		fi
   39.20 -		echo -n "Starting $DESC: $NAME... "
   39.21 +		action 'Starting %s: %s...' "$DESC" $NAME
   39.22  		mkdir -p $(dirname $PIDFILE)
   39.23  		$DAEMON $OPTIONS
   39.24  		status ;;
   39.25  	stop)
   39.26  		if ! active_pidfile $PIDFILE hald ; then
   39.27 -			echo "$NAME is not running."
   39.28 +			_ '%s is not running.' $NAME
   39.29  			exit 1
   39.30  		fi
   39.31 -		echo -n "Stopping $DESC: $NAME... "
   39.32 +		action 'Stopping %s: %s...' "$DESC" $NAME
   39.33  		kill $(cat $PIDFILE)
   39.34  		rm $PIDFILE
   39.35  		status ;;
   39.36  	restart)
   39.37  		if ! active_pidfile $PIDFILE hald ; then
   39.38 -			echo "$NAME is not running."
   39.39 +			_ '%s is not running.' $NAME
   39.40  			exit 1
   39.41  		fi
   39.42 -		echo -n "Restarting $DESC: $NAME... "
   39.43 +		action 'Restarting %s: %s...' "$DESC" $NAME
   39.44  		kill $(cat $PIDFILE)
   39.45  		rm $PIDFILE
   39.46  		sleep 2
   39.47  		$DAEMON $OPTIONS
   39.48  		status ;;
   39.49  	*)
   39.50 -		echo ""
   39.51 -		echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   39.52 -		echo ""
   39.53 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   39.54 +		newline
   39.55  		exit 1 ;;
   39.56  esac
   39.57  
    40.1 --- a/hostapd/stuff/hostapd	Wed May 25 23:07:05 2016 +0200
    40.2 +++ b/hostapd/stuff/hostapd	Thu May 26 20:16:45 2016 +0300
    40.3 @@ -7,7 +7,7 @@
    40.4  . /etc/daemons.conf
    40.5  
    40.6  NAME=hostapd
    40.7 -DESC="daemon for wireless software access points"
    40.8 +DESC="$(_ 'daemon for wireless software access points')"
    40.9  DAEMON=/usr/bin/hostapd
   40.10  PIDFILE=/var/run/hostapd.pid
   40.11  OPTIONS="-B -P $PIDFILE /etc/hostapd/hostapd.conf"
   40.12 @@ -15,39 +15,38 @@
   40.13  case "$1" in
   40.14    start)
   40.15      if active_pidfile $PIDFILE hostapd ; then
   40.16 -      echo "$NAME already running."
   40.17 +      _ '%s is already running.' $NAME
   40.18        exit 1
   40.19      fi
   40.20 -    echo -n "Starting $DESC: $NAME... "
   40.21 +    action 'Starting %s: %s...' "$DESC" $NAME
   40.22      $DAEMON $OPTIONS
   40.23      status
   40.24      ;;
   40.25    stop)
   40.26      if ! active_pidfile $PIDFILE hostapd ; then
   40.27 -      echo "$NAME is not running."
   40.28 +      _ '%s is not running.' $NAME
   40.29        exit 1
   40.30      fi
   40.31 -    echo -n "Stopping $DESC: $NAME... "
   40.32 -    kill `cat $PIDFILE`
   40.33 +    action 'Stopping %s: %s...' "$DESC" $NAME
   40.34 +    kill $(cat $PIDFILE)
   40.35      status
   40.36      ;;
   40.37    restart)
   40.38      if ! active_pidfile $PIDFILE hostapd ; then
   40.39 -      echo "$NAME is not running."
   40.40 +      _ '%s is not running.' $NAME
   40.41        exit 1
   40.42      fi
   40.43 -    echo -n "Restarting $DESC: $NAME... "
   40.44 -    kill `cat $PIDFILE`
   40.45 +    action 'Restarting %s: %s...' "$DESC" $NAME
   40.46 +    kill $(cat $PIDFILE)
   40.47      sleep 2
   40.48      $DAEMON $OPTIONS
   40.49      status
   40.50      ;;
   40.51    *)
   40.52 -    echo ""
   40.53 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   40.54 -    echo ""
   40.55 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   40.56 +    newline
   40.57      exit 1
   40.58      ;;
   40.59  esac
   40.60  
   40.61 -exit 0
   40.62 \ No newline at end of file
   40.63 +exit 0
    41.1 --- a/knock/stuff/etc/init.d/knock	Wed May 25 23:07:05 2016 +0200
    41.2 +++ b/knock/stuff/etc/init.d/knock	Thu May 26 20:16:45 2016 +0300
    41.3 @@ -1,5 +1,5 @@
    41.4  #!/bin/sh
    41.5 -# /etc/init.d/knock : Start, stop and restart knockd server on SliTaz, at 
    41.6 +# /etc/init.d/knock : Start, stop and restart knockd server on SliTaz, at
    41.7  # boot time or with the command line.
    41.8  #
    41.9  # To start Knock server at boot time, just put knock in the $RUN_DAEMONS
   41.10 @@ -9,7 +9,7 @@
   41.11  . /etc/daemons.conf
   41.12  
   41.13  NAME=Knock
   41.14 -DESC="Knock server"
   41.15 +DESC="$(_ '%s server' knock)"
   41.16  DAEMON=/usr/sbin/knockd
   41.17  OPTIONS=$KNOCK_OPTIONS
   41.18  PIDFILE=/var/run/knockd.pid
   41.19 @@ -19,37 +19,36 @@
   41.20  case "$1" in
   41.21    start)
   41.22      if active_pidfile $PIDFILE knockd ; then
   41.23 -      echo "$NAME already running."
   41.24 +      _ '%s is already running.' $NAME
   41.25        exit 1
   41.26      fi
   41.27 -    echo -n "Starting $DESC: $NAME... "
   41.28 +    action 'Starting %s: %s...' "$DESC" $NAME
   41.29      $DAEMON $OPTIONS
   41.30      status
   41.31      ;;
   41.32    stop)
   41.33      if ! active_pidfile $PIDFILE knockd ; then
   41.34 -      echo "$NAME is not running."
   41.35 +      _ '%s is not running.' $NAME
   41.36        exit 1
   41.37      fi
   41.38 -    echo -n "Stopping $DESC: $NAME... "
   41.39 -    kill `cat $PIDFILE`
   41.40 +    action 'Stopping %s: %s...' "$DESC" $NAME
   41.41 +    kill $(cat $PIDFILE)
   41.42      status
   41.43      ;;
   41.44    restart)
   41.45      if ! active_pidfile $PIDFILE knockd ; then
   41.46 -      echo "$NAME is not running."
   41.47 +      _ '%s is not running.' $NAME
   41.48        exit 1
   41.49      fi
   41.50 -    echo -n "Restarting $DESC: $NAME... "
   41.51 -    kill `cat $PIDFILE`
   41.52 +    action 'Restarting %s: %s...' "$DESC" $NAME
   41.53 +    kill $(cat $PIDFILE)
   41.54      sleep 2
   41.55      $DAEMON $OPTIONS
   41.56      status
   41.57      ;;
   41.58    *)
   41.59 -    echo ""
   41.60 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   41.61 -    echo ""
   41.62 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   41.63 +    newline
   41.64      exit 1
   41.65      ;;
   41.66  esac
    42.1 --- a/lighttpd/stuff/applications/lighttpd-status.desktop	Wed May 25 23:07:05 2016 +0200
    42.2 +++ b/lighttpd/stuff/applications/lighttpd-status.desktop	Thu May 26 20:16:45 2016 +0300
    42.3 @@ -1,10 +1,10 @@
    42.4  [Desktop Entry]
    42.5 -Encoding=UTF-8
    42.6 +Type=Application
    42.7  Name=LightTPD server status
    42.8  Name[fr]=Status du serveur LightTPD
    42.9  Name[pt]=Status do servidor LightTPD
   42.10  Name[pt_BR]=Status do servidor LightTPD
   42.11 +Name[ru]=Состояние сервера LightTPD
   42.12  Exec=browser http://localhost/server-status
   42.13 -Icon=text-html
   42.14 -Type=Application
   42.15 -Categories=System;
   42.16 +Icon=network-server
   42.17 +Categories=System;Monitor;
    43.1 --- a/lighttpd/stuff/etc/init.d/lighttpd	Wed May 25 23:07:05 2016 +0200
    43.2 +++ b/lighttpd/stuff/etc/init.d/lighttpd	Thu May 26 20:16:45 2016 +0300
    43.3 @@ -1,5 +1,5 @@
    43.4  #!/bin/sh
    43.5 -# /etc/init.d/lighttpd: Start, stop and restart web server on SliTaz, 
    43.6 +# /etc/init.d/lighttpd: Start, stop and restart web server on SliTaz,
    43.7  # at boot time or with the command line. Daemons options are configured
    43.8  # with /etc/daemons.conf
    43.9  #
   43.10 @@ -7,7 +7,7 @@
   43.11  . /etc/daemons.conf
   43.12  
   43.13  NAME=LightTPD
   43.14 -DESC="web server"
   43.15 +DESC="$(_ 'web server')"
   43.16  DAEMON=/usr/sbin/lighttpd
   43.17  OPTIONS=$LIGHTTPD_OPTIONS
   43.18  PIDFILE=/var/run/lighttpd.pid
   43.19 @@ -15,39 +15,38 @@
   43.20  case "$1" in
   43.21    start)
   43.22      if active_pidfile $PIDFILE lighttpd ; then
   43.23 -      echo "$NAME already running."
   43.24 +      _ '%s is already running.' $NAME
   43.25        exit 1
   43.26      fi
   43.27 -    echo -n "Starting $DESC: $NAME... "
   43.28 -    $DAEMON $OPTIONS 
   43.29 +    action 'Starting %s: %s...' "$DESC" $NAME
   43.30 +    $DAEMON $OPTIONS
   43.31      status
   43.32      ;;
   43.33    stop)
   43.34      if ! active_pidfile $PIDFILE lighttpd ; then
   43.35 -      echo "$NAME is not running."
   43.36 +      _ '%s is not running.' $NAME
   43.37        exit 1
   43.38      fi
   43.39 -    echo -n "Stopping $DESC: $NAME... "
   43.40 -    kill `cat $PIDFILE`
   43.41 +    action 'Stopping %s: %s...' "$DESC" $NAME
   43.42 +    kill $(cat $PIDFILE)
   43.43      rm $PIDFILE
   43.44      status
   43.45      ;;
   43.46    restart)
   43.47      if ! active_pidfile $PIDFILE lighttpd ; then
   43.48 -      echo "$NAME is not running."
   43.49 +      _ '%s is not running.' $NAME
   43.50        exit 1
   43.51      fi
   43.52 -    echo -n "Restarting $DESC: $NAME... "
   43.53 -    kill `cat $PIDFILE`
   43.54 +    action 'Restarting %s: %s...' "$DESC" $NAME
   43.55 +    kill $(cat $PIDFILE)
   43.56      rm $PIDFILE
   43.57      sleep 2
   43.58      $DAEMON $OPTIONS
   43.59      status
   43.60      ;;
   43.61    *)
   43.62 -    echo ""
   43.63 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   43.64 -    echo ""
   43.65 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   43.66 +    newline
   43.67      exit 1
   43.68      ;;
   43.69  esac
    44.1 --- a/linux-zram/stuff/compcache	Wed May 25 23:07:05 2016 +0200
    44.2 +++ b/linux-zram/stuff/compcache	Thu May 26 20:16:45 2016 +0300
    44.3 @@ -7,39 +7,39 @@
    44.4  source /etc/compcache.conf
    44.5  
    44.6  NAME="compcache"
    44.7 -EXIST=`cat /proc/swaps | grep zram0`
    44.8 +DESC="$(_ '%s daemon' compcache)"
    44.9 +EXIST=$(cat /proc/swaps | grep zram0)
   44.10  
   44.11  case "$1" in
   44.12    start)
   44.13 -    if [ ! "$EXIST" = "" ] ; then
   44.14 -      echo "$NAME already running."
   44.15 +    if [ -n "$EXIST" ] ; then
   44.16 +      _ '%s is already running.' $NAME
   44.17        exit 1
   44.18      fi
   44.19 -    echo -n "Loading module"
   44.20 +    action 'Loading module...'
   44.21      modprobe zram zram_num_devices=1 &&
   44.22      [ -n "$SIZE_KB" ] && echo $(($SIZE_KB * 1024)) > /sys/block/zram0/disksize
   44.23      status
   44.24  
   44.25 -    echo -n "Starting $NAME..."
   44.26 +    action 'Starting %s: %s...' "$DESC" $NAME
   44.27      mkswap /dev/zram0 && swapon /dev/zram0 -p 100
   44.28      status
   44.29      ;;
   44.30    stop)
   44.31 -    if [ "$EXIST" = "" ] ; then
   44.32 -      echo "$NAME is not running."
   44.33 +    if [ -z "$EXIST" ] ; then
   44.34 +      _ '%s is not running.' $NAME
   44.35        exit 1
   44.36      fi
   44.37 -    echo -n "Stopping $NAME... "
   44.38 +    action 'Stopping %s: %s...' "$DESC" $NAME
   44.39      swapoff /dev/zram0 && echo 1 > /sys/block/zram0/reset
   44.40      status
   44.41 -    echo -n "Unloading module"
   44.42 +    action 'Unloading module...'
   44.43      rmmod zram
   44.44      status
   44.45      ;;
   44.46    *)
   44.47 -    echo ""
   44.48 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop]"
   44.49 -    echo ""
   44.50 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop]"
   44.51 +    newline
   44.52      exit 1
   44.53      ;;
   44.54  esac
    45.1 --- a/linux64-zram/stuff/compcache	Wed May 25 23:07:05 2016 +0200
    45.2 +++ b/linux64-zram/stuff/compcache	Thu May 26 20:16:45 2016 +0300
    45.3 @@ -7,39 +7,39 @@
    45.4  source /etc/compcache.conf
    45.5  
    45.6  NAME="compcache"
    45.7 -EXIST=`cat /proc/swaps | grep zram0`
    45.8 +DESC="$(_ '%s daemon' compcache)"
    45.9 +EXIST=$(cat /proc/swaps | grep zram0)
   45.10  
   45.11  case "$1" in
   45.12    start)
   45.13 -    if [ ! "$EXIST" = "" ] ; then
   45.14 -      echo "$NAME already running."
   45.15 +    if [ -n "$EXIST" ] ; then
   45.16 +      _ '%s is already running.' $NAME
   45.17        exit 1
   45.18      fi
   45.19 -    echo -n "Loading module"
   45.20 +    action 'Loading module...'
   45.21      modprobe zram zram_num_devices=1 &&
   45.22      [ -n "$SIZE_KB" ] && echo $(($SIZE_KB * 1024)) > /sys/block/zram0/disksize
   45.23      status
   45.24  
   45.25 -    echo -n "Starting $NAME..."
   45.26 +    action 'Starting %s: %s...' "$DESC" $NAME
   45.27      mkswap /dev/zram0 && swapon /dev/zram0 -p 100
   45.28      status
   45.29      ;;
   45.30    stop)
   45.31 -    if [ "$EXIST" = "" ] ; then
   45.32 -      echo "$NAME is not running."
   45.33 +    if [ -z "$EXIST" ] ; then
   45.34 +      _ '%s is not running.' $NAME
   45.35        exit 1
   45.36      fi
   45.37 -    echo -n "Stopping $NAME... "
   45.38 +    action 'Stopping %s: %s...' "$DESC" $NAME
   45.39      swapoff /dev/zram0 && echo 1 > /sys/block/zram0/reset
   45.40      status
   45.41 -    echo -n "Unloading module"
   45.42 +    action 'Unloading module...'
   45.43      rmmod zram
   45.44      status
   45.45      ;;
   45.46    *)
   45.47 -    echo ""
   45.48 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop]"
   45.49 -    echo ""
   45.50 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop]"
   45.51 +    newline
   45.52      exit 1
   45.53      ;;
   45.54  esac
    46.1 --- a/lxdm/stuff/init.d/lxdm	Wed May 25 23:07:05 2016 +0200
    46.2 +++ b/lxdm/stuff/init.d/lxdm	Thu May 26 20:16:45 2016 +0300
    46.3 @@ -8,43 +8,43 @@
    46.4  . /etc/init.d/rc.functions
    46.5  
    46.6  NAME=LXDM
    46.7 -DESC="LXDE login manager"
    46.8 +DESC="$(_ 'LXDE login manager')"
    46.9  DAEMON=/usr/sbin/lxdm
   46.10  PIDFILE=/var/run/lxdm.pid
   46.11  
   46.12  case "$1" in
   46.13  	start)
   46.14  		if active_pidfile $PIDFILE lxdm ; then
   46.15 -			echo "$NAME already running."
   46.16 +			_ '%s is already running.' $NAME
   46.17  			exit 1
   46.18  		fi
   46.19 -		echo -n "Starting $DESC: $NAME... "
   46.20 +		action 'Starting %s: %s...' "$DESC" $NAME
   46.21  		$DAEMON $OPTION
   46.22  		status ;;
   46.23  	stop)
   46.24  		if ! active_pidfile $PIDFILE lxdm ; then
   46.25 -			echo "$NAME is not running."
   46.26 +			_ '%s is not running.' $NAME
   46.27  			exit 1
   46.28  		fi
   46.29 -		echo -n "Stopping $DESC: $NAME... "
   46.30 +		action 'Stopping %s: %s...' "$DESC" $NAME
   46.31  		killall lxdm
   46.32  		rm $PIDFILE
   46.33  		status ;;
   46.34  	restart)
   46.35  		if ! active_pidfile $PIDFILE lxdm ; then
   46.36 -			echo "$NAME is not running."
   46.37 +			_ '%s is not running.'
   46.38  			exit 1
   46.39  		fi
   46.40 -		echo -n "Restarting $DESC: $NAME... "
   46.41 +		action 'Restarting %s: %s...' "$DESC" $NAME
   46.42  		killall lxdm
   46.43  		rm $PIDFILE
   46.44  		sleep 2
   46.45  		$DAEMON $OPTION
   46.46  		status ;;
   46.47  	*)
   46.48 -		echo ""
   46.49 -		echo -e "\033[1mUsage:\033[0m /etc/init.d/$(basename $0) [start|stop|restart]"
   46.50 -		echo "" && exit 1 ;;
   46.51 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   46.52 +		newline
   46.53 +		exit 1 ;;
   46.54  esac
   46.55  
   46.56  exit 0
    47.1 --- a/lxnetdaemon/stuff/etc/init.d/lxnetdaemon	Wed May 25 23:07:05 2016 +0200
    47.2 +++ b/lxnetdaemon/stuff/etc/init.d/lxnetdaemon	Thu May 26 20:16:45 2016 +0300
    47.3 @@ -1,5 +1,5 @@
    47.4  #!/bin/sh
    47.5 -# /etc/init.d/lxnetdaemon: Start, stop and restart LXnetdaemon deamon on 
    47.6 +# /etc/init.d/lxnetdaemon: Start, stop and restart LXnetdaemon deamon on
    47.7  # SliTaz, at boot time or with the command line.
    47.8  #
    47.9  # To start daemon at boot time, just put the right name in the $RUN_DAEMONS
   47.10 @@ -9,38 +9,38 @@
   47.11  . /etc/daemons.conf
   47.12  
   47.13  NAME=LXnetdaemon
   47.14 -DESC="Network daemon"
   47.15 +DESC="$(_ 'Network daemon')"
   47.16  DAEMON=/usr/bin/lxnetdaemon
   47.17  PIDFILE=/var/run/lxnetdaemon.pid
   47.18  
   47.19  case "$1" in
   47.20    start)
   47.21      if active_pidfile $PIDFILE lxnetdaemon ; then
   47.22 -      echo "$NAME already running."
   47.23 +      _ '%s is already running.' $NAME
   47.24        exit 1
   47.25      fi
   47.26 -    echo -n "Starting $DESC: $NAME... "
   47.27 -    $DAEMON $OPTIONS 
   47.28 +    action 'Starting %s: %s...' "$DESC" $NAME
   47.29 +    $DAEMON $OPTIONS
   47.30      status
   47.31      pidof lxnetdaemon > $PIDFILE
   47.32      ;;
   47.33    stop)
   47.34      if ! active_pidfile $PIDFILE lxnetdaemon ; then
   47.35 -      echo "$NAME is not running."
   47.36 +      _ '%s is not running.' $NAME
   47.37        exit 1
   47.38      fi
   47.39 -    echo -n "Stopping $DESC: $NAME... "
   47.40 -    kill `cat $PIDFILE`
   47.41 +    action 'Stopping %s: %s...' "$DESC" $NAME
   47.42 +    kill $(cat $PIDFILE)
   47.43      rm $PIDFILE
   47.44      status
   47.45      ;;
   47.46    restart)
   47.47      if ! active_pidfile $PIDFILE lxnetdaemon ; then
   47.48 -      echo "$NAME is not running."
   47.49 +      _ '%s is not running.' $NAME
   47.50        exit 1
   47.51      fi
   47.52 -    echo -n "Restarting $DESC: $NAME... "
   47.53 -    kill `cat $PIDFILE`
   47.54 +    action 'Restarting %s: %s...' "$DESC" $NAME
   47.55 +    kill $(cat $PIDFILE)
   47.56      rm $PIDFILE
   47.57      sleep 2
   47.58      $DAEMON $OPTIONS
   47.59 @@ -48,9 +48,8 @@
   47.60      pidof lxnetdaemon > $PIDFILE
   47.61      ;;
   47.62    *)
   47.63 -    echo ""
   47.64 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   47.65 -    echo ""
   47.66 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   47.67 +    newline
   47.68      exit 1
   47.69      ;;
   47.70  esac
    48.1 --- a/mariadb/stuff/etc/init.d/mysql	Wed May 25 23:07:05 2016 +0200
    48.2 +++ b/mariadb/stuff/etc/init.d/mysql	Thu May 26 20:16:45 2016 +0300
    48.3 @@ -1,5 +1,5 @@
    48.4  #!/bin/sh
    48.5 -# /etc/init.d/mysql : Start, stop and restart MySQL server on SliTaz, at 
    48.6 +# /etc/init.d/mysql : Start, stop and restart MySQL server on SliTaz, at
    48.7  # boot time or with the command line.
    48.8  #
    48.9  # To start MySQL server at boot time, just put mysql in the $RUN_DAEMONS
   48.10 @@ -9,7 +9,7 @@
   48.11  . /etc/daemons.conf
   48.12  
   48.13  NAME=Mysql
   48.14 -DESC="MySQL server"
   48.15 +DESC="$(_ '%s server' MySQL)"
   48.16  DAEMON=/usr/bin/mysqld_safe
   48.17  OPTIONS=$MYSQL_OPTIONS
   48.18  PIDFILE=/var/run/mysqld/mysql.pid
   48.19 @@ -22,51 +22,51 @@
   48.20  case "$1" in
   48.21    start)
   48.22      if active_pidfile $PIDFILE mysqld ; then
   48.23 -      echo "$NAME already running."
   48.24 +      _ '%s is already running.' $NAME
   48.25        exit 1
   48.26      fi
   48.27      if [ ! -d /var/lib/mysql/mysql ]; then
   48.28 -      echo "Initializing $DESC: "
   48.29 -      rm -rf /var/lib/mysql/* 2> /dev/null
   48.30 +      action 'Initializing %s...' "$DESC"
   48.31 +      rm -rf /var/lib/mysql/* 2>/dev/null
   48.32        mysql_install_db --user=mysql --datadir=/var/lib/mysql
   48.33 +      status
   48.34      fi
   48.35 -    echo -n "Starting $DESC: $NAME... "
   48.36 -    $DAEMON $OPTIONS  > /dev/null &
   48.37 +    action 'Starting %s: %s...' "$DESC" $NAME
   48.38 +    $DAEMON $OPTIONS  >/dev/null &
   48.39      status
   48.40      sleep 2
   48.41      for i in /etc/mysql.d/* ; do
   48.42 -    	[ -x $i ] || continue
   48.43 -	echo -n "Running $i..."
   48.44 -	$i
   48.45 -	status
   48.46 +      [ -x $i ] || continue
   48.47 +      action 'Running %s...' $i
   48.48 +      $i
   48.49 +      status
   48.50      done
   48.51      ;;
   48.52    stop)
   48.53      if ! active_pidfile $PIDFILE mysqld ; then
   48.54 -      echo "$NAME is not running."
   48.55 +      _ '%s is not running.' $NAME
   48.56        exit 1
   48.57      fi
   48.58 -    echo -n "Stopping $DESC: $NAME... "
   48.59 -    kill `cat $PIDFILE`> /dev/null
   48.60 +    action 'Stopping %s: %s...' "$DESC" $NAME
   48.61 +    kill $(cat $PIDFILE) >/dev/null
   48.62      status
   48.63      sleep 2
   48.64      ;;
   48.65    restart)
   48.66      if ! active_pidfile $PIDFILE mysqld ; then
   48.67 -      echo "$NAME is not running."
   48.68 +      _ '%s is not running.' $NAME
   48.69        exit 1
   48.70      fi
   48.71 -    echo -n "Restarting $DESC: $NAME... "
   48.72 -    kill `cat $PIDFILE`
   48.73 +    action 'Restarting %s: %s...' "$DESC" $NAME
   48.74 +    kill $(cat $PIDFILE)
   48.75      sleep 2
   48.76      $DAEMON $OPTIONS &
   48.77      status
   48.78      sleep 2
   48.79      ;;
   48.80    *)
   48.81 -    echo ""
   48.82 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   48.83 -    echo ""
   48.84 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   48.85 +    newline
   48.86      exit 1
   48.87      ;;
   48.88  esac
    49.1 --- a/motion/stuff/init.d/motion	Wed May 25 23:07:05 2016 +0200
    49.2 +++ b/motion/stuff/init.d/motion	Thu May 26 20:16:45 2016 +0300
    49.3 @@ -6,42 +6,46 @@
    49.4  . /etc/init.d/rc.functions
    49.5  
    49.6  NAME=Motion
    49.7 -DESC="Video detection"
    49.8 +DESC="$(_ 'Video detection daemon')"
    49.9  DAEMON=/usr/bin/motion
   49.10  PIDFILE=/run/motion/motion.pid
   49.11  
   49.12  case "$1" in
   49.13  	start)
   49.14  		if active_pidfile $PIDFILE motion ; then
   49.15 -			echo "$NAME already running."
   49.16 +			_ '%s is already running.' $NAME
   49.17  			exit 1
   49.18  		fi
   49.19 -		echo "Starting $DESC: $NAME... "
   49.20 +		action 'Starting %s: %s...' "$DESC" $NAME
   49.21  		mkdir -p $(dirname $PIDFILE)
   49.22 -		$DAEMON -p $PIDFILE ;;
   49.23 +		$DAEMON -p $PIDFILE
   49.24 +		status
   49.25 +		;;
   49.26  	stop)
   49.27  		if ! active_pidfile $PIDFILE motion ; then
   49.28 -			echo "$NAME is not running."
   49.29 +			_ '%s is not running.' $NAME
   49.30  			exit 1
   49.31  		fi
   49.32 -		echo -n "Stopping $DESC: $NAME... "
   49.33 +		action 'Stopping %s: %s...' "$DESC" $NAME
   49.34  		kill $(cat $PIDFILE)
   49.35  		rm $PIDFILE
   49.36 -		status ;;
   49.37 +		status
   49.38 +		;;
   49.39  	restart)
   49.40  		if ! active_pidfile $PIDFILE motion ; then
   49.41  			echo "$NAME is not running."
   49.42  			exit 1
   49.43  		fi
   49.44 -		echo "Restarting $DESC: $NAME... "
   49.45 +		_ 'Restarting %s: %s...' "$DESC" $NAME
   49.46  		kill $(cat $PIDFILE)
   49.47  		rm $PIDFILE
   49.48  		sleep 2
   49.49 -		$DAEMON -p $PIDFILE ;;
   49.50 +		$DAEMON -p $PIDFILE
   49.51 +		status
   49.52 +		;;
   49.53  	*)
   49.54 -		echo ""
   49.55 -		echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   49.56 -		echo ""
   49.57 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   49.58 +		newline
   49.59  		exit 1 ;;
   49.60  esac
   49.61  
    50.1 --- a/mpd/stuff/etc/init.d/mpd	Wed May 25 23:07:05 2016 +0200
    50.2 +++ b/mpd/stuff/etc/init.d/mpd	Thu May 26 20:16:45 2016 +0300
    50.3 @@ -8,48 +8,47 @@
    50.4  . /etc/init.d/rc.functions
    50.5  
    50.6  NAME=mpd
    50.7 -DESC="Music Player Daemon"
    50.8 +DESC="$(_ 'Music Player Daemon')"
    50.9  DAEMON=/usr/sbin/mpd
   50.10  OPTION="/etc/mpd.conf"
   50.11  PIDFILE="/var/run/mpd.pid"
   50.12  
   50.13  case "$1" in
   50.14 -start)
   50.15 -	if active_pidfile $PIDFILE mpd ; then
   50.16 -		echo "$NAME already running."
   50.17 +	start)
   50.18 +		if active_pidfile $PIDFILE mpd ; then
   50.19 +			_ '%s is already running.' $NAME
   50.20 +			exit 1
   50.21 +		fi
   50.22 +		action 'Starting %s: %s...' "$DESC" $NAME
   50.23 +		$DAEMON $OPTION 2>/dev/null
   50.24 +		status
   50.25 +		pidof $NAME > $PIDFILE
   50.26 +		;;
   50.27 +	stop)
   50.28 +		if ! active_pidfile $PIDFILE mpd ; then
   50.29 +			_ '%s is not running.' $NAME
   50.30 +			exit 1
   50.31 +		fi
   50.32 +		action 'Stopping %s: %s...' "$DESC" $NAME
   50.33 +		kill $(pidof $NAME)
   50.34 +		status
   50.35 +		;;
   50.36 +	restart)
   50.37 +		if ! active_pidfile $PIDFILE mpd ; then
   50.38 +			_ '%s is not running.' $NAME
   50.39 +			exit 1
   50.40 +		fi
   50.41 +		action 'Restarting %s: %s...' "$DESC" $NAME
   50.42 +		kill $(pidof $NAME)
   50.43 +		sleep 2
   50.44 +		$DAEMON $OPTION 2>/dev/null
   50.45 +		status
   50.46 +		;;
   50.47 +	*)
   50.48 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   50.49 +		newline
   50.50  		exit 1
   50.51 -	fi
   50.52 -	echo -n "Starting $DESC: $NAME... "
   50.53 -	$DAEMON $OPTION 2> /dev/null
   50.54 -	status
   50.55 -	pidof $NAME > $PIDFILE
   50.56 -	;;
   50.57 -stop)
   50.58 -	if ! active_pidfile $PIDFILE mpd ; then
   50.59 -		echo "$NAME is not running."
   50.60 -		exit 1
   50.61 -	fi
   50.62 -	echo -n "Stopping $DESC: $NAME... "
   50.63 -	kill $(pidof $NAME)
   50.64 -	status
   50.65 -	;;
   50.66 -restart)
   50.67 -	if ! active_pidfile $PIDFILE mpd ; then
   50.68 -		echo "$NAME is not running."
   50.69 -		exit 1
   50.70 -	fi
   50.71 -	echo -n "Restarting $DESC: $NAME... "
   50.72 -	kill $(pidof $NAME)
   50.73 -	sleep 2
   50.74 -	$DAEMON $OPTION 2> /dev/null
   50.75 -	status
   50.76 -	;;
   50.77 -*)
   50.78 -	echo ""
   50.79 -	echo -e "\033[1mUsage:\033[0m /etc/init.d/$(basename $0) [start|stop|restart]"
   50.80 -	echo ""
   50.81 -	exit 1
   50.82 -	;;
   50.83 +		;;
   50.84  esac
   50.85  
   50.86  exit 0
    51.1 --- a/mysql/stuff/etc/init.d/mysql	Wed May 25 23:07:05 2016 +0200
    51.2 +++ b/mysql/stuff/etc/init.d/mysql	Thu May 26 20:16:45 2016 +0300
    51.3 @@ -1,5 +1,5 @@
    51.4  #!/bin/sh
    51.5 -# /etc/init.d/mysql : Start, stop and restart MySQL server on SliTaz, at 
    51.6 +# /etc/init.d/mysql : Start, stop and restart MySQL server on SliTaz, at
    51.7  # boot time or with the command line.
    51.8  #
    51.9  # To start MySQL server at boot time, just put mysql in the $RUN_DAEMONS
   51.10 @@ -9,7 +9,7 @@
   51.11  . /etc/daemons.conf
   51.12  
   51.13  NAME=Mysql
   51.14 -DESC="MySQL server"
   51.15 +DESC="$(_ '%s server' MySQL)"
   51.16  DAEMON=/usr/bin/mysqld_safe
   51.17  OPTIONS=$MYSQL_OPTIONS
   51.18  PIDFILE=/var/run/mysqld/mysql.pid
   51.19 @@ -22,51 +22,51 @@
   51.20  case "$1" in
   51.21    start)
   51.22      if active_pidfile $PIDFILE mysqld ; then
   51.23 -      echo "$NAME already running."
   51.24 +      _ '%s is already running.' $NAME
   51.25        exit 1
   51.26      fi
   51.27      if [ ! -d /var/lib/mysql/mysql ]; then
   51.28 -      echo "Initializing $DESC: "
   51.29 -      rm -rf /var/lib/mysql/* 2> /dev/null
   51.30 +      action 'Initializing %s...' "$DESC"
   51.31 +      rm -rf /var/lib/mysql/* 2>/dev/null
   51.32        mysql_install_db --user=mysql --datadir=/var/lib/mysql
   51.33 +      status
   51.34      fi
   51.35 -    echo -n "Starting $DESC: $NAME... "
   51.36 -    $DAEMON $OPTIONS  > /dev/null &
   51.37 +    action 'Starting %s: %s...' "$DESC" $NAME
   51.38 +    $DAEMON $OPTIONS  >/dev/null &
   51.39      status
   51.40      sleep 2
   51.41      for i in /etc/mysql.d/* ; do
   51.42 -    	[ -x $i ] || continue
   51.43 -	echo -n "Running $i..."
   51.44 -	$i
   51.45 -	status
   51.46 +      [ -x $i ] || continue
   51.47 +      action 'Running %s...' $i
   51.48 +      $i
   51.49 +      status
   51.50      done
   51.51      ;;
   51.52    stop)
   51.53      if ! active_pidfile $PIDFILE mysqld ; then
   51.54 -      echo "$NAME is not running."
   51.55 +      _ '%s is not running.' $NAME
   51.56        exit 1
   51.57      fi
   51.58 -    echo -n "Stopping $DESC: $NAME... "
   51.59 -    kill `cat $PIDFILE`> /dev/null
   51.60 +    action 'Stopping %s: %s...' "$DESC" $NAME
   51.61 +    kill $(cat $PIDFILE) >/dev/null
   51.62      status
   51.63      sleep 2
   51.64      ;;
   51.65    restart)
   51.66      if ! active_pidfile $PIDFILE mysqld ; then
   51.67 -      echo "$NAME is not running."
   51.68 +      _ '%s is not running.' $NAME
   51.69        exit 1
   51.70      fi
   51.71 -    echo -n "Restarting $DESC: $NAME... "
   51.72 -    kill `cat $PIDFILE`
   51.73 +    action 'Restarting %s: %s...' "$DESC" $NAME
   51.74 +    kill $(cat $PIDFILE)
   51.75      sleep 2
   51.76      $DAEMON $OPTIONS &
   51.77      status
   51.78      sleep 2
   51.79      ;;
   51.80    *)
   51.81 -    echo ""
   51.82 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   51.83 -    echo ""
   51.84 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   51.85 +    newline
   51.86      exit 1
   51.87      ;;
   51.88  esac
    52.1 --- a/nagios-nrpe/stuff/nrpe	Wed May 25 23:07:05 2016 +0200
    52.2 +++ b/nagios-nrpe/stuff/nrpe	Thu May 26 20:16:45 2016 +0300
    52.3 @@ -1,5 +1,5 @@
    52.4  #!/bin/sh
    52.5 -# /etc/init.d/nrpe : Start, stop and restart NRPE Server on SliTaz, at 
    52.6 +# /etc/init.d/nrpe : Start, stop and restart NRPE Server on SliTaz, at
    52.7  # boot time or with the command line.
    52.8  #
    52.9  # To start SSH server at boot time, just put nagios in the $RUN_DAEMONS
   52.10 @@ -9,50 +9,49 @@
   52.11  . /etc/daemons.conf
   52.12  
   52.13  NAME=NRPE
   52.14 -DESC="NRPE daemon"
   52.15 +DESC="$(_ '%s daemon' NRPE)"
   52.16  DAEMON=/usr/bin/nrpe
   52.17  CONFIG_FILE="/etc/nagios/nrpe.cfg"
   52.18  OPTIONS="-n -c $CONFIG_FILE -d"
   52.19  PIDFILE=/var/run/nagios/nrpe.pid
   52.20  
   52.21  if [ ! -d /var/run/nagios ]; then
   52.22 -	mkdir -p /var/run/nagios
   52.23 -	chown nagios.nagios /var/run/nagios
   52.24 +  mkdir -p /var/run/nagios
   52.25 +  chown nagios.nagios /var/run/nagios
   52.26  fi
   52.27  case "$1" in
   52.28    start)
   52.29      if active_pidfile $PIDFILE nrpe ; then
   52.30 -      echo "$NAME already running."
   52.31 +      _ '%s is already running.' $NAME
   52.32        exit 1
   52.33      fi
   52.34 -    echo -n "Starting $DESC: $NAME... "
   52.35 -	$DAEMON $OPTIONS
   52.36 +    action 'Starting %s: %s...' "$DESC" $NAME
   52.37 +    $DAEMON $OPTIONS
   52.38      status
   52.39      ;;
   52.40    stop)
   52.41      if ! active_pidfile $PIDFILE nrpe ; then
   52.42 -      echo "$NAME is not running."
   52.43 +      _ '%s is not running.' $NAME
   52.44        exit 1
   52.45      fi
   52.46 -    echo -n "Stopping $DESC: $NAME... "
   52.47 -    kill `cat $PIDFILE`
   52.48 +    action 'Stopping %s: %s...' "$DESC" $NAME
   52.49 +    kill $(cat $PIDFILE)
   52.50      status
   52.51      ;;
   52.52    restart|reload)
   52.53      if ! active_pidfile $PIDFILE nrpe ; then
   52.54 -      echo "$NAME is not running."
   52.55 +      _ '%s is not running.' $NAME
   52.56        exit 1
   52.57      fi
   52.58 -    echo -n "Restarting $DESC: $NAME... "
   52.59 -    kill `cat $PIDFILE`
   52.60 +    action 'Restarting %s: %s...' "$DESC" $NAME
   52.61 +    kill $(cat $PIDFILE)
   52.62      sleep 2
   52.63      $DAEMON $OPTIONS
   52.64      status
   52.65      ;;
   52.66    *)
   52.67 -    echo ""
   52.68 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart|reload]"
   52.69 -    echo ""
   52.70 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart|reload]"
   52.71 +    newline
   52.72      exit 1
   52.73      ;;
   52.74  esac
    53.1 --- a/nagios/stuff/nagios	Wed May 25 23:07:05 2016 +0200
    53.2 +++ b/nagios/stuff/nagios	Thu May 26 20:16:45 2016 +0300
    53.3 @@ -1,5 +1,5 @@
    53.4  #!/bin/sh
    53.5 -# /etc/init.d/nagios : Start, stop and restart Nagios server on SliTaz, at 
    53.6 +# /etc/init.d/nagios : Start, stop and restart Nagios server on SliTaz, at
    53.7  # boot time or with the command line.
    53.8  #
    53.9  # To start Nagios at boot time, just put nagios in the $RUN_DAEMONS
   53.10 @@ -9,7 +9,7 @@
   53.11  . /etc/daemons.conf
   53.12  
   53.13  NAME=Nagios
   53.14 -DESC="Network Monitoring Server"
   53.15 +DESC="$(_ 'Network Monitoring Server')"
   53.16  DAEMON=/usr/bin/nagios
   53.17  CONFIG_FILE="/etc/nagios/nagios.cfg"
   53.18  OPTIONS="-d $CONFIG_FILE"
   53.19 @@ -17,50 +17,50 @@
   53.20  
   53.21  configtest()
   53.22  {
   53.23 -		$DAEMON -v $CONFIG_FILE
   53.24 +  $DAEMON -v $CONFIG_FILE
   53.25  }
   53.26  
   53.27  if [ ! -d /var/run/nagios ]; then
   53.28 -	mkdir -p /var/run/nagios
   53.29 -	chown nagios.nagios /var/run/nagios
   53.30 +  mkdir -p /var/run/nagios
   53.31 +  chown nagios.nagios /var/run/nagios
   53.32  fi
   53.33  case "$1" in
   53.34    start)
   53.35      if active_pidfile $PIDFILE nagios ; then
   53.36 -      echo "$NAME already running."
   53.37 +      _ '%s is already running.' $NAME
   53.38        exit 1
   53.39      fi
   53.40 -    echo -n "Starting $DESC: $NAME... "
   53.41 -	$DAEMON $OPTIONS
   53.42 -	#/usr/bin/nagios -d /etc/nagios/nagios.cfg
   53.43 +    action 'Starting %s: %s...' "$DESC" $NAME
   53.44 +    $DAEMON $OPTIONS
   53.45 +    #/usr/bin/nagios -d /etc/nagios/nagios.cfg
   53.46      status
   53.47      ;;
   53.48    stop)
   53.49      if ! active_pidfile $PIDFILE nagios ; then
   53.50 -      echo "$NAME is not running."
   53.51 +      _ '%s is not running.' $NAME
   53.52        exit 1
   53.53      fi
   53.54 -    echo -n "Stopping $DESC: $NAME... "
   53.55 -    kill `cat $PIDFILE`
   53.56 +    status 'Stopping %s: %s...' "$DESC" $NAME
   53.57 +    kill $(cat $PIDFILE)
   53.58      status
   53.59      ;;
   53.60    restart|reload)
   53.61      if ! active_pidfile $PIDFILE nagios ; then
   53.62 -      echo "$NAME is not running."
   53.63 +      _ '%s is not running.' $NAME
   53.64        exit 1
   53.65      fi
   53.66 -    echo -n "Restarting $DESC: $NAME... "
   53.67 -    kill `cat $PIDFILE`
   53.68 +    action 'Restarting %s: %s...' "$DESC" $NAME
   53.69 +    kill $(cat $PIDFILE)
   53.70      sleep 2
   53.71      $DAEMON $OPTIONS
   53.72      status
   53.73      ;;
   53.74    test)
   53.75 -	configtest ;;
   53.76 +    configtest
   53.77 +    ;;
   53.78    *)
   53.79 -    echo ""
   53.80 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart|reload]"
   53.81 -    echo ""
   53.82 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart|reload|test]"
   53.83 +    newline
   53.84      exit 1
   53.85      ;;
   53.86  esac
    54.1 --- a/netatalk-pam/stuff/etc/init.d/netatalk	Wed May 25 23:07:05 2016 +0200
    54.2 +++ b/netatalk-pam/stuff/etc/init.d/netatalk	Thu May 26 20:16:45 2016 +0300
    54.3 @@ -1,5 +1,5 @@
    54.4  #!/bin/sh
    54.5 -# Start, stop and restart the netatalk deamons on SliTaz, at boot time or 
    54.6 +# Start, stop and restart the netatalk deamons on SliTaz, at boot time or
    54.7  # with the command line.
    54.8  #
    54.9  # To start netatalk at boot time, just put the right name in the $RUN_DAEMONS
   54.10 @@ -8,7 +8,7 @@
   54.11  . /etc/init.d/rc.functions
   54.12  
   54.13  NAME=atalkd
   54.14 -DESC="netatalk deamons"
   54.15 +DESC="$(_ 'Netatalk daemons')"
   54.16  PIDFILE=/var/run/$NAME.pid
   54.17  AFPD_UAMLIST="-U uams_dhx.so,uams_clrtxt.so,uams_randnum.so"
   54.18  AFPD_GUEST=nobody
   54.19 @@ -22,7 +22,7 @@
   54.20  # Start Netatalk servers.
   54.21  atalk_startup()
   54.22  {
   54.23 -	if [ "$ATALKD_RUN" = "yes" ]; then
   54.24 +	if [ "$ATALKD_RUN" == "yes" ]; then
   54.25  		modprobe appletalk
   54.26  		atalkd
   54.27  		pidof atalkd > $PIDFILE
   54.28 @@ -31,51 +31,50 @@
   54.29  		nbprgstr -p 4 "$ATALK_NAME:Workstation$ATALK_ZONE"
   54.30  		nbprgstr -p 4 "$ATALK_NAME:netatalk$ATALK_ZONE"
   54.31  
   54.32 -		[ "$PAPD_RUN" = "yes" ] && papd
   54.33 -		[ "$TIMELORD_RUN" = "yes" ] && timelord
   54.34 +		[ "$PAPD_RUN" == "yes" ] && papd
   54.35 +		[ "$TIMELORD_RUN" == "yes" ] && timelord
   54.36  	fi
   54.37  
   54.38 -	[ "$AFPD_RUN" = "yes" ] && afpd $AFPD_UAMLIST -g $AFPD_GUEST \
   54.39 +	[ "$AFPD_RUN" == "yes" ] && afpd $AFPD_UAMLIST -g $AFPD_GUEST \
   54.40      		-c $AFPD_MAX_CLIENTS -n "$ATALK_NAME$ATALK_ZONE"
   54.41  }
   54.42  
   54.43  case "$1" in
   54.44 -start)
   54.45 -	if active_pidfile $PIDFILE $NAME ; then
   54.46 -		echo "$NAME is already running."
   54.47 +	start)
   54.48 +		if active_pidfile $PIDFILE $NAME ; then
   54.49 +			_ '%s is already running.' $NAME
   54.50 +			exit 1
   54.51 +		fi
   54.52 +		action 'Starting %s: %s...' "$DESC" $NAME
   54.53 +		if [ "$ATALK_BGROUND" == "yes" ]; then
   54.54 +			atalk_startup >/dev/null &
   54.55 +		else
   54.56 +			atalk_startup
   54.57 +		fi
   54.58 +		status
   54.59 +		;;
   54.60 +	stop)
   54.61 +		if ! active_pidfile $PIDFILE $NAME ; then
   54.62 +			_ '%s is not running.' $NAME
   54.63 +			exit 1
   54.64 +		fi
   54.65 +		action 'Stopping %s: %s...' "$DESC" $NAME
   54.66 +		killall afpd
   54.67 +		killall papd
   54.68 +		killall timelord
   54.69 +		killall atalkd
   54.70 +		status
   54.71 +		;;
   54.72 +	restart)
   54.73 +		$0 start
   54.74 +		sleep 2
   54.75 +		$0 stop
   54.76 +		;;
   54.77 +	*)
   54.78 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   54.79 +		newline
   54.80  		exit 1
   54.81 -	fi
   54.82 -	echo -n "Starting $DESC: $NAME... "
   54.83 -	if [ "$ATALK_BGROUND" == "yes" ]; then
   54.84 -		atalk_startup >/dev/null &
   54.85 -	else
   54.86 -		atalk_startup
   54.87 -	fi
   54.88 -	status
   54.89 -	;;
   54.90 -stop)
   54.91 -	if ! active_pidfile $PIDFILE $NAME ; then
   54.92 -		echo "$NAME is not running."
   54.93 -		exit 1
   54.94 -	fi
   54.95 -	echo -n "Stopping $DESC: $NAME... "
   54.96 -	killall afpd
   54.97 -	killall papd
   54.98 -	killall timelord
   54.99 -	killall atalkd
  54.100 -	status
  54.101 -	;;
  54.102 -restart)
  54.103 -	$0 start
  54.104 -	sleep 2
  54.105 -	$0 stop
  54.106 -	;;
  54.107 -*)
  54.108 -	echo ""
  54.109 -	echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
  54.110 -	echo ""
  54.111 -	exit 1
  54.112 -	;;
  54.113 +		;;
  54.114  esac
  54.115  
  54.116  exit 0
    55.1 --- a/netatalk/stuff/etc/init.d/netatalk	Wed May 25 23:07:05 2016 +0200
    55.2 +++ b/netatalk/stuff/etc/init.d/netatalk	Thu May 26 20:16:45 2016 +0300
    55.3 @@ -1,5 +1,5 @@
    55.4  #!/bin/sh
    55.5 -# Start, stop and restart the netatalk deamons on SliTaz, at boot time or 
    55.6 +# Start, stop and restart the netatalk deamons on SliTaz, at boot time or
    55.7  # with the command line.
    55.8  #
    55.9  # To start netatalk at boot time, just put the right name in the $RUN_DAEMONS
   55.10 @@ -8,7 +8,7 @@
   55.11  . /etc/init.d/rc.functions
   55.12  
   55.13  NAME=atalkd
   55.14 -DESC="netatalk deamons"
   55.15 +DESC="$(_ 'Netatalk daemons')"
   55.16  PIDFILE=/var/run/$NAME.pid
   55.17  AFPD_UAMLIST="-U uams_dhx.so,uams_clrtxt.so,uams_randnum.so"
   55.18  AFPD_GUEST=nobody
   55.19 @@ -22,7 +22,7 @@
   55.20  # Start Netatalk servers.
   55.21  atalk_startup()
   55.22  {
   55.23 -	if [ "$ATALKD_RUN" = "yes" ]; then
   55.24 +	if [ "$ATALKD_RUN" == "yes" ]; then
   55.25  		modprobe appletalk
   55.26  		atalkd
   55.27  		pidof atalkd > $PIDFILE
   55.28 @@ -31,8 +31,8 @@
   55.29  		nbprgstr -p 4 "$ATALK_NAME:Workstation$ATALK_ZONE"
   55.30  		nbprgstr -p 4 "$ATALK_NAME:netatalk$ATALK_ZONE"
   55.31  
   55.32 -		[ "$PAPD_RUN" = "yes" ] && papd
   55.33 -		[ "$TIMELORD_RUN" = "yes" ] && timelord
   55.34 +		[ "$PAPD_RUN" == "yes" ] && papd
   55.35 +		[ "$TIMELORD_RUN" == "yes" ] && timelord
   55.36  	fi
   55.37  
   55.38  	[ "$AFPD_RUN" = "yes" ] && afpd $AFPD_UAMLIST -g $AFPD_GUEST \
   55.39 @@ -40,42 +40,41 @@
   55.40  }
   55.41  
   55.42  case "$1" in
   55.43 -start)
   55.44 -	if active_pidfile $PIDFILE $NAME ; then
   55.45 -		echo "$NAME is already running."
   55.46 +	start)
   55.47 +		if active_pidfile $PIDFILE $NAME ; then
   55.48 +			_ '%s is already running.' $NAME
   55.49 +			exit 1
   55.50 +		fi
   55.51 +		action 'Starting %s: %s...' "$DESC" $NAME
   55.52 +		if [ "$ATALK_BGROUND" == "yes" ]; then
   55.53 +			atalk_startup >/dev/null &
   55.54 +		else
   55.55 +			atalk_startup
   55.56 +		fi
   55.57 +		status
   55.58 +		;;
   55.59 +	stop)
   55.60 +		if ! active_pidfile $PIDFILE $NAME ; then
   55.61 +			_ '%s is not running.' $NAME
   55.62 +			exit 1
   55.63 +		fi
   55.64 +		action 'Stopping %s: %s...' "$DESC" $NAME
   55.65 +		killall afpd
   55.66 +		killall papd
   55.67 +		killall timelord
   55.68 +		killall atalkd
   55.69 +		status
   55.70 +		;;
   55.71 +	restart)
   55.72 +		$0 start
   55.73 +		sleep 2
   55.74 +		$0 stop
   55.75 +		;;
   55.76 +	*)
   55.77 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   55.78 +		newline
   55.79  		exit 1
   55.80 -	fi
   55.81 -	echo -n "Starting $DESC: $NAME... "
   55.82 -	if [ "$ATALK_BGROUND" == "yes" ]; then
   55.83 -		atalk_startup >/dev/null &
   55.84 -	else
   55.85 -		atalk_startup
   55.86 -	fi
   55.87 -	status
   55.88 -	;;
   55.89 -stop)
   55.90 -	if ! active_pidfile $PIDFILE $NAME ; then
   55.91 -		echo "$NAME is not running."
   55.92 -		exit 1
   55.93 -	fi
   55.94 -	echo -n "Stopping $DESC: $NAME... "
   55.95 -	killall afpd
   55.96 -	killall papd
   55.97 -	killall timelord
   55.98 -	killall atalkd
   55.99 -	status
  55.100 -	;;
  55.101 -restart)
  55.102 -	$0 start
  55.103 -	sleep 2
  55.104 -	$0 stop
  55.105 -	;;
  55.106 -*)
  55.107 -	echo ""
  55.108 -	echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
  55.109 -	echo ""
  55.110 -	exit 1
  55.111 -	;;
  55.112 +		;;
  55.113  esac
  55.114  
  55.115  exit 0
    56.1 --- a/nfs-utils/stuff/etc/init.d/nfsd	Wed May 25 23:07:05 2016 +0200
    56.2 +++ b/nfs-utils/stuff/etc/init.d/nfsd	Thu May 26 20:16:45 2016 +0300
    56.3 @@ -8,7 +8,7 @@
    56.4  . /etc/init.d/rc.functions
    56.5  
    56.6  NAME=NFSd
    56.7 -DESC="NFS Daemon"
    56.8 +DESC="$(_ '%s daemon' NFS)"
    56.9  DAEMON=/usr/sbin/rpc.nfsd
   56.10  PID_FILE=/var/run/nfsd.pid
   56.11  OPTION="8"
   56.12 @@ -16,24 +16,24 @@
   56.13  
   56.14  stop_warning()
   56.15  {
   56.16 -echo "Warning: filesystems are unexported but nfsd and lockd processes are still alive..."
   56.17 +  echo "Warning: filesystems are unexported but nfsd and lockd processes are still alive..."
   56.18  }
   56.19  
   56.20  case "$1" in
   56.21    start)
   56.22      if active_pidfile $PID_FILE nfsd ; then
   56.23 -      echo "$NAME already running."
   56.24 +      _ '%s is already running.' $NAME
   56.25        exit 1
   56.26      fi
   56.27 -    echo -n "Starting $DESC: $NAME... "
   56.28 +    action 'Starting %s: %s...' "$DESC" $NAME
   56.29      portmap="$(pidof portmap)"
   56.30      if [ -n "$portmap" ]; then
   56.31 -    	kill $portmap
   56.32 -    	sleep 2
   56.33 +      kill $portmap
   56.34 +      sleep 2
   56.35      fi
   56.36      [ -n "$(pidof rpcbind)" ] || rpcbind
   56.37      modprobe nfsd
   56.38 -    mount -t nfsd nfsd /proc/fs/nfsd 2> /dev/null
   56.39 +    mount -t nfsd nfsd /proc/fs/nfsd 2>/dev/null
   56.40      /usr/sbin/exportfs -r
   56.41      $DAEMON $OPTION
   56.42      pidof nfsd | awk '{print $1}' > $PID_FILE
   56.43 @@ -42,10 +42,10 @@
   56.44      ;;
   56.45    stop)
   56.46      if ! active_pidfile $PID_FILE nfsd ; then
   56.47 -      echo "$NAME is not running."
   56.48 +      _ '%s is not running.' $NAME
   56.49        exit 1
   56.50      fi
   56.51 -    echo -n "Stopping $DESC: $NAME... "
   56.52 +    action 'Stopping %s: %s...' "$DESC" $NAME
   56.53      killall rpc.mountd
   56.54      killall nfsd
   56.55      killall lockd
   56.56 @@ -57,10 +57,10 @@
   56.57      ;;
   56.58    restart)
   56.59      if ! active_pidfile $PID_FILE nfsd ; then
   56.60 -      echo "$NAME is not running."
   56.61 +      _ '%s is not running.' $NAME
   56.62        exit 1
   56.63      fi
   56.64 -    echo -n "Restarting $DESC: $NAME... "
   56.65 +    action 'Restarting %s: %s...' "$DESC" $NAME
   56.66      killall rpc.mountd
   56.67      killall nfsd
   56.68      killall lockd
   56.69 @@ -74,9 +74,8 @@
   56.70      status
   56.71      ;;
   56.72    *)
   56.73 -    echo ""
   56.74 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   56.75 -    echo ""
   56.76 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   56.77 +    newline
   56.78      exit 1
   56.79      ;;
   56.80  esac
    57.1 --- a/nginx-extras/stuff/etc/init.d/nginx	Wed May 25 23:07:05 2016 +0200
    57.2 +++ b/nginx-extras/stuff/etc/init.d/nginx	Thu May 26 20:16:45 2016 +0300
    57.3 @@ -1,5 +1,5 @@
    57.4  #!/bin/sh
    57.5 -# /etc/init.d/nginx: Start, stop and restart web server on SliTaz, 
    57.6 +# /etc/init.d/nginx: Start, stop and restart web server on SliTaz,
    57.7  # at boot time or with the command line. Daemons options are configured
    57.8  # with /etc/daemons.conf
    57.9  #
   57.10 @@ -7,7 +7,7 @@
   57.11  . /etc/daemons.conf
   57.12  
   57.13  NAME=Nginx
   57.14 -DESC="web server"
   57.15 +DESC="$(_ 'web server')"
   57.16  DAEMON=/usr/sbin/nginx
   57.17  OPTIONS=$NGINX_OPTIONS
   57.18  PIDFILE=/var/run/nginx.pid
   57.19 @@ -15,39 +15,38 @@
   57.20  case "$1" in
   57.21    start)
   57.22      if active_pidfile $PIDFILE nginx ; then
   57.23 -      echo "$NAME already running."
   57.24 +      _ '%s is already running.' $NAME
   57.25        exit 1
   57.26      fi
   57.27 -    echo -n "Starting $DESC: $NAME... "
   57.28 -    $DAEMON $OPTIONS 
   57.29 +    action 'Starting %s: %s...' "$DESC" $NAME
   57.30 +    $DAEMON $OPTIONS
   57.31      status
   57.32      ;;
   57.33    stop)
   57.34      if ! active_pidfile $PIDFILE nginx ; then
   57.35 -      echo "$NAME is not running."
   57.36 +      _ '%s is not running.' $NAME
   57.37        exit 1
   57.38      fi
   57.39 -    echo -n "Stopping $DESC: $NAME... "
   57.40 -    kill `cat $PIDFILE`
   57.41 +    action 'Stopping %s: %s...' "$DESC" $NAME
   57.42 +    kill $(cat $PIDFILE)
   57.43      rm $PIDFILE
   57.44      status
   57.45      ;;
   57.46    restart)
   57.47      if ! active_pidfile $PIDFILE nginx ; then
   57.48 -      echo "$NAME is not running."
   57.49 +      _ '%s is not running.' $NAME
   57.50        exit 1
   57.51      fi
   57.52 -    echo -n "Restarting $DESC: $NAME... "
   57.53 -    kill `cat $PIDFILE`
   57.54 +    action 'Restarting %s: %s...' "$DESC" $NAME
   57.55 +    kill $(cat $PIDFILE)
   57.56      rm $PIDFILE
   57.57      sleep 2
   57.58      $DAEMON $OPTIONS
   57.59      status
   57.60      ;;
   57.61    *)
   57.62 -    echo ""
   57.63 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   57.64 -    echo ""
   57.65 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   57.66 +    newline
   57.67      exit 1
   57.68      ;;
   57.69  esac
    58.1 --- a/nginx/stuff/etc/init.d/nginx	Wed May 25 23:07:05 2016 +0200
    58.2 +++ b/nginx/stuff/etc/init.d/nginx	Thu May 26 20:16:45 2016 +0300
    58.3 @@ -1,5 +1,5 @@
    58.4  #!/bin/sh
    58.5 -# /etc/init.d/nginx: Start, stop and restart web server on SliTaz, 
    58.6 +# /etc/init.d/nginx: Start, stop and restart web server on SliTaz,
    58.7  # at boot time or with the command line. Daemons options are configured
    58.8  # with /etc/daemons.conf
    58.9  #
   58.10 @@ -7,7 +7,7 @@
   58.11  . /etc/daemons.conf
   58.12  
   58.13  NAME=Nginx
   58.14 -DESC="web server"
   58.15 +DESC="$(_ 'web server')"
   58.16  DAEMON=/usr/sbin/nginx
   58.17  OPTIONS=$NGINX_OPTIONS
   58.18  PIDFILE=/var/run/nginx.pid
   58.19 @@ -15,39 +15,38 @@
   58.20  case "$1" in
   58.21    start)
   58.22      if active_pidfile $PIDFILE nginx ; then
   58.23 -      echo "$NAME already running."
   58.24 +      _ '%s is already running.' $NAME
   58.25        exit 1
   58.26      fi
   58.27 -    echo -n "Starting $DESC: $NAME... "
   58.28 -    $DAEMON $OPTIONS 
   58.29 +    action 'Starting %s: %s...' "$DESC" $NAME
   58.30 +    $DAEMON $OPTIONS
   58.31      status
   58.32      ;;
   58.33    stop)
   58.34      if ! active_pidfile $PIDFILE nginx ; then
   58.35 -      echo "$NAME is not running."
   58.36 +      _ '%s is not running.' $NAME
   58.37        exit 1
   58.38      fi
   58.39 -    echo -n "Stopping $DESC: $NAME... "
   58.40 -    kill `cat $PIDFILE`
   58.41 +    action 'Stopping %s: %s...' "$DESC" $NAME
   58.42 +    kill $(cat $PIDFILE)
   58.43      rm $PIDFILE
   58.44      status
   58.45      ;;
   58.46    restart)
   58.47      if ! active_pidfile $PIDFILE nginx ; then
   58.48 -      echo "$NAME is not running."
   58.49 +      _ '%s is not running.' $NAME
   58.50        exit 1
   58.51      fi
   58.52 -    echo -n "Restarting $DESC: $NAME... "
   58.53 -    kill `cat $PIDFILE`
   58.54 +    action 'Restarting %s: %s...' "$DESC" $NAME
   58.55 +    kill $(cat $PIDFILE)
   58.56      rm $PIDFILE
   58.57      sleep 2
   58.58      $DAEMON $OPTIONS
   58.59      status
   58.60      ;;
   58.61    *)
   58.62 -    echo ""
   58.63 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   58.64 -    echo ""
   58.65 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   58.66 +    newline
   58.67      exit 1
   58.68      ;;
   58.69  esac
    59.1 --- a/nscd/stuff/nscd	Wed May 25 23:07:05 2016 +0200
    59.2 +++ b/nscd/stuff/nscd	Thu May 26 20:16:45 2016 +0300
    59.3 @@ -9,7 +9,7 @@
    59.4  . /etc/daemons.conf
    59.5  
    59.6  NAME=nscd
    59.7 -DESC="Name Switch Cache Daemon"
    59.8 +DESC="$(_ 'name-server caching daemon')"
    59.9  DAEMON=/usr/sbin/nscd
   59.10  OPTIONS=$NSCD_OPTIONS
   59.11  PIDFILE=/var/run/nscd/nscd.pid
   59.12 @@ -20,41 +20,39 @@
   59.13  case "$1" in
   59.14    start)
   59.15      if active_pidfile $PIDFILE nscd ; then
   59.16 -      echo "$NAME already running."
   59.17 +      _ '%s is already running.' $NAME
   59.18        exit 1
   59.19      fi
   59.20 -    echo -n "Starting $DESC: $NAME... "
   59.21 +    action 'Starting %s: %s...' "$DESC" $NAME
   59.22      $DAEMON $OPTIONS
   59.23      status
   59.24      sleep 2
   59.25      ;;
   59.26    stop)
   59.27      if ! active_pidfile $PIDFILE nscd ; then
   59.28 -      echo "$NAME is not running."
   59.29 +      _ '%s is not running.' $NAME
   59.30        exit 1
   59.31      fi
   59.32 -    echo -n "Stopping $DESC: $NAME... "
   59.33 -    kill `cat $PIDFILE`
   59.34 +    action 'Stopping %s: %s...' "$DESC" $NAME
   59.35 +    kill $(cat $PIDFILE)
   59.36      status
   59.37      sleep 2
   59.38      ;;
   59.39    restart)
   59.40      if ! active_pidfile $PIDFILE nscd ; then
   59.41 -      echo "$NAME is not running."
   59.42 +      _ '%s is not running.' $NAME
   59.43        exit 1
   59.44      fi
   59.45 -    echo -n "Restarting $DESC: $NAME... "
   59.46 -    kill `cat $PIDFILE`
   59.47 +    action 'Restarting %s: %s...' "$DESC" $NAME
   59.48 +    kill $(cat $PIDFILE)
   59.49      sleep 2
   59.50      $DAEMON $OPTIONS
   59.51      status
   59.52      sleep 2
   59.53      ;;
   59.54    *)
   59.55 -    echo ""
   59.56 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart
   59.57 -]"
   59.58 -    echo ""
   59.59 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   59.60 +    newline
   59.61      exit 1
   59.62      ;;
   59.63  esac
    60.1 --- a/ntop/stuff/etc/init.d/ntop	Wed May 25 23:07:05 2016 +0200
    60.2 +++ b/ntop/stuff/etc/init.d/ntop	Thu May 26 20:16:45 2016 +0300
    60.3 @@ -1,5 +1,5 @@
    60.4  #!/bin/sh
    60.5 -# /etc/init.d/ntop : Start, stop and restart ntop daemon on SliTaz, at 
    60.6 +# /etc/init.d/ntop : Start, stop and restart ntop daemon on SliTaz, at
    60.7  # boot time or with the command line.
    60.8  #
    60.9  # To start SSH server at boot time, just put ntop in the $RUN_DAEMONS
   60.10 @@ -9,7 +9,7 @@
   60.11  
   60.12  
   60.13  NAME=ntop
   60.14 -DESC="ntop server"
   60.15 +DESC="$(_ '%s server' ntop)"
   60.16  DAEMON=/usr/bin/ntop
   60.17  
   60.18  HTTP_PORT="3000"
   60.19 @@ -23,41 +23,40 @@
   60.20  case "$1" in
   60.21    start)
   60.22      if active_pidfile $PIDFILE $NAME ; then
   60.23 -      echo "$NAME already running."
   60.24 +      _ '%s is already running.' $NAME
   60.25        exit 1
   60.26      fi
   60.27      # We need to set ntop admin password.
   60.28      if [ ! -f /var/ntop/ntop_pw.db ] ; then
   60.29 -		ntop -A || exit
   60.30 +      ntop -A || exit
   60.31      fi
   60.32 -    echo -n "Starting $DESC: $NAME... "
   60.33 +    action 'Starting %s: %s...' "$DESC" $NAME
   60.34      $DAEMON $OPTIONS >> $LOGFILE
   60.35      status
   60.36      ;;
   60.37    stop)
   60.38      if ! active_pidfile $PIDFILE $NAME ; then
   60.39 -      echo "$NAME is not running."
   60.40 +      _ '%s is not running.' $NAME
   60.41        exit 1
   60.42      fi
   60.43 -    echo -n "Stopping $DESC: $NAME... "
   60.44 -    kill `cat $PIDFILE` && rm -f $PIDFILE
   60.45 +    action 'Stopping %s: %s...' "$DESC" $NAME
   60.46 +    kill $(cat $PIDFILE) && rm -f $PIDFILE
   60.47      status
   60.48      ;;
   60.49    restart)
   60.50      if ! active_pidfile $PIDFILE $NAME ; then
   60.51 -      echo "$NAME is not running."
   60.52 +      _ '%s is not running.' $NAME
   60.53        exit 1
   60.54      fi
   60.55 -    echo -n "Restarting $DESC: $NAME... "
   60.56 -    kill `cat $PIDFILE` && rm -f $PIDFILE
   60.57 +    action 'Restarting %s: %s...' "$DESC" $NAME
   60.58 +    kill $(cat $PIDFILE) && rm -f $PIDFILE
   60.59      sleep 2
   60.60      $DAEMON $OPTIONS
   60.61      status
   60.62      ;;
   60.63    *)
   60.64 -    echo ""
   60.65 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   60.66 -    echo ""
   60.67 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   60.68 +    newline
   60.69      exit 1
   60.70      ;;
   60.71  esac
    61.1 --- a/ntp/stuff/ntp	Wed May 25 23:07:05 2016 +0200
    61.2 +++ b/ntp/stuff/ntp	Thu May 26 20:16:45 2016 +0300
    61.3 @@ -1,5 +1,5 @@
    61.4  #!/bin/sh
    61.5 -# /etc/init.d/ntp : Start, stop and restart ntp server on SliTaz, at 
    61.6 +# /etc/init.d/ntp : Start, stop and restart ntp server on SliTaz, at
    61.7  # boot time or with the command line.
    61.8  #
    61.9  # To start ntp server at boot time, just put ntp in the $RUN_DAEMONS
   61.10 @@ -9,49 +9,47 @@
   61.11  . /etc/daemons.conf
   61.12  
   61.13  NAME=ntp
   61.14 -DESC="ntp server"
   61.15 +DESC="$(_ '%s server' NTP)"
   61.16  DAEMON=/usr/bin/ntpd
   61.17  OPTIONS=$NTP_OPTIONS
   61.18  PIDFILE=/var/run/ntpd.pid
   61.19  [ -n "$OPTIONS" ] || OPTIONS="-p $PIDFILE -c /etc/ntp.conf"
   61.20 - 
   61.21  
   61.22  case "$1" in
   61.23    start)
   61.24      if active_pidfile $PIDFILE ntpd ; then
   61.25 -      echo "$NAME already running."
   61.26 +      _ '%s is already running.' $NAME
   61.27        exit 1
   61.28      fi
   61.29 -    echo -n "Starting $DESC: $NAME... "
   61.30 +    action 'Starting %s: %s...' "$DESC" $NAME
   61.31      $DAEMON $OPTIONS
   61.32      status
   61.33      pgrep $DAEMON > $PIDFILE	# it seems that -p doesn't work ?
   61.34      ;;
   61.35    stop)
   61.36      if ! active_pidfile $PIDFILE ntpd ; then
   61.37 -      echo "$NAME is not running."
   61.38 +      _ '%s is not running.' $NAME
   61.39        exit 1
   61.40      fi
   61.41 -    echo -n "Stopping $DESC: $NAME... "
   61.42 -    kill `cat $PIDFILE`
   61.43 +    action 'Stopping %s: %s...' "$DESC" $NAME
   61.44 +    kill $(cat $PIDFILE)
   61.45      rm $PIDFILE
   61.46      status
   61.47      ;;
   61.48    restart)
   61.49      if ! active_pidfile $PIDFILE ntpd ; then
   61.50 -      echo "$NAME is not running."
   61.51 +      _ '%s is not running.' $NAME
   61.52        exit 1
   61.53      fi
   61.54 -    echo -n "Restarting $DESC: $NAME... "
   61.55 -    kill `cat $PIDFILE`
   61.56 +    action 'Restarting %s: %s...' "$DESC" $NAME
   61.57 +    kill $(cat $PIDFILE)
   61.58      $DAEMON $OPTIONS
   61.59      status
   61.60      pgrep $DAEMON > $PIDFILE	# it seems that -p doesn't work ?
   61.61      ;;
   61.62    *)
   61.63 -    echo ""
   61.64 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   61.65 -    echo ""
   61.66 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   61.67 +    newline
   61.68      exit 1
   61.69      ;;
   61.70  esac
    62.1 --- a/ofono/stuff/etc/init.d/ofono	Wed May 25 23:07:05 2016 +0200
    62.2 +++ b/ofono/stuff/etc/init.d/ofono	Thu May 26 20:16:45 2016 +0300
    62.3 @@ -10,7 +10,7 @@
    62.4  . /etc/daemons.conf
    62.5  
    62.6  NAME=Ofono
    62.7 -DESC="Mobile telephony Manager"
    62.8 +DESC="$(_ 'Mobile telephony Manager')"
    62.9  DAEMON=/usr/sbin/ofonod
   62.10  OPTIONS=$OFONO_OPTIONS
   62.11  PIDFILE=/var/run/ofono.pid
   62.12 @@ -18,30 +18,30 @@
   62.13  case "$1" in
   62.14    start)
   62.15      if active_pidfile $PIDFILE ofonod ; then
   62.16 -      echo "$NAME already running."
   62.17 +      _ '%s is already running.' $NAME
   62.18        exit 1
   62.19      fi
   62.20 -    echo -n "Starting $DESC: $NAME... "
   62.21 +    action 'Starting %s: %s...' "$DESC" $NAME
   62.22      $DAEMON $OPTIONS
   62.23      status
   62.24      pidof ofonod > $PIDFILE
   62.25      ;;
   62.26    stop)
   62.27      if ! active_pidfile $PIDFILE ofonod ; then
   62.28 -      echo "$NAME is not running."
   62.29 +      _ '%s is not running.' $NAME
   62.30        exit 1
   62.31      fi
   62.32 -    echo -n "Stopping $DESC: $NAME... "
   62.33 +    action 'Stopping %s: %s...' "$DESC" $NAME
   62.34      rm -rf $PIDFILE
   62.35      kill $(pidof ofonod)
   62.36      status
   62.37      ;;
   62.38    restart)
   62.39      if ! active_pidfile $PIDFILE ofonod ; then
   62.40 -      echo "$NAME is not running."
   62.41 +      _ '%s is not running.' $NAME
   62.42        exit 1
   62.43      fi
   62.44 -    echo -n "Restarting $DESC: $NAME... "
   62.45 +    action 'Restarting %s: %s...' "$DESC" $NAME
   62.46      rm -rf $PIDFILE
   62.47      kill $(pidof ofonod) &&
   62.48      sleep 2 &&
   62.49 @@ -49,9 +49,8 @@
   62.50      status
   62.51      ;;
   62.52    *)
   62.53 -    printf "\n\033[1mUsage:\033[0m /etc/init.d/%b [start|stop|restart]\n" \
   62.54 -		"$(basename $0)"
   62.55 -    exit 1
   62.56 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   62.57 +    newline
   62.58      ;;
   62.59  esac
   62.60  
    63.1 --- a/open-vm-tools/stuff/vmtoolsd	Wed May 25 23:07:05 2016 +0200
    63.2 +++ b/open-vm-tools/stuff/vmtoolsd	Thu May 26 20:16:45 2016 +0300
    63.3 @@ -1,5 +1,5 @@
    63.4  #!/bin/sh
    63.5 -# /etc/init.d/vmtoolsd : Start, stop and restart Open VM Tools daemon on SliTaz, at 
    63.6 +# /etc/init.d/vmtoolsd : Start, stop and restart Open VM Tools daemon on SliTaz, at
    63.7  # boot time or with the command line.
    63.8  #
    63.9  # To start VMTools daemon at boot time, just put vmtoolsd in the $RUN_DAEMONS
   63.10 @@ -9,7 +9,7 @@
   63.11  . /etc/daemons.conf
   63.12  
   63.13  NAME=VMTools
   63.14 -DESC="VMTools"
   63.15 +DESC="$(_ '%s daemon' VMTools)"
   63.16  DAEMON=/usr/bin/vmtoolsd
   63.17  PIDFILE=/var/run/vmtoolsd.pid
   63.18  OPTIONS="-b $PIDFILE"
   63.19 @@ -17,10 +17,10 @@
   63.20  case "$1" in
   63.21    start)
   63.22      if active_pidfile $PIDFILE vmtoolsd ; then
   63.23 -      echo "$NAME already running."
   63.24 +      _ '%s is already running.' $NAME
   63.25        exit 1
   63.26      fi
   63.27 -    echo -n "Starting $DESC: $NAME... "
   63.28 +    action 'Starting %s: %s...' "$DESC" $NAME
   63.29      modprobe vmblock
   63.30      modprobe vmhgfs
   63.31      modprobe vmci
   63.32 @@ -31,28 +31,27 @@
   63.33      ;;
   63.34    stop)
   63.35      if ! active_pidfile $PIDFILE vmtoolsd ; then
   63.36 -      echo "$NAME is not running."
   63.37 +      _ '%s is not running.' $NAME
   63.38        exit 1
   63.39      fi
   63.40 -    echo -n "Stopping $DESC: $NAME... "
   63.41 +    action 'Stopping %s: %s...' "$DESC" $NAME
   63.42      kill `cat $PIDFILE`
   63.43      status
   63.44      ;;
   63.45    restart)
   63.46      if ! active_pidfile $PIDFILE vmtoolsd ; then
   63.47 -      echo "$NAME is not running."
   63.48 +      _ '%s is not running.' $NAME
   63.49        exit 1
   63.50      fi
   63.51 -    echo -n "Restarting $DESC: $NAME... "
   63.52 -    kill `cat $PIDFILE`
   63.53 +    action 'Restarting %s: %s...' "$DESC" $NAME
   63.54 +    kill $(cat $PIDFILE)
   63.55      sleep 2
   63.56      $DAEMON $OPTIONS
   63.57      status
   63.58      ;;
   63.59    *)
   63.60 -    echo ""
   63.61 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   63.62 -    echo ""
   63.63 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   63.64 +    newline
   63.65      exit 1
   63.66      ;;
   63.67  esac
    64.1 --- a/openerp-server/stuff/etc/init.d/openerp-server	Wed May 25 23:07:05 2016 +0200
    64.2 +++ b/openerp-server/stuff/etc/init.d/openerp-server	Thu May 26 20:16:45 2016 +0300
    64.3 @@ -1,5 +1,5 @@
    64.4  #!/bin/sh
    64.5 -# /etc/init.d/openerp-server : Start, stop and restart OpenERP server on SliTaz, at 
    64.6 +# /etc/init.d/openerp-server : Start, stop and restart OpenERP server on SliTaz, at
    64.7  # boot time or with the command line.
    64.8  #
    64.9  # To start OpenERP server at boot time, just put openerp-server in the $RUN_DAEMONS
   64.10 @@ -9,7 +9,7 @@
   64.11  . /etc/daemons.conf
   64.12  
   64.13  NAME=OpenERP
   64.14 -DESC="OpenERP server"
   64.15 +DESC="$(_ '%s server' OpenERP)"
   64.16  DAEMON=/usr/bin/openerp-server
   64.17  OPTIONS=$OPENERP_OPTIONS
   64.18  PIDFILE=/var/run/openerp/openerp-server.pid
   64.19 @@ -30,44 +30,43 @@
   64.20  case "$1" in
   64.21  	start)
   64.22  		if active_pidfile $PIDFILE python ; then
   64.23 -			echo "$NAME already running (PID: `cat $PIDFILE`)."
   64.24 +			_ '%s is already running.' $NAME
   64.25  			exit 1
   64.26  		fi
   64.27 -		echo -n "Starting $DESC: $NAME... "
   64.28 +		action 'Starting %s: %s...' "$DESC" $NAME
   64.29  		$DAEMON $OPTIONS &
   64.30  		status
   64.31  		sleep 4
   64.32 -		# At boot OpenERP dont start correctly if we start it in background.
   64.33 +		# At boot OpenERP don't start correctly if we start it in background.
   64.34  		if ! active_pidfile $PIDFILE python ; then
   64.35  			sleep 6
   64.36  			$DAEMON $OPTIONS > $LOGFILE
   64.37  		fi ;;
   64.38  	stop)
   64.39  		if ! active_pidfile $PIDFILE python ; then
   64.40 -			echo "$NAME is not running."
   64.41 +			_ '%s is not running.' $NAME
   64.42  			exit 1
   64.43  		fi
   64.44 -		echo -n "Stopping $DESC: $NAME... "
   64.45 -		kill `cat $PIDFILE`
   64.46 +		action 'Stopping %s: %s...' "$DESC" $NAME
   64.47 +		kill $(cat $PIDFILE)
   64.48  		rm -f $PIDFILE
   64.49  		status
   64.50  		sleep 2 ;;
   64.51  	restart)
   64.52  		if ! active_pidfile $PIDFILE python ; then
   64.53 -			echo "$NAME is not running."
   64.54 +			_ '%s is not running.' $NAME
   64.55  			exit 1
   64.56  		fi
   64.57 -		echo -n "Restarting $DESC: $NAME... "
   64.58 -		kill `cat $PIDFILE`
   64.59 -		rm -f $PIDFILE 2> /dev/null
   64.60 +		action 'Restarting %s: %s...' "$DESC" $NAME
   64.61 +		kill $(cat $PIDFILE)
   64.62 +		rm -f $PIDFILE 2>/dev/null
   64.63  		sleep 2
   64.64  		$DAEMON $OPTIONS &
   64.65  		status
   64.66  		sleep 2 ;;
   64.67  	*)
   64.68 -		echo ""
   64.69 -		echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   64.70 -		echo ""
   64.71 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   64.72 +		newline
   64.73  		exit 1 ;;
   64.74  esac
   64.75  
    65.1 --- a/openerp-web/stuff/etc/init.d/openerp-web	Wed May 25 23:07:05 2016 +0200
    65.2 +++ b/openerp-web/stuff/etc/init.d/openerp-web	Thu May 26 20:16:45 2016 +0300
    65.3 @@ -1,5 +1,5 @@
    65.4  #!/bin/sh
    65.5 -# /etc/init.d/openerp-web : Start, stop and restart openerp-web server on SliTaz, at 
    65.6 +# /etc/init.d/openerp-web : Start, stop and restart openerp-web server on SliTaz, at
    65.7  # boot time or with the command line.
    65.8  #
    65.9  # To start openerp-web server at boot time, just put etiny in the $RUN_DAEMONS
   65.10 @@ -9,7 +9,7 @@
   65.11  . /etc/daemons.conf
   65.12  
   65.13  NAME=openerp-web
   65.14 -DESC="openerp-web server"
   65.15 +DESC="$(_ 'openerp-web server')"
   65.16  DAEMON=/usr/bin/openerp-web
   65.17  OPTIONS=$OPENERP_WEB_OPTIONS
   65.18  PIDFILE=/var/run/openerp-web.pid
   65.19 @@ -19,37 +19,36 @@
   65.20  case "$1" in
   65.21  	start)
   65.22  		if active_pidfile $PIDFILE $NAME ; then
   65.23 -			echo "$NAME already running."
   65.24 +			_ '%s is already running.' $NAME
   65.25  			exit 1
   65.26  		fi
   65.27 -		echo -n "Starting $DESC: $NAME... "
   65.28 +		action 'Starting %s: %s...' "$DESC" $NAME
   65.29  		$DAEMON $OPTIONS &
   65.30  		status
   65.31  		sleep 2 ;;
   65.32  	stop)
   65.33  		if ! active_pidfile $PIDFILE $NAME ; then
   65.34 -			echo "$NAME is not running."
   65.35 +			_ '%s is not running.' $NAME
   65.36  			exit 1
   65.37  		fi
   65.38 -		echo -n "Stopping $DESC: $NAME... "
   65.39 -		kill `cat $PIDFILE`
   65.40 +		action 'Stopping %s: %s...' "$DESC" $NAME
   65.41 +		kill $(cat $PIDFILE)
   65.42  		status
   65.43  		sleep 2 ;;
   65.44  	restart)
   65.45  		if ! active_pidfile $PIDFILE $NAME ; then
   65.46 -			echo "$NAME is not running."
   65.47 +			_ '%s is not running.' $NAME
   65.48  			exit 1
   65.49  		fi
   65.50 -		echo -n "Restarting $DESC: $NAME... "
   65.51 -		kill `cat $PIDFILE`
   65.52 +		action 'Restarting %s: %s...' "$DESC" $NAME
   65.53 +		kill $(cat $PIDFILE)
   65.54  		sleep 2
   65.55  		$DAEMON $OPTIONS &
   65.56  		status
   65.57  		sleep 2 ;;
   65.58  	*)
   65.59 -		echo ""
   65.60 -		echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   65.61 -		echo ""
   65.62 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   65.63 +		newline
   65.64  		exit 1 ;;
   65.65  esac
   65.66  
    66.1 --- a/openldap/stuff/etc/init.d/openldap	Wed May 25 23:07:05 2016 +0200
    66.2 +++ b/openldap/stuff/etc/init.d/openldap	Thu May 26 20:16:45 2016 +0300
    66.3 @@ -1,5 +1,5 @@
    66.4  #!/bin/sh
    66.5 -# /etc/init.d/openldap : Start, stop and restart LDAP server on SliTaz, at 
    66.6 +# /etc/init.d/openldap : Start, stop and restart LDAP server on SliTaz, at
    66.7  # boot time or with the command line.
    66.8  #
    66.9  # To start LDAP server at boot time, just put openldap in the $RUN_DAEMONS
   66.10 @@ -9,7 +9,7 @@
   66.11  . /etc/daemons.conf
   66.12  
   66.13  NAME=Openldap
   66.14 -DESC="LDAP server"
   66.15 +DESC="$(_ '%s server' LDAP)"
   66.16  DAEMON=/usr/lib/openldap/slapd
   66.17  OPTIONS=$LDAP_OPTIONS
   66.18  PIDFILE=/var/lib/openldap/run/slapd.pid
   66.19 @@ -17,43 +17,42 @@
   66.20  case "$1" in
   66.21    start)
   66.22      if active_pidfile $PIDFILE slapd ; then
   66.23 -      echo "$NAME already running."
   66.24 +      _ '%s is already running.' $NAME
   66.25        exit 1
   66.26      fi
   66.27 -    echo -n "Starting $DESC: $NAME... "
   66.28 +    action 'Starting %s: %s...' "$DESC" $NAME
   66.29      $DAEMON $OPTIONS && sleep 2
   66.30      status
   66.31      for i in /etc/ldap.d/* ; do
   66.32 -      	[ -x $i ] || continue
   66.33 -      	echo -n "Running $i..."
   66.34 -      	$i
   66.35 -      	status
   66.36 +      [ -x $i ] || continue
   66.37 +      action 'Running %s...' $i
   66.38 +      $i
   66.39 +      status
   66.40      done
   66.41      ;;
   66.42    stop)
   66.43      if ! active_pidfile $PIDFILE slapd ; then
   66.44 -      echo "$NAME is not running."
   66.45 +      _ '%s is not running.' $NAME
   66.46        exit 1
   66.47      fi
   66.48 -    echo -n "Stopping $DESC: $NAME... "
   66.49 -    kill `cat $PIDFILE`
   66.50 +    action 'Stopping %s: %s...' "$DESC" $NAME
   66.51 +    kill $(cat $PIDFILE)
   66.52      status
   66.53      ;;
   66.54    restart)
   66.55      if ! active_pidfile $PIDFILE slapd ; then
   66.56 -      echo "$NAME is not running."
   66.57 +      _ '%s is not running.' $NAME
   66.58        exit 1
   66.59      fi
   66.60 -    echo -n "Restarting $DESC: $NAME... "
   66.61 -    kill `cat $PIDFILE`
   66.62 +    action 'Restarting %s: %s...' "$DESC" $NAME
   66.63 +    kill $(cat $PIDFILE)
   66.64      sleep 2
   66.65      $DAEMON $OPTIONS && sleep 2
   66.66      status
   66.67      ;;
   66.68    *)
   66.69 -    echo ""
   66.70 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   66.71 -    echo ""
   66.72 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   66.73 +    newline
   66.74      exit 1
   66.75      ;;
   66.76  esac
    67.1 --- a/openssh/stuff/openssh	Wed May 25 23:07:05 2016 +0200
    67.2 +++ b/openssh/stuff/openssh	Thu May 26 20:16:45 2016 +0300
    67.3 @@ -9,7 +9,7 @@
    67.4  . /etc/daemons.conf
    67.5  
    67.6  NAME=OpenSSH
    67.7 -DESC="OpenSSH server"
    67.8 +DESC="$(_ '%s server' OpenSSH)"
    67.9  DAEMON=/usr/sbin/sshd
   67.10  OPTIONS=$OPENSSH_OPTIONS
   67.11  PIDFILE=/var/run/sshd.pid
   67.12 @@ -20,47 +20,47 @@
   67.13  	start)
   67.14  		# We need rsa and dsa host key file to start dropbear.
   67.15  		if [ ! -f /etc/ssh/ssh_host_rsa_key ] ; then
   67.16 -			echo "Generating $NAME rsa key... "
   67.17 +			_ 'Generating OpenSSH %s key... ' rsa
   67.18  			ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -C '' -N ''
   67.19  		fi
   67.20  		if [ ! -f /etc/ssh/ssh_host_dsa_key ] ; then
   67.21 -			echo "Generating $NAME dsa key... "
   67.22 +			_ 'Generating OpenSSH %s key... ' dsa
   67.23  			ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -C '' -N ''
   67.24  		fi
   67.25  		if [ ! -f /etc/ssh/ssh_host_ecdsa_key ] ; then
   67.26 -			echo "Generating $NAME ecdsa key... "
   67.27 +			_ 'Generating OpenSSH %s key... ' ecdsa
   67.28  			ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -C '' -N ''
   67.29  		fi
   67.30  		if active_pidfile $PIDFILE sshd ; then
   67.31 -			echo "$NAME already running."
   67.32 +			_ '%s is already running.' $NAME
   67.33  			exit 1
   67.34  		fi
   67.35 -		action "Starting $DESC: $NAME... "
   67.36 +		action 'Starting %s: %s...' "$DESC" $NAME
   67.37  		$DAEMON $OPTIONS
   67.38  		status
   67.39  		;;
   67.40  	stop)
   67.41  		if ! active_pidfile $PIDFILE sshd ; then
   67.42 -			echo "$NAME is not running."
   67.43 +			_ '%s is not running.' $NAME
   67.44  			exit 1
   67.45  		fi
   67.46 -		action "Stopping $DESC: $NAME... "
   67.47 +		action 'Stopping %s: %s...' "$DESC" $NAME
   67.48  		kill $(cat $PIDFILE)
   67.49  		status
   67.50  		;;
   67.51  	restart)
   67.52  		if ! active_pidfile $PIDFILE sshd ; then
   67.53 -			echo "$NAME is not running."
   67.54 +			_ '%s is not running.' $NAME
   67.55  			exit 1
   67.56  		fi
   67.57 -		action "Restarting $DESC: $NAME... "
   67.58 +		action 'Restarting %s: %s...' "$DESC" $NAME
   67.59  		kill $(cat $PIDFILE)
   67.60  		sleep 2
   67.61  		$DAEMON $OPTIONS
   67.62  		status
   67.63  		;;
   67.64  	*)
   67.65 -		emsg "<n><b>Usage:</b> /etc/init.d/$(basename $0) [start|stop|restart]"
   67.66 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   67.67  		newline
   67.68  		exit 1
   67.69  		;;
    68.1 --- a/openvpn/stuff/etc/init.d/openvpn-client	Wed May 25 23:07:05 2016 +0200
    68.2 +++ b/openvpn/stuff/etc/init.d/openvpn-client	Thu May 26 20:16:45 2016 +0300
    68.3 @@ -9,7 +9,7 @@
    68.4  . /etc/daemons.conf
    68.5  
    68.6  NAME=OpenVPN
    68.7 -DESC="VPN daemon"
    68.8 +DESC="$(_ '%s daemon' VPN)"
    68.9  DAEMON=/usr/sbin/openvpn
   68.10  OPTIONS=$OPENVPN_OPTIONS
   68.11  PIDFILE=/var/run/openvpni-client.pid
   68.12 @@ -17,60 +17,60 @@
   68.13  checktundevice() {
   68.14  	if [ ! -e /dev/net/tun ]; then
   68.15  		if ! modprobe tun ; then
   68.16 -			echo -n "TUN/TAP support is not available in this kernel"
   68.17 +			_ 'TUN/TAP support is not available in this Kernel'
   68.18  			return 1
   68.19  		fi
   68.20  	fi
   68.21 -	if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then
   68.22 -		echo -n "Detected broken /dev/net/tun symlink, fixing..."
   68.23 +	if [ -h /dev/net/tun -a -c /dev/misc/net/tun ]; then
   68.24 +		_ 'Detected broken %s symlink, fixing...' '/dev/net/tun'
   68.25  		rm -f /dev/net/tun
   68.26  		ln -s /dev/misc/net/tun /dev/net/tun
   68.27  	fi
   68.28  }
   68.29  
   68.30  [ -d /var/run/openvpn ] || mkdir -p /var/run/openvpn
   68.31 +
   68.32  case "$1" in
   68.33    start)
   68.34      checktundevice
   68.35  
   68.36      if [ ! -e /etc/openvpn/client.conf ]; then
   68.37 -	echo "Missing OpenVPN client config."
   68.38 +      _ 'Missing OpenVPN client config.'
   68.39      exit 1
   68.40      fi
   68.41      if active_pidfile $PIDFILE openvpn ; then
   68.42 -      echo "$NAME already running."
   68.43 +      _ '%s is already running.' $NAME
   68.44        exit 1
   68.45      fi
   68.46 -    echo -n "Starting $DESC: $NAME... "
   68.47 +    action 'Starting %s: %s...' "$DESC" $NAME
   68.48      $DAEMON --client $OPTIONS
   68.49      status
   68.50      ;;
   68.51    stop)
   68.52      if ! active_pidfile $PIDFILE openvpn ; then
   68.53 -      echo "$NAME is not running."
   68.54 +      _ '%s is not running.' $NAME
   68.55        exit 1
   68.56      fi
   68.57 -    echo -n "Stopping $DESC: $NAME... "
   68.58 -    kill `cat $PIDFILE`
   68.59 +    action 'Stopping %s: %s...' "$DESC" $NAME
   68.60 +    kill $(cat $PIDFILE)
   68.61      rm $PIDFILE
   68.62      status
   68.63      ;;
   68.64    restart)
   68.65      if ! active_pidfile $PIDFILE openvpn ; then
   68.66 -      echo "$NAME is not running."
   68.67 +      _ '%s is not running.' $NAME
   68.68        exit 1
   68.69      fi
   68.70 -    echo -n "Restarting $DESC: $NAME... "
   68.71 -    kill `cat $PIDFILE`
   68.72 +    action 'Restarting %s: %s...' "$DESC" $NAME
   68.73 +    kill $(cat $PIDFILE)
   68.74      rm $PIDFILE
   68.75      sleep 2
   68.76      $DAEMON --client $OPTIONS
   68.77      status
   68.78      ;;
   68.79    *)
   68.80 -    echo ""
   68.81 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   68.82 -    echo ""
   68.83 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   68.84 +    newline
   68.85      exit 1
   68.86      ;;
   68.87  esac
    69.1 --- a/openvpn/stuff/etc/init.d/openvpn-server	Wed May 25 23:07:05 2016 +0200
    69.2 +++ b/openvpn/stuff/etc/init.d/openvpn-server	Thu May 26 20:16:45 2016 +0300
    69.3 @@ -9,7 +9,7 @@
    69.4  . /etc/daemons.conf
    69.5  
    69.6  NAME=OpenVPN
    69.7 -DESC="VPN daemon"
    69.8 +DESC="$(_ '%s daemon' VPN)"
    69.9  DAEMON=/usr/sbin/openvpn
   69.10  OPTIONS=$OPENVPN_OPTIONS
   69.11  PIDFILE=/var/run/openvpn-server.pid
   69.12 @@ -17,60 +17,60 @@
   69.13  checktundevice() {
   69.14  	if [ ! -e /dev/net/tun ]; then
   69.15  		if ! modprobe tun ; then
   69.16 -			echo -n "TUN/TAP support is not available in this kernel"
   69.17 +			_ 'TUN/TAP support is not available in this Kernel'
   69.18  			return 1
   69.19  		fi
   69.20  	fi
   69.21 -	if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then
   69.22 -		echo -n "Detected broken /dev/net/tun symlink, fixing..."
   69.23 +	if [ -h /dev/net/tun -a -c /dev/misc/net/tun ]; then
   69.24 +		_ 'Detected broken %s symlink, fixing...' '/dev/net/tun'
   69.25  		rm -f /dev/net/tun
   69.26  		ln -s /dev/misc/net/tun /dev/net/tun
   69.27  	fi
   69.28  }
   69.29  
   69.30  [ -d /var/run/openvpn ] || mkdir -p /var/run/openvpn
   69.31 +
   69.32  case "$1" in
   69.33    start)
   69.34      checktundevice
   69.35  
   69.36      if [ ! -e /etc/openvpn/server.conf ]; then
   69.37 -	echo "Missing OpenVPN server config."
   69.38 -	exit 1
   69.39 +      _ 'Missing OpenVPN server config.'
   69.40 +      exit 1
   69.41      fi
   69.42      if active_pidfile $PIDFILE openvpn ; then
   69.43 -      echo "$NAME already running."
   69.44 +      _ '%s is already running.' $NAME
   69.45        exit 1
   69.46      fi
   69.47 -    echo -n "Starting $DESC: $NAME... "
   69.48 +    action 'Starting %s: %s...' "$DESC" $NAME
   69.49      $DAEMON $OPTIONS
   69.50      status
   69.51      ;;
   69.52    stop)
   69.53      if ! active_pidfile $PIDFILE openvpn ; then
   69.54 -      echo "$NAME is not running."
   69.55 +      _ '%s is not running.' $NAME
   69.56        exit 1
   69.57      fi
   69.58 -    echo -n "Stopping $DESC: $NAME... "
   69.59 -    kill `cat $PIDFILE`
   69.60 +    action 'Stopping %s: %s...' "$DESC" $NAME
   69.61 +    kill $(cat $PIDFILE)
   69.62      rm $PIDFILE
   69.63      status
   69.64      ;;
   69.65    restart)
   69.66      if ! active_pidfile $PIDFILE openvpn ; then
   69.67 -      echo "$NAME is not running."
   69.68 +      _ '%s is not running.' $NAME
   69.69        exit 1
   69.70      fi
   69.71 -    echo -n "Restarting $DESC: $NAME... "
   69.72 -    kill `cat $PIDFILE`
   69.73 +    action 'Restarting %s: %s...' "$DESC" $NAME
   69.74 +    kill $(cat $PIDFILE)
   69.75      rm $PIDFILE
   69.76      sleep 2
   69.77      $DAEMON $OPTIONS
   69.78      status
   69.79      ;;
   69.80    *)
   69.81 -    echo ""
   69.82 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   69.83 -    echo ""
   69.84 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   69.85 +    newline
   69.86      exit 1
   69.87      ;;
   69.88  esac
    70.1 --- a/partimage/stuff/etc/init.d/partimaged	Wed May 25 23:07:05 2016 +0200
    70.2 +++ b/partimage/stuff/etc/init.d/partimaged	Thu May 26 20:16:45 2016 +0300
    70.3 @@ -9,7 +9,7 @@
    70.4  . /etc/daemons.conf
    70.5  
    70.6  NAME=partimaged
    70.7 -DESC="Partimage Server"
    70.8 +DESC="$(_ '%s server' Partimage)"
    70.9  DAEMON=/usr/sbin/partimaged
   70.10  IMAGES_DIR=/var/lib/partimaged
   70.11  OPTIONS="-D -d ${IMAGES_DIR}"
   70.12 @@ -17,45 +17,43 @@
   70.13  
   70.14  
   70.15  test -f $DAEMON || exit 0
   70.16 -	
   70.17 -	
   70.18 -	
   70.19 +
   70.20  case "$1" in
   70.21 -    start)
   70.22 -	if active_pidfile $PIDFILE $NAME ; then
   70.23 -      		echo "$NAME already running."
   70.24 -      		exit 1
   70.25 -    	fi
   70.26 -		
   70.27 -		check_conf
   70.28 -    	echo -n "Starting $DESC: $NAME... "
   70.29 -    	$DAEMON $OPTIONS
   70.30 -    	status
   70.31 -    	
   70.32 -    	# registering PID
   70.33 -    	if [ $? -eq 0 ]; then
   70.34 -   		pidof -s $NAME > $PIDFILE
   70.35 -    	fi
   70.36 -	;;
   70.37 -    stop)
   70.38 -	if ! active_pidfile $PIDFILE $NAME ; then
   70.39 -           echo "$NAME is not running."
   70.40 -           exit 1
   70.41 -        fi
   70.42 -        echo -n "Stopping $DESC: $NAME... "
   70.43 -        kill `cat $PIDFILE`
   70.44 -        rm -f $PIDFILE
   70.45 -        status
   70.46 -	;;
   70.47 -    restart)
   70.48 -        $0 stop
   70.49 -        $0 start
   70.50 -	;;
   70.51 -    *)
   70.52 -		echo "Usage: $DAEMON {start|stop|reload|restart}"
   70.53 -		exit 1
   70.54 -	;;
   70.55 +  start)
   70.56 +    if active_pidfile $PIDFILE $NAME ; then
   70.57 +      _ '%s is already running.' $NAME
   70.58 +      exit 1
   70.59 +    fi
   70.60 +
   70.61 +    check_conf
   70.62 +    action 'Starting %s: %s...' "$DESC" $NAME
   70.63 +    $DAEMON $OPTIONS
   70.64 +    status
   70.65 +
   70.66 +    # registering PID
   70.67 +    if [ $? -eq 0 ]; then
   70.68 +      pidof -s $NAME > $PIDFILE
   70.69 +    fi
   70.70 +    ;;
   70.71 +  stop)
   70.72 +    if ! active_pidfile $PIDFILE $NAME ; then
   70.73 +      _ '%s is not running.' $NAME
   70.74 +      exit 1
   70.75 +    fi
   70.76 +    action 'Stopping %s: %s...' "$DESC" $NAME
   70.77 +    kill $(cat $PIDFILE)
   70.78 +    rm -f $PIDFILE
   70.79 +    status
   70.80 +    ;;
   70.81 +  restart)
   70.82 +    $0 stop
   70.83 +    $0 start
   70.84 +    ;;
   70.85 +  *)
   70.86 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   70.87 +    newline
   70.88 +    exit 1
   70.89 +    ;;
   70.90  esac
   70.91  
   70.92  exit 0
   70.93 -
    71.1 --- a/pcsc-lite/stuff/init.d/pcscd	Wed May 25 23:07:05 2016 +0200
    71.2 +++ b/pcsc-lite/stuff/init.d/pcscd	Thu May 26 20:16:45 2016 +0300
    71.3 @@ -7,25 +7,26 @@
    71.4  . /etc/daemons.conf
    71.5  
    71.6  NAME=Pcscd
    71.7 -DESC="PC/SC smart card daemon"
    71.8 +DESC="$(_ 'PC/SC smart card daemon')"
    71.9  DAEMON=/usr/sbin/pcscd
   71.10  PIDFILE=/run/pcscd/pcscd.pid
   71.11  
   71.12  case "$1" in
   71.13  	start)
   71.14  		if active_pidfile $PIDFILE pcscd ; then
   71.15 -			echo "$NAME already running."
   71.16 +			_ '%s is already running.' $NAME
   71.17  			exit 1
   71.18  		fi
   71.19 -		echo "Starting $DESC: $NAME... "
   71.20 +		action 'Starting %s: %s...' "$DESC" $NAME
   71.21  		mkdir -p $(dirname $PIDFILE)
   71.22 -		$DAEMON $PCSCD_OPTIONS ;;
   71.23 +		$DAEMON $PCSCD_OPTIONS
   71.24 +		status ;;
   71.25  	stop)
   71.26  		if ! active_pidfile $PIDFILE pcscd ; then
   71.27 -			echo "$NAME is not running."
   71.28 +			_ '%s is not running.' $NAME
   71.29  			exit 1
   71.30  		fi
   71.31 -		echo -n "Stopping $DESC: $NAME... "
   71.32 +		action 'Stopping %s: %s...' "$DESC" $NAME
   71.33  		kill $(cat $PIDFILE)
   71.34  		[ -e $PIDFILE ] && rm -f $PIDFILE
   71.35  		status ;;
   71.36 @@ -34,9 +35,8 @@
   71.37  		sleep 2
   71.38  		$0 start ;;
   71.39  	*)
   71.40 -		echo ""
   71.41 -		echo -e "\033[1mUsage:\033[0m /etc/init.d/$(basename $0) [start|stop|restart]"
   71.42 -		echo ""
   71.43 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   71.44 +		newline
   71.45  		exit 1 ;;
   71.46  esac
   71.47  
    72.1 --- a/perdition/stuff/etc/init.d/perdition	Wed May 25 23:07:05 2016 +0200
    72.2 +++ b/perdition/stuff/etc/init.d/perdition	Thu May 26 20:16:45 2016 +0300
    72.3 @@ -10,7 +10,7 @@
    72.4  . /etc/daemons.conf
    72.5  
    72.6  NAME=Perdition
    72.7 -DESC="IMAP/POP3 proxy server"
    72.8 +DESC="$(_ 'IMAP/POP3 proxy server')"
    72.9  DAEMON=/usr/sbin/perdition
   72.10  OPTIONS=$PERDITION_OPTIONS
   72.11  PIDFILE=/var/run/perdition
   72.12 @@ -22,12 +22,12 @@
   72.13      for i in $PROTOCOLS; do
   72.14        [ -s /etc/perdition/perdition.$i.conf ] || continue
   72.15        if active_pidfile $PIDFILE.$i/perdition.$i.pid perdition.$i ; then
   72.16 -        echo "$NAME ($i) already running."
   72.17 -	continue
   72.18 +        _ '%s is already running.' "$NAME ($i)"
   72.19 +        continue
   72.20        fi
   72.21 -      echo -n "Starting $DESC: $NAME ($i)... "
   72.22 +      action 'Starting %s: %s...' "$DESC" "$NAME ($i)"
   72.23        $DAEMON.$i -f /etc/perdition/perdition.$i.conf $OPTIONS \
   72.24 -		--pid_file $PIDFILE.$i/perdition.$i.pid
   72.25 +        --pid_file $PIDFILE.$i/perdition.$i.pid
   72.26        status
   72.27      done
   72.28      ;;
   72.29 @@ -35,11 +35,11 @@
   72.30      for i in $PROTOCOLS; do
   72.31        [ -s /etc/perdition/perdition.$i.conf ] || continue
   72.32        if ! active_pidfile $PIDFILE.$i/perdition.$i.pid perdition.$i ; then
   72.33 -        echo "$NAME ($i) is not running."
   72.34 -	continue
   72.35 +        _ '%s is not running.' "$NAME ($i)"
   72.36 +        continue
   72.37        fi
   72.38 -      echo -n "Stopping $DESC: $NAME ($i)... "
   72.39 -      kill `cat $PIDFILE.$i/perdition.$i.pid`
   72.40 +      action 'Stopping %s: %s...' "$DESC" "$NAME ($i)"
   72.41 +      kill $(cat $PIDFILE.$i/perdition.$i.pid)
   72.42        status
   72.43      done
   72.44      ;;
   72.45 @@ -47,14 +47,14 @@
   72.46      for i in $PROTOCOLS; do
   72.47        [ -s /etc/perdition/perdition.$i.conf ] || continue
   72.48        if ! active_pidfile $PIDFILE.$i/perdition.$i.pid perdition.$i ; then
   72.49 -        echo "$NAME ($i) is not running."
   72.50 -	continue
   72.51 +        _ '%s is not running.' "$NAME ($i)"
   72.52 +        continue
   72.53        fi
   72.54 -      echo -n "Restarting $DESC: $NAME ($i)... "
   72.55 -      kill `cat $PIDFILE.$i/perdition.$i.pid`
   72.56 +      action 'Restarting %s: %s...' "$DESC" "$NAME ($i)"
   72.57 +      kill $(cat $PIDFILE.$i/perdition.$i.pid)
   72.58        sleep 2
   72.59        $DAEMON.$i -f /etc/perdition/perdition.$i.conf $OPTIONS \
   72.60 -		--pid_file $PIDFILE.$i/perdition.$i.pid
   72.61 +        --pid_file $PIDFILE.$i/perdition.$i.pid
   72.62        status
   72.63      done
   72.64      ;;
   72.65 @@ -62,14 +62,13 @@
   72.66      for i in $PROTOCOLS; do
   72.67        [ -s /etc/perdition/perdition.$i.conf ] || continue
   72.68        active_pidfile $PIDFILE.$i/perdition.$i.pid perdition.$i && \
   72.69 -		kill -1 `cat $PIDFILE.$i/perdition.$i.pid`
   72.70 +        kill -1 $(cat $PIDFILE.$i/perdition.$i.pid)
   72.71        status
   72.72      done
   72.73      ;;
   72.74    *)
   72.75 -    echo ""
   72.76 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart|reload]"
   72.77 -    echo ""
   72.78 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart|reload]"
   72.79 +    newline
   72.80      exit 1
   72.81      ;;
   72.82  esac
    73.1 --- a/phpvirtualbox/stuff/etc/init.d/vboxwebsrv	Wed May 25 23:07:05 2016 +0200
    73.2 +++ b/phpvirtualbox/stuff/etc/init.d/vboxwebsrv	Thu May 26 20:16:45 2016 +0300
    73.3 @@ -1,5 +1,5 @@
    73.4  #!/bin/sh
    73.5 -# Start, stop and restart vboxwebsrv deamon on SliTaz, at boot time or 
    73.6 +# Start, stop and restart vboxwebsrv deamon on SliTaz, at boot time or
    73.7  # with the command line.
    73.8  #
    73.9  # To start daemon at boot time, just put vboxwebsrv in the $RUN_DAEMONS
   73.10 @@ -8,7 +8,7 @@
   73.11  . /etc/init.d/rc.functions
   73.12  
   73.13  NAME=$(basename $0)
   73.14 -DESC="$NAME deamon"
   73.15 +DESC="$(_ '%s daemon' $NAME)"
   73.16  DAEMON=$(which $NAME)
   73.17  OPTIONS="-b --logfile /dev/null"
   73.18  eval $(grep -i ^${NAME}_OPTIONS /etc/daemons.conf | sed 's/.*_OPT/OPT/')
   73.19 @@ -17,41 +17,40 @@
   73.20  case "$1" in
   73.21    start)
   73.22      if active_pidfile $PIDFILE $NAME ; then
   73.23 -      echo "$NAME is already running."
   73.24 +      _ '%s is already running.' $NAME
   73.25        exit 1
   73.26      fi
   73.27 -    echo -n "Starting $DESC: $NAME... "
   73.28 -    $DAEMON $OPTIONS > /dev/null 2>&1
   73.29 -    [ -f $PIDFILE ] || pidof $NAME | awk '{ print $1 }' > $PIDFILE
   73.30 +    action 'Starting %s: %s...' "$DESC" $NAME
   73.31 +    $DAEMON $OPTIONS >/dev/null 2>&1
   73.32 +    [ -f $PIDFILE ] || pidof $NAME | awk '{print $1}' > $PIDFILE
   73.33      active_pidfile $PIDFILE $NAME
   73.34      status
   73.35      ;;
   73.36    stop)
   73.37      if ! active_pidfile $PIDFILE $NAME ; then
   73.38 -      echo "$NAME is not running."
   73.39 +      _ '%s is not running.' $NAME
   73.40        exit 1
   73.41      fi
   73.42 -    echo -n "Stopping $DESC: $NAME... "
   73.43 -    kill `cat $PIDFILE`
   73.44 +    action 'Stopping %s: %s...' "$DESC" $NAME
   73.45 +    kill $(cat $PIDFILE)
   73.46      status
   73.47      ;;
   73.48    restart)
   73.49      if ! active_pidfile $PIDFILE $NAME ; then
   73.50 -      echo "$NAME is not running."
   73.51 +      _ '%s is not running.' $NAME
   73.52        exit 1
   73.53      fi
   73.54 -    echo -n "Restarting $DESC: $NAME... "
   73.55 -    kill `cat $PIDFILE`
   73.56 +    action 'Restarting %s: %s...' "$DESC" $NAME
   73.57 +    kill $(cat $PIDFILE)
   73.58      sleep 2
   73.59 -    $DAEMON $OPTIONS > /dev/null 2>&1
   73.60 -    [ -f $PIDFILE ] || pidof $NAME | awk '{ print $1 }' > $PIDFILE
   73.61 +    $DAEMON $OPTIONS >/dev/null 2>&1
   73.62 +    [ -f $PIDFILE ] || pidof $NAME | awk '{print $1}' > $PIDFILE
   73.63      active_pidfile $PIDFILE $NAME
   73.64      status
   73.65      ;;
   73.66 -*)
   73.67 -    echo ""
   73.68 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   73.69 -    echo ""
   73.70 +  *)
   73.71 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   73.72 +    newline
   73.73      exit 1
   73.74      ;;
   73.75  esac
    74.1 --- a/portmap/stuff/init.d/portmap	Wed May 25 23:07:05 2016 +0200
    74.2 +++ b/portmap/stuff/init.d/portmap	Thu May 26 20:16:45 2016 +0300
    74.3 @@ -9,7 +9,7 @@
    74.4  . /etc/daemons.conf
    74.5  
    74.6  NAME=portmap
    74.7 -DESC="RPC portmapper"
    74.8 +DESC="$(_ 'RPC portmapper')"
    74.9  DAEMON=/usr/sbin/portmap
   74.10  OPTIONS=
   74.11  PIDFILE=/var/run/$NAME.pid
   74.12 @@ -18,55 +18,54 @@
   74.13  test -f $DAEMON || exit 0
   74.14  
   74.15  case "$1" in
   74.16 -    start)
   74.17 -	if active_pidfile $PIDFILE portmap ; then
   74.18 -      		echo "$NAME already running."
   74.19 -      		exit 1
   74.20 -    	fi
   74.21 +  start)
   74.22 +    if active_pidfile $PIDFILE portmap ; then
   74.23 +      _ '%s is already running.' $NAME
   74.24 +      exit 1
   74.25 +    fi
   74.26  
   74.27 -    	echo -n "Starting $DESC: $NAME... "
   74.28 -    	$DAEMON $OPTIONS
   74.29 -    	
   74.30 -    	# registering PID
   74.31 -    	if [ $? -eq 0 ]; then
   74.32 -    		pidof -s $NAME > $PIDFILE
   74.33 -    	fi
   74.34 -    	status
   74.35 - 
   74.36 -	if [ -f /var/run/portmap.upgrade-state ]; then
   74.37 -          echo -n "Restoring old RPC service information..."
   74.38 -          sleep 1 # needs a short pause or pmap_set won't work. :(
   74.39 -	  pmap_set </var/run/portmap.upgrade-state
   74.40 -	  rm -f /var/run/portmap.upgrade-state
   74.41 -          echo "done."
   74.42 -        fi
   74.43 +    action 'Starting %s: %s...' "$DESC" $NAME
   74.44 +    $DAEMON $OPTIONS
   74.45  
   74.46 -	;;
   74.47 -    stop)
   74.48 -	if ! active_pidfile $PIDFILE portmap ; then
   74.49 -           echo "$NAME is not running."
   74.50 -           exit 1
   74.51 -        fi
   74.52 -        echo -n "Stopping $DESC: $NAME... "
   74.53 -        kill `cat $PIDFILE`
   74.54 -        rm -f $PIDFILE
   74.55 -        status
   74.56 -	;;
   74.57 -    restart)
   74.58 -	pmap_dump >/var/run/portmap.state
   74.59 -        $0 stop
   74.60 -        $0 start
   74.61 -	if [ ! -f /var/run/portmap.upgrade-state ]; then
   74.62 -       		sleep 1
   74.63 - 		pmap_set </var/run/portmap.state
   74.64 -	fi
   74.65 -	rm -f /var/run/portmap.state
   74.66 -	;;
   74.67 -    *)
   74.68 -		echo "Usage: $DAEMON {start|stop|reload|restart}"
   74.69 -		exit 1
   74.70 -	;;
   74.71 +    # registering PID
   74.72 +    if [ $? -eq 0 ]; then
   74.73 +      pidof -s $NAME > $PIDFILE
   74.74 +    fi
   74.75 +    status
   74.76 +
   74.77 +    if [ -f /var/run/portmap.upgrade-state ]; then
   74.78 +      action 'Restoring old RPC service information...'
   74.79 +      sleep 1 # needs a short pause or pmap_set won't work. :(
   74.80 +      pmap_set </var/run/portmap.upgrade-state
   74.81 +      rm -f /var/run/portmap.upgrade-state
   74.82 +      status
   74.83 +    fi
   74.84 +    ;;
   74.85 +  stop)
   74.86 +    if ! active_pidfile $PIDFILE portmap ; then
   74.87 +      _ '%s is not running.' $NAME
   74.88 +      exit 1
   74.89 +    fi
   74.90 +    action 'Stopping %s: %s...' "$DESC" $NAME
   74.91 +    kill $(cat $PIDFILE)
   74.92 +    rm -f $PIDFILE
   74.93 +    status
   74.94 +    ;;
   74.95 +  restart)
   74.96 +    pmap_dump >/var/run/portmap.state
   74.97 +    $0 stop
   74.98 +    $0 start
   74.99 +    if [ ! -f /var/run/portmap.upgrade-state ]; then
  74.100 +      sleep 1
  74.101 +      pmap_set </var/run/portmap.state
  74.102 +    fi
  74.103 +    rm -f /var/run/portmap.state
  74.104 +    ;;
  74.105 +  *)
  74.106 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
  74.107 +    newline
  74.108 +    exit 1
  74.109 +    ;;
  74.110  esac
  74.111  
  74.112  exit 0
  74.113 -
    75.1 --- a/postfix/stuff/etc/init.d/postfix	Wed May 25 23:07:05 2016 +0200
    75.2 +++ b/postfix/stuff/etc/init.d/postfix	Thu May 26 20:16:45 2016 +0300
    75.3 @@ -9,7 +9,7 @@
    75.4  . /etc/daemons.conf
    75.5  
    75.6  NAME=Postfix
    75.7 -DESC="SMTP server"
    75.8 +DESC="$(_ '%s server' SMTP)"
    75.9  DAEMON=/usr/lib/postfix/master
   75.10  OPTIONS=$POSTFIX_OPTIONS
   75.11  PIDFILE=/var/spool/postfix/pid/master.pid
   75.12 @@ -17,47 +17,46 @@
   75.13  case "$1" in
   75.14    start)
   75.15      if active_pidfile $PIDFILE master ; then
   75.16 -      echo "$NAME already running."
   75.17 +      _ '%s is already running.' $NAME
   75.18        exit 1
   75.19      fi
   75.20 -    echo -n "Starting $DESC: $NAME... "
   75.21 +    action 'Starting %s: %s...' "$DESC" $NAME
   75.22      $DAEMON $OPTIONS &
   75.23      status
   75.24      ;;
   75.25    stop)
   75.26      if ! active_pidfile $PIDFILE master ; then
   75.27 -      echo "$NAME is not running."
   75.28 +      _ '%s is not running.' $NAME
   75.29        exit 1
   75.30      fi
   75.31 -    echo -n "Stopping $DESC: $NAME... "
   75.32 -    kill `cat $PIDFILE` && rm -f $PIDFILE
   75.33 +    action 'Stopping %s: %s...' "$DESC" $NAME
   75.34 +    kill $(cat $PIDFILE) && rm -f $PIDFILE
   75.35      status
   75.36      ;;
   75.37    restart)
   75.38      if ! active_pidfile $PIDFILE master ; then
   75.39 -      echo "$NAME is not running."
   75.40 +      _ '%s is not running.' $NAME
   75.41        exit 1
   75.42      fi
   75.43 -    echo -n "Restarting $DESC: $NAME... "
   75.44 -    kill `cat $PIDFILE` && rm -f $PIDFILE
   75.45 +    action 'Restarting %s: %s...' "$DESC" $NAME
   75.46 +    kill $(cat $PIDFILE) && rm -f $PIDFILE
   75.47      sleep 2
   75.48      $DAEMON $OPTIONS &
   75.49      status
   75.50      ;;
   75.51    reload)
   75.52      if ! active_pidfile $PIDFILE master ; then
   75.53 -      echo "$NAME is not running."
   75.54 +      _ '%s is not running.' $NAME
   75.55        exit 1
   75.56      fi
   75.57      postsuper active || exit 1
   75.58 -    kill -HUP `cat $PIDFILE`
   75.59 +    kill -HUP $(cat $PIDFILE)
   75.60      postsuper &
   75.61      status
   75.62      ;;
   75.63    *)
   75.64 -    echo ""
   75.65 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart|reload]"
   75.66 -    echo ""
   75.67 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart|reload]"
   75.68 +    newline
   75.69      exit 1
   75.70      ;;
   75.71  esac
    76.1 --- a/postgresql/stuff/etc/init.d/postgresql	Wed May 25 23:07:05 2016 +0200
    76.2 +++ b/postgresql/stuff/etc/init.d/postgresql	Thu May 26 20:16:45 2016 +0300
    76.3 @@ -9,7 +9,7 @@
    76.4  . /etc/daemons.conf
    76.5  
    76.6  NAME=Postgresql
    76.7 -DESC="PostgreSQL server"
    76.8 +DESC="$(_ '%s server' PostgreSQL)"
    76.9  OPTIONS=$PGSQL_OPTIONS
   76.10  INIT_OPTIONS=$PGSQLINIT_OPTIONS
   76.11  [ -n "$OPTIONS" ] || OPTIONS="-D /var/lib/pgsql -s"
   76.12 @@ -18,42 +18,41 @@
   76.13  case "$1" in
   76.14    start)
   76.15      if [ ! -f /var/lib/pgsql/PG_VERSION ]; then
   76.16 -        echo "Initializing $DESC database"
   76.17 -	rm -rf /var/lib/pgsql/* 2> /dev/null
   76.18 -        su -c "initdb $INIT_OPTIONS" - postgres
   76.19 +      _ 'Initializing PostgreSQL server database'
   76.20 +      rm -rf /var/lib/pgsql/* 2>/dev/null
   76.21 +      su -c "initdb $INIT_OPTIONS" - postgres
   76.22      fi
   76.23 -    echo -n "Starting $DESC: $NAME... "
   76.24 +    action 'Starting %s: %s...' "$DESC" $NAME
   76.25      su -c "pg_ctl start -w $OPTIONS -l /var/log/postgresql/postgresql.log" - postgres
   76.26      status
   76.27      sleep 2
   76.28      for i in /etc/pgsql.d/* ; do
   76.29 -      	    [ -x $i ] || continue
   76.30 -      	    echo -n "Running $i..."
   76.31 -      	    $i
   76.32 -      	    status
   76.33 +      [ -x $i ] || continue
   76.34 +      action 'Running %s...' $i
   76.35 +      $i
   76.36 +      status
   76.37      done
   76.38 -# su -c "createdb test" - postgres
   76.39 -# su -c "psql test" - postgres
   76.40 +    # su -c "createdb test" - postgres
   76.41 +    # su -c "psql test" - postgres
   76.42      ;;
   76.43    stop)
   76.44 -    echo -n "Stopping $DESC: $NAME... "
   76.45 +    action 'Stopping %s: %s...' "$DESC" $NAME
   76.46      su -c "pg_ctl stop $OPTIONS -m smart" - postgres
   76.47      status
   76.48      ;;
   76.49    restart)
   76.50 -    echo -n "Restarting $DESC: $NAME... "
   76.51 +    action 'Restarting %s: %s...' "$DESC" $NAME
   76.52      su -c "pg_ctl restart $OPTIONS -m smart" - postgres
   76.53      status
   76.54      ;;
   76.55    reload)
   76.56 -    echo -n "Reloading $DESC: $NAME... "
   76.57 +    action 'Reloading %s: %s...' "$DESC" $NAME
   76.58      su -c "pg_ctl reload $OPTIONS" - postgres
   76.59      status
   76.60      ;;
   76.61    *)
   76.62 -    echo ""
   76.63 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart|reload]"
   76.64 -    echo ""
   76.65 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart|reload]"
   76.66 +    newline
   76.67      exit 1
   76.68      ;;
   76.69  esac
    77.1 --- a/postgrey/stuff/etc/init.d/postgrey	Wed May 25 23:07:05 2016 +0200
    77.2 +++ b/postgrey/stuff/etc/init.d/postgrey	Thu May 26 20:16:45 2016 +0300
    77.3 @@ -1,5 +1,5 @@
    77.4  #!/bin/sh
    77.5 -# /etc/init.d/postgrey : Start, stop and restart Grey list server on SliTaz, at 
    77.6 +# /etc/init.d/postgrey : Start, stop and restart Grey list server on SliTaz, at
    77.7  # boot time or with the command line.
    77.8  #
    77.9  # To start Grey list server at boot time, just put postgrey in the $RUN_DAEMONS
   77.10 @@ -9,7 +9,7 @@
   77.11  . /etc/daemons.conf
   77.12  
   77.13  NAME=Postgrey
   77.14 -DESC="Grey list server"
   77.15 +DESC="$(_ 'Postfix Greylisting Policy Server')"
   77.16  DAEMON=/usr/bin/postgrey
   77.17  OPTIONS=$POSTGREY_OPTIONS
   77.18  PIDFILE=/var/run/postgrey.pid
   77.19 @@ -18,11 +18,11 @@
   77.20  case "$1" in
   77.21    start)
   77.22      if active_pidfile $PIDFILE postgrey ; then
   77.23 -      echo "$NAME already running."
   77.24 +      _ '%s is already running.' $NAME
   77.25        exit 1
   77.26      fi
   77.27      if ! grep -q ^smtpd_recipient_restrictions /etc/postfix/main.cf; then
   77.28 -      echo -n "Updating /etc/postfix/main.cf"
   77.29 +      _ 'Updating %s' '/etc/postfix/main.cf'
   77.30        cat >> /etc/postfix/main.cf <<EOF
   77.31  
   77.32  # Add by $0
   77.33 @@ -33,34 +33,33 @@
   77.34  EOF
   77.35        /etc/init.d/postfix reload
   77.36      fi
   77.37 -    echo -n "Starting $DESC: $NAME... "
   77.38 +    action 'Starting %s: %s...' "$DESC" $NAME
   77.39      $DAEMON $OPTIONS
   77.40      status
   77.41      ;;
   77.42    stop)
   77.43      if ! active_pidfile $PIDFILE postgrey ; then
   77.44 -      echo "$NAME is not running."
   77.45 +      _ '%s is not running.' $NAME
   77.46        exit 1
   77.47      fi
   77.48 -    echo -n "Stopping $DESC: $NAME... "
   77.49 -    kill `cat $PIDFILE`
   77.50 +    action 'Stopping %s: %s...' "$DESC" $NAME
   77.51 +    kill $(cat $PIDFILE)
   77.52      status
   77.53      ;;
   77.54    restart)
   77.55      if ! active_pidfile $PIDFILE postgrey ; then
   77.56 -      echo "$NAME is not running."
   77.57 +      _ '%s is not running.' $NAME
   77.58        exit 1
   77.59      fi
   77.60 -    echo -n "Restarting $DESC: $NAME... "
   77.61 -    kill `cat $PIDFILE`
   77.62 +    action 'Restarting %s: %s...' "$DESC" $NAME
   77.63 +    kill $(cat $PIDFILE)
   77.64      sleep 2
   77.65      $DAEMON $OPTIONS
   77.66      status
   77.67      ;;
   77.68    *)
   77.69 -    echo ""
   77.70 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart|reload]"
   77.71 -    echo ""
   77.72 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   77.73 +    newline
   77.74      exit 1
   77.75      ;;
   77.76  esac
    78.1 --- a/privoxy/stuff/daemon-privoxy	Wed May 25 23:07:05 2016 +0200
    78.2 +++ b/privoxy/stuff/daemon-privoxy	Thu May 26 20:16:45 2016 +0300
    78.3 @@ -1,5 +1,5 @@
    78.4  #!/bin/sh
    78.5 -# /etc/init.d/daemon-name: Start, stop and restart daemon 
    78.6 +# /etc/init.d/daemon-name: Start, stop and restart daemon
    78.7  # on SliTaz, at boot time or with the command line.
    78.8  #
    78.9  # To start daemon at boot time, just put the right name in the $RUN_DAEMONS
   78.10 @@ -9,7 +9,7 @@
   78.11  . /etc/daemons.conf
   78.12  
   78.13  NAME=Privoxy
   78.14 -DESC="Web proxy daemon"
   78.15 +DESC="$(_ 'Web proxy daemon')"
   78.16  DAEMON=/usr/sbin/privoxy
   78.17  OPTIONS="--pidfile /var/run/privoxy.pid"
   78.18  USER="--user privoxy"
   78.19 @@ -19,39 +19,38 @@
   78.20  case "$1" in
   78.21    start)
   78.22      if active_pidfile $PIDFILE privoxy ; then
   78.23 -      echo "$NAME already running."
   78.24 +      _ '%s is already running.' $NAME
   78.25        exit 1
   78.26      fi
   78.27 -    echo -n "Starting $DESC: $NAME... "
   78.28 -    $DAEMON $OPTIONS $USER $CONFIG 2> /dev/null
   78.29 +    action 'Starting %s: %s...' "$DESC" $NAME
   78.30 +    $DAEMON $OPTIONS $USER $CONFIG 2>/dev/null
   78.31      status
   78.32      ;;
   78.33    stop)
   78.34      if ! active_pidfile $PIDFILE privoxy ; then
   78.35 -      echo "$NAME is not running."
   78.36 +      _ '%s is not running.' $NAME
   78.37        exit 1
   78.38      fi
   78.39 -    echo -n "Stopping $DESC: $NAME... "
   78.40 -    kill `cat $PIDFILE`
   78.41 +    action 'Stopping %s: %s...' "$DESC" $NAME
   78.42 +    kill $(cat $PIDFILE)
   78.43      rm $PIDFILE
   78.44      status
   78.45      ;;
   78.46    restart)
   78.47      if ! active_pidfile $PIDFILE privoxy ; then
   78.48 -      echo "$NAME is not running."
   78.49 +      _ '%s is not running.' $NAME
   78.50        exit 1
   78.51      fi
   78.52 -    kill `cat $PIDFILE`
   78.53 +    kill $(cat $PIDFILE)
   78.54      rm $PIDFILE
   78.55      sleep 2
   78.56 -    echo -n "Restarting $DESC: $NAME... "
   78.57 -    $DAEMON $OPTIONS $USER $CONFIG 2> /dev/null
   78.58 +    action 'Restarting %s: %s...' "$DESC" $NAME
   78.59 +    $DAEMON $OPTIONS $USER $CONFIG 2>/dev/null
   78.60      status
   78.61      ;;
   78.62    *)
   78.63 -    echo ""
   78.64 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   78.65 -    echo ""
   78.66 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   78.67 +    newline
   78.68      exit 1
   78.69      ;;
   78.70  esac
    79.1 --- a/pure-ftpd/stuff/pure-ftpd	Wed May 25 23:07:05 2016 +0200
    79.2 +++ b/pure-ftpd/stuff/pure-ftpd	Thu May 26 20:16:45 2016 +0300
    79.3 @@ -1,5 +1,5 @@
    79.4  #!/bin/sh
    79.5 -# /etc/init.d/pure-ftpd : Start, stop and restart pure-FTPd daemon on SliTaz, at 
    79.6 +# /etc/init.d/pure-ftpd : Start, stop and restart pure-FTPd daemon on SliTaz, at
    79.7  # boot time or with the command line.
    79.8  #
    79.9  # To start pure-FTPd server at boot time, just put pure-ftpd in the $RUN_DAEMONS
   79.10 @@ -9,7 +9,7 @@
   79.11  . /etc/daemons.conf
   79.12  
   79.13  NAME=pure-ftpd
   79.14 -DESC="pure-FTPd Server Daemon"
   79.15 +DESC="$(_ 'pure-FTPd Server Daemon')"
   79.16  DAEMON=/usr/sbin/$NAME
   79.17  
   79.18  PIDFILE=/var/run/$NAME.pid
   79.19 @@ -24,37 +24,36 @@
   79.20  case "$1" in
   79.21    start)
   79.22      if active_pidfile $PIDFILE $NAME ; then
   79.23 -      echo "$NAME already running."
   79.24 +      _ '%s is already running.'
   79.25        exit 1
   79.26      fi
   79.27 -    echo -n "Starting $DESC: $NAME... "
   79.28 +    action 'Starting %s: %s...' "$DESC" $NAME
   79.29      $DAEMON $OPTIONS
   79.30      status
   79.31      ;;
   79.32    stop)
   79.33      if ! active_pidfile $PIDFILE $NAME ; then
   79.34 -      echo "$NAME is not running."
   79.35 +      _ '%s is not running.' $NAME
   79.36        exit 1
   79.37      fi
   79.38 -    echo -n "Stopping $DESC: $NAME... "
   79.39 -    kill `cat $PIDFILE`
   79.40 +    action 'Stopping %s: %s...' "$DESC" $NAME
   79.41 +    kill $(cat $PIDFILE)
   79.42      status
   79.43      ;;
   79.44    restart)
   79.45      if ! active_pidfile $PIDFILE $NAME ; then
   79.46 -      echo "$NAME is not running."
   79.47 +      _ '%s is not running.'
   79.48        exit 1
   79.49      fi
   79.50 -    echo -n "Restarting $DESC: $NAME... "
   79.51 -    kill `cat $PIDFILE`
   79.52 +    action 'Restarting %s: %s...' "$DESC" $NAME
   79.53 +    kill $(cat $PIDFILE)
   79.54      sleep 2
   79.55      $DAEMON $OPTIONS
   79.56      status
   79.57      ;;
   79.58    *)
   79.59 -    echo ""
   79.60 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   79.61 -    echo ""
   79.62 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   79.63 +    newline
   79.64      exit 1
   79.65      ;;
   79.66  esac
    80.1 --- a/rsync/stuff/etc/init.d/rsyncd	Wed May 25 23:07:05 2016 +0200
    80.2 +++ b/rsync/stuff/etc/init.d/rsyncd	Thu May 26 20:16:45 2016 +0300
    80.3 @@ -9,7 +9,7 @@
    80.4  . /etc/daemons.conf
    80.5  
    80.6  NAME=Rsyncd
    80.7 -DESC="rsync deamon"
    80.8 +DESC="$(_ '%s daemon' rsync)"
    80.9  DAEMON=/usr/bin/rsync
   80.10  OPTIONS=$RSYNCD_OPTIONS
   80.11  PIDFILE=/var/run/rsyncd.pid
   80.12 @@ -17,39 +17,38 @@
   80.13  case "$1" in
   80.14    start)
   80.15      if active_pidfile $PIDFILE rsync ; then
   80.16 -      echo "$NAME already running."
   80.17 +      _ '%s is already running.' $NAME
   80.18        exit 1
   80.19      fi
   80.20 -    echo -n "Starting $DESC: $NAME... "
   80.21 -    $DAEMON $OPTIONS 
   80.22 +    action 'Starting %s: %s...' "$DESC" $NAME
   80.23 +    $DAEMON $OPTIONS
   80.24      status
   80.25      ;;
   80.26    stop)
   80.27      if ! active_pidfile $PIDFILE rsync ; then
   80.28 -      echo "$NAME is not running."
   80.29 +      _ '%s is not running.' $NAME
   80.30        exit 1
   80.31      fi
   80.32 -    echo -n "Stopping $DESC: $NAME... "
   80.33 -    kill `cat $PIDFILE`
   80.34 +    action 'Stopping %s: %s...' "$DESC" $NAME
   80.35 +    kill $(cat $PIDFILE)
   80.36      rm $PIDFILE
   80.37      status
   80.38      ;;
   80.39    restart)
   80.40      if ! active_pidfile $PIDFILE rsync ; then
   80.41 -      echo "$NAME is not running."
   80.42 +      _ '%s is not running.' $NAME
   80.43        exit 1
   80.44      fi
   80.45 -    echo -n "Restarting $DESC: $NAME... "
   80.46 -    kill `cat $PIDFILE`
   80.47 +    action 'Restarting %s: %s...' "$DESC" $NAME
   80.48 +    kill $(cat $PIDFILE)
   80.49      rm $PIDFILE
   80.50      sleep 2
   80.51      $DAEMON $OPTIONS
   80.52      status
   80.53      ;;
   80.54    *)
   80.55 -    echo ""
   80.56 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   80.57 -    echo ""
   80.58 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   80.59 +    newline
   80.60      exit 1
   80.61      ;;
   80.62  esac
    81.1 --- a/samba/stuff/etc/init.d/samba	Wed May 25 23:07:05 2016 +0200
    81.2 +++ b/samba/stuff/etc/init.d/samba	Thu May 26 20:16:45 2016 +0300
    81.3 @@ -1,5 +1,5 @@
    81.4  #!/bin/sh
    81.5 -# /etc/init.d/samba : Start, stop and restart Samba server on SliTaz, at 
    81.6 +# /etc/init.d/samba : Start, stop and restart Samba server on SliTaz, at
    81.7  # boot time or with the command line.
    81.8  #
    81.9  # To start Samba server at boot time, just put samba in the $RUN_DAEMONS
   81.10 @@ -9,43 +9,44 @@
   81.11  . /etc/daemons.conf
   81.12  
   81.13  NAME=Samba
   81.14 -DESC="Samba server"
   81.15 +DESC="$(_ '%s server' Samba)"
   81.16  SMBD=/usr/sbin/smbd
   81.17  NMBD=/usr/sbin/nmbd
   81.18  NMBPIDFILE=/var/run/samba/nmbd.pid
   81.19  SMBPIDFILE=/var/run/samba/smbd.pid
   81.20  
   81.21  [ -d /var/run/samba ] || mkdir -p /var/run/samba
   81.22 +
   81.23  case "$1" in
   81.24    start)
   81.25      if active_pidfile $SMBPIDFILE smbd ; then
   81.26 -      echo "$NAME: $SMBD already running."
   81.27 +      _ '%s is already running.' "$NAME ($SMBD)"
   81.28      else
   81.29 -      echo -n "Starting $DESC: $SMBD... "
   81.30 +      action 'Starting %s: %s...' "$DESC" $SMBD
   81.31        $SMBD -D
   81.32        status
   81.33      fi
   81.34      if active_pidfile $NMBPIDFILE nmbd ; then
   81.35 -      echo "$NAME: $NMBD already running."
   81.36 +      _ '%s is already running.' "$NAME ($NMBD)"
   81.37      else
   81.38 -      echo -n "Starting $DESC: $NMBD... "
   81.39 +      action 'Starting %s: %s...' "$DESC" $NMBD
   81.40        $NMBD -D
   81.41        status
   81.42      fi
   81.43      ;;
   81.44    stop)
   81.45      if ! active_pidfile $SMBPIDFILE smbd ; then
   81.46 -      echo "$NAME: $SMBD is not running."
   81.47 +      _ '%s is not running.' "$NAME ($SMBD)"
   81.48      else
   81.49 -      echo -n "Stopping $DESC: $SMBD... "
   81.50 -      kill `cat $SMBPIDFILE`
   81.51 +      action 'Stopping %s: %s...' "$DESC" $SMBD
   81.52 +      kill $(cat $SMBPIDFILE)
   81.53        status
   81.54      fi
   81.55      if ! active_pidfile $NMBPIDFILE nmbd ; then
   81.56 -      echo "$NAME: $NMBD is not running."
   81.57 +      _ '%s is not running.' "$NAME ($NMBD)"
   81.58      else
   81.59 -      echo -n "Stopping $DESC: $NMBD... "
   81.60 -      kill `cat $NMBPIDFILE`
   81.61 +      action 'Stopping %s: %s...' "$DESC" $NMBD
   81.62 +      kill $(cat $NMBPIDFILE)
   81.63        status
   81.64      fi
   81.65      ;;
   81.66 @@ -55,17 +56,16 @@
   81.67      ;;
   81.68    reload)
   81.69      if ! active_pidfile $SMBPIDFILE smbd ; then
   81.70 -      echo "$NAME is not running."
   81.71 +      _ '%s is not running.' $NAME
   81.72        exit 1
   81.73      fi
   81.74 -    echo -n "Reloading $DESC: $SMBD... "
   81.75 -    kill -HUP `cat $SMBPIDFILE`
   81.76 +    action 'Reloading %s: %s...' "$DESC" $SMBD
   81.77 +    kill -HUP $(cat $SMBPIDFILE)
   81.78      status
   81.79      ;;
   81.80    *)
   81.81 -    echo ""
   81.82 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart!reload]"
   81.83 -    echo ""
   81.84 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart!reload]"
   81.85 +    newline
   81.86      exit 1
   81.87      ;;
   81.88  esac
    82.1 --- a/slim/stuff/etc/init.d/slim	Wed May 25 23:07:05 2016 +0200
    82.2 +++ b/slim/stuff/etc/init.d/slim	Thu May 26 20:16:45 2016 +0300
    82.3 @@ -8,7 +8,7 @@
    82.4  . /etc/init.d/rc.functions
    82.5  
    82.6  NAME=SLiM
    82.7 -DESC="Simple login manager"
    82.8 +DESC="$(_ 'Simple login manager')"
    82.9  DAEMON=/usr/bin/slim
   82.10  OPTION="-d"
   82.11  LOCK_FILE=/var/lock/slim.lock
   82.12 @@ -16,29 +16,29 @@
   82.13  case "$1" in
   82.14    start)
   82.15      if active_pidfile $LOCK_FILE slim ; then
   82.16 -      echo "$NAME already running."
   82.17 +      _ '%s is already running.' $NAME
   82.18        exit 1
   82.19      fi
   82.20 -    echo -n "Starting $DESC: $NAME... "
   82.21 +    action 'Starting %s: %s...' "$DESC" $NAME
   82.22      $DAEMON $OPTION
   82.23      status
   82.24      ;;
   82.25    stop)
   82.26      if ! active_pidfile $LOCK_FILE slim ; then
   82.27 -      echo "$NAME is not running."
   82.28 +      _ '%s is not running.' $NAME
   82.29        exit 1
   82.30      fi
   82.31 -    echo -n "Stopping $DESC: $NAME... "
   82.32 +    action 'Stopping %s: %s...' "$DESC" $NAME
   82.33      killall slim
   82.34      rm $LOCK_FILE
   82.35      status
   82.36      ;;
   82.37    restart)
   82.38      if ! active_pidfile $LOCK_FILE slim ; then
   82.39 -      echo "$NAME is not running."
   82.40 +      _ '%s is not running.' $NAME
   82.41        exit 1
   82.42      fi
   82.43 -    echo -n "Restarting $DESC: $NAME... "
   82.44 +    action 'Restarting %s: %s...' "$DESC" $NAME
   82.45      killall slim
   82.46      rm $LOCK_FILE
   82.47      sleep 2
   82.48 @@ -46,9 +46,8 @@
   82.49      status
   82.50      ;;
   82.51    *)
   82.52 -    echo ""
   82.53 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   82.54 -    echo ""
   82.55 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   82.56 +    newline
   82.57      exit 1
   82.58      ;;
   82.59  esac
    83.1 --- a/slitaz-i18n/stuff/locale-pack.conf	Wed May 25 23:07:05 2016 +0200
    83.2 +++ b/slitaz-i18n/stuff/locale-pack.conf	Thu May 26 20:16:45 2016 +0300
    83.3 @@ -1,6 +1,6 @@
    83.4  
    83.5  # Packages LC_MESSAGES included in the locale pack.
    83.6 -CORE_PKGS="acl alsaplayer alsa-utils asunder atk attr dialog e2fsprogs \
    83.7 +CORE_PKGS="acl alsaplayer alsa-utils asunder atk attr busybox dialog e2fsprogs \
    83.8  elfutils epdfview galculator gdk-pixbuf glib glibc glib-networking gparted \
    83.9  gpicview gtk+ gvfs kbd leafpad libfm gnutls libgpg-error libidn xz libwebkit \
   83.10  lxappearance lxinput lxpanel lxrandr lxsession lxsession-edit lxtask \
    84.1 --- a/smartmontools/stuff/etc/init.d/smartd	Wed May 25 23:07:05 2016 +0200
    84.2 +++ b/smartmontools/stuff/etc/init.d/smartd	Thu May 26 20:16:45 2016 +0300
    84.3 @@ -1,5 +1,5 @@
    84.4  #!/bin/sh
    84.5 -# /etc/init.d/smartd : Start, stop and restart Smartmontools (SMART) daemon on SliTaz, at 
    84.6 +# /etc/init.d/smartd : Start, stop and restart Smartmontools (SMART) daemon on SliTaz, at
    84.7  # boot time or with the command line.
    84.8  #
    84.9  # To start SMART monitoring at boot time, just put smartd in the $RUN_DAEMONS
   84.10 @@ -9,7 +9,7 @@
   84.11  . /etc/daemons.conf
   84.12  
   84.13  NAME=smartd
   84.14 -DESC="Smartmontools (SMART) Daemon"
   84.15 +DESC="$(_ 'Smartmontools (SMART) Daemon')"
   84.16  DAEMON=/usr/sbin/smartd
   84.17  
   84.18  PIDFILE=/var/run/smartd.pid
   84.19 @@ -18,37 +18,36 @@
   84.20  case "$1" in
   84.21    start)
   84.22      if active_pidfile $PIDFILE smartd ; then
   84.23 -      echo "$NAME already running."
   84.24 +      _ '%s is already running.' $NAME
   84.25        exit 1
   84.26      fi
   84.27 -    echo -n "Starting $DESC: $NAME... "
   84.28 +    action 'Starting %s: %s...' "$DESC" $NAME
   84.29      $DAEMON $OPTIONS
   84.30      status
   84.31      ;;
   84.32    stop)
   84.33      if ! active_pidfile $PIDFILE smartd ; then
   84.34 -      echo "$NAME is not running."
   84.35 +      _ '%s is not running.' $NAME
   84.36        exit 1
   84.37      fi
   84.38 -    echo -n "Stopping $DESC: $NAME... "
   84.39 -    kill `cat $PIDFILE`
   84.40 +    action 'Stopping %s: %s...' "$DESC" $NAME
   84.41 +    kill $(cat $PIDFILE)
   84.42      status
   84.43      ;;
   84.44    restart)
   84.45      if ! active_pidfile $PIDFILE smartd ; then
   84.46 -      echo "$NAME is not running."
   84.47 +      _ '%s is not running.' $NAME
   84.48        exit 1
   84.49      fi
   84.50 -    echo -n "Restarting $DESC: $NAME... "
   84.51 -    kill `cat $PIDFILE`
   84.52 +    action 'Restarting %s: %s...' "$DESC" $NAME
   84.53 +    kill $(cat $PIDFILE)
   84.54      sleep 2
   84.55      $DAEMON $OPTIONS
   84.56      status
   84.57      ;;
   84.58    *)
   84.59 -    echo ""
   84.60 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   84.61 -    echo ""
   84.62 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   84.63 +    newline
   84.64      exit 1
   84.65      ;;
   84.66  esac
    85.1 --- a/squid/stuff/etc/init.d/squid	Wed May 25 23:07:05 2016 +0200
    85.2 +++ b/squid/stuff/etc/init.d/squid	Thu May 26 20:16:45 2016 +0300
    85.3 @@ -1,5 +1,5 @@
    85.4  #!/bin/sh
    85.5 -# /etc/init.d/squid : Start, stop and restart Squid proxy server on SliTaz, at 
    85.6 +# /etc/init.d/squid : Start, stop and restart Squid proxy server on SliTaz, at
    85.7  # boot time or with the command line.
    85.8  #
    85.9  # To start Squid proxy server at boot time, just put squid in the $RUN_DAEMONS
   85.10 @@ -9,38 +9,38 @@
   85.11  . /etc/daemons.conf
   85.12  
   85.13  NAME=Squid
   85.14 -DESC="Squid proxy server"
   85.15 +DESC="$(_ 'Squid proxy server')"
   85.16  DAEMON=/usr/sbin/squid
   85.17  OPTIONS=$SQUID_OPTIONS
   85.18  PIDFILE=/var/run/squid.pid
   85.19 -http_port=$(grep ^http_port /etc/squid/squid.conf | awk '{ print $2 }')
   85.20 +http_port=$(grep ^http_port /etc/squid/squid.conf | awk '{print $2}')
   85.21  [ -n "$http_port" ] || http_port=3128
   85.22  [ -n "$OPTIONS" ] || OPTIONS="-a $http_port"
   85.23  
   85.24  case "$1" in
   85.25    start)
   85.26      if active_pidfile $PIDFILE squid ; then
   85.27 -      echo "$NAME already running."
   85.28 +      _ '%s is already running.' $NAME
   85.29        exit 1
   85.30      fi
   85.31 -    cache_dir=$(grep ^cache_dir /etc/squid/squid.conf | awk '{ print $3 }')
   85.32 +    cache_dir=$(grep ^cache_dir /etc/squid/squid.conf | awk '{print $3}')
   85.33      [ -n "$cache_dir" ] || cache_dir=/var/cache
   85.34      if [ -d "$cache_dir" -a ! -d "$cache_dir/00" ]; then
   85.35 -      echo -n "Creating squid spool directory structure"
   85.36 -      $DAEMON -z > /dev/null 2>&1
   85.37 +      action 'Creating squid spool directory structure'
   85.38 +      $DAEMON -z >/dev/null 2>&1
   85.39        status
   85.40      fi
   85.41 -    echo -n "Starting $DESC: $NAME... "
   85.42 +    action 'Starting %s: %s...' "$DESC" $NAME
   85.43      $DAEMON $OPTIONS
   85.44      status
   85.45      sleep 2
   85.46      ;;
   85.47    stop)
   85.48      if ! active_pidfile $PIDFILE squid ; then
   85.49 -      echo "$NAME is not running."
   85.50 +      _ '%s is not running.' $NAME
   85.51        exit 1
   85.52      fi
   85.53 -    echo -n "Stopping $DESC: $NAME... "
   85.54 +    action 'Stopping %s: %s...' "$DESC" $NAME
   85.55      $DAEMON -k kill
   85.56      status
   85.57      rm -f $PIDFILE
   85.58 @@ -48,27 +48,26 @@
   85.59      ;;
   85.60    reload)
   85.61      if ! active_pidfile $PIDFILE squid ; then
   85.62 -      echo "$NAME is not running."
   85.63 +      _ '%s is not running.' $NAME
   85.64        exit 1
   85.65      fi
   85.66 -    echo -n "Reloading $DESC configuration... "
   85.67 +    action 'Reloading %s configuration...' $NAME
   85.68      $DAEMON -k reconfigure
   85.69      status
   85.70      ;;
   85.71    restart)
   85.72      if ! active_pidfile $PIDFILE squid ; then
   85.73 -      echo "$NAME is not running."
   85.74 +      _ '%s is not running.' $NAME
   85.75        exit 1
   85.76      fi
   85.77 -    echo -n "Restarting $DESC: $NAME... "
   85.78 -	$DAEMON -k kill &&  $DAEMON $OPTIONS
   85.79 +    action 'Restarting %s: %s...' "$DESC" $NAME
   85.80 +    $DAEMON -k kill && $DAEMON $OPTIONS
   85.81      status
   85.82      sleep 2
   85.83      ;;
   85.84    *)
   85.85 -    echo ""
   85.86 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|reload|restart]"
   85.87 -    echo ""
   85.88 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart|reload]"
   85.89 +    newline
   85.90      exit 1
   85.91      ;;
   85.92  esac
    86.1 --- a/thttpd/stuff/etc/init.d/thttpd	Wed May 25 23:07:05 2016 +0200
    86.2 +++ b/thttpd/stuff/etc/init.d/thttpd	Thu May 26 20:16:45 2016 +0300
    86.3 @@ -1,5 +1,5 @@
    86.4  #!/bin/sh
    86.5 -# /etc/init.d/thttpd : Start, stop and restart SSH server on SliTaz, at 
    86.6 +# /etc/init.d/thttpd : Start, stop and restart SSH server on SliTaz, at
    86.7  # boot time or with the command line.
    86.8  #
    86.9  # To start SSH server at boot time, just put thttpd in the $RUN_DAEMONS
   86.10 @@ -9,7 +9,7 @@
   86.11  . /etc/daemons.conf
   86.12  
   86.13  NAME=thttpd
   86.14 -DESC="Thttpd server"
   86.15 +DESC="$(_ '%s server' thttpd)"
   86.16  DAEMON=/usr/sbin/thttpd
   86.17  CONFIG_FILE=/etc/thttpd/thttpd.conf
   86.18  OPTIONS="-C $CONFIG_FILE -D"
   86.19 @@ -18,37 +18,36 @@
   86.20  case "$1" in
   86.21    start)
   86.22       if active_pidfile $PIDFILE thttpd ; then
   86.23 -      echo "$NAME already running."
   86.24 +      _ '%s is already running.' $NAME
   86.25        exit 1
   86.26      fi
   86.27 -    echo -n "Starting $DESC: $NAME... "
   86.28 +    action 'Starting %s: %s...' "$DESC" $NAME
   86.29      $DAEMON $OPTIONS
   86.30      status
   86.31      ;;
   86.32    stop)
   86.33      if ! active_pidfile $PIDFILE thttpd ; then
   86.34 -      echo "$NAME is not running."
   86.35 +      _ '%s is not running.' $NAME
   86.36        exit 1
   86.37      fi
   86.38 -    echo -n "Stopping $DESC: $NAME... "
   86.39 -    kill `cat $PIDFILE`
   86.40 +    action 'Stopping %s: %s...' "$DESC" $NAME
   86.41 +    kill $(cat $PIDFILE)
   86.42      status
   86.43      ;;
   86.44    restart)
   86.45      if ! active_pidfile $PIDFILE thttpd ; then
   86.46 -      echo "$NAME is not running."
   86.47 +      _ '%s is not running.' $NAME
   86.48        exit 1
   86.49      fi
   86.50 -    echo -n "Restarting $DESC: $NAME... "
   86.51 -    kill `cat $PIDFILE`
   86.52 +    action 'Restarting %s: %s...' "$DESC" $NAME
   86.53 +    kill $(cat $PIDFILE)
   86.54      sleep 2
   86.55      $DAEMON $OPTIONS
   86.56      status
   86.57      ;;
   86.58    *)
   86.59 -    echo ""
   86.60 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   86.61 -    echo ""
   86.62 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   86.63 +    newline
   86.64      exit 1
   86.65      ;;
   86.66  esac
    87.1 --- a/tinc/stuff/etc/init.d/tinc	Wed May 25 23:07:05 2016 +0200
    87.2 +++ b/tinc/stuff/etc/init.d/tinc	Thu May 26 20:16:45 2016 +0300
    87.3 @@ -9,7 +9,7 @@
    87.4  . /etc/daemons.conf
    87.5  
    87.6  NAME=tinc
    87.7 -DESC="tinc deamon"
    87.8 +DESC="$(_ '%s daemon' tinc)"
    87.9  DAEMON=/usr/sbin/tincd
   87.10  OPTIONS=$TINC_OPTIONS
   87.11  PIDFILE=/var/run/tinc.pid
   87.12 @@ -17,37 +17,36 @@
   87.13  case "$1" in
   87.14    start)
   87.15      if active_pidfile $PIDFILE tincd ; then
   87.16 -      echo "$NAME already running."
   87.17 +      _ '%s is already running.' $NAME
   87.18        exit 1
   87.19      fi
   87.20 -    echo -n "Starting $DESC: $NAME... "
   87.21 -    $DAEMON $OPTIONS 
   87.22 +    action 'Starting %s: %s...' "$DESC" $NAME
   87.23 +    $DAEMON $OPTIONS
   87.24      status
   87.25      ;;
   87.26    stop)
   87.27      if ! active_pidfile $PIDFILE tincd ; then
   87.28 -      echo "$NAME is not running."
   87.29 +      _ '%s is not running.' $NAME
   87.30        exit 1
   87.31      fi
   87.32 -    echo -n "Stopping $DESC: $NAME... "
   87.33 -    $DAEMON -k 
   87.34 +    action 'Stopping %s: %s...' "$DESC" $NAME
   87.35 +    $DAEMON -k
   87.36      status
   87.37      ;;
   87.38    restart)
   87.39      if ! active_pidfile $PIDFILE tincd ; then
   87.40 -      echo "$NAME is not running."
   87.41 +      _ '%s is not running.'
   87.42        exit 1
   87.43      fi
   87.44 -    echo -n "Restarting $DESC: $NAME... "
   87.45 -    $DAEMON -k 
   87.46 +    action 'Restarting %s: %s...' "$DESC" $NAME
   87.47 +    $DAEMON -k
   87.48      sleep 2
   87.49      $DAEMON $OPTIONS
   87.50      status
   87.51      ;;
   87.52    *)
   87.53 -    echo ""
   87.54 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|reload|restart]"
   87.55 -    echo ""
   87.56 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|reload|restart]"
   87.57 +    newline
   87.58      exit 1
   87.59      ;;
   87.60  esac
    88.1 --- a/tinyproxy/stuff/tinyproxy	Wed May 25 23:07:05 2016 +0200
    88.2 +++ b/tinyproxy/stuff/tinyproxy	Thu May 26 20:16:45 2016 +0300
    88.3 @@ -4,7 +4,7 @@
    88.4  . /etc/init.d/rc.functions
    88.5  
    88.6  NAME=Tinyproxy
    88.7 -DESC="Tiny Proxy"
    88.8 +DESC="$(_ 'Tiny Proxy')"
    88.9  DAEMON=/usr/sbin/tinyproxy
   88.10  OPTION="-c"
   88.11  PIDFILE=/var/run/tinyproxy.pid
   88.12 @@ -12,29 +12,29 @@
   88.13  case "$1" in
   88.14    start)
   88.15      if active_pidfile $PIDFILE tinyproxy ; then
   88.16 -      echo "$NAME already running."
   88.17 +      _ '%s is already running.' $NAME
   88.18        exit 1
   88.19      fi
   88.20 -    echo -n "Starting $DESC: $NAME... "
   88.21 +    action 'Starting %s: %s...' "$DESC" $NAME
   88.22      $DAEMON $OPTION /etc/tinyproxy/tinyproxy.conf
   88.23      status
   88.24      ;;
   88.25    stop)
   88.26      if ! active_pidfile $PIDFILE tinyproxy ; then
   88.27 -      echo "$NAME is not running."
   88.28 +      _ '%s is not running.' $NAME
   88.29        exit 1
   88.30      fi
   88.31 -    echo -n "Stopping $DESC: $NAME... "
   88.32 +    action 'Stopping %s: %s...' "$DESC" $NAME
   88.33      killall tinyproxy
   88.34      rm $PIDFILE
   88.35      status
   88.36      ;;
   88.37    restart)
   88.38      if ! active_pidfile $PIDFILE tinyproxy ; then
   88.39 -      echo "$NAME is not running."
   88.40 +      _ '%s is not running.' $NAME
   88.41        exit 1
   88.42      fi
   88.43 -    echo -n "Restarting $DESC: $NAME... "
   88.44 +    action 'Restarting %s: %s...' "$DESC" $NAME
   88.45      killall tinyproxy
   88.46      rm $PIDFILE
   88.47      sleep 2
   88.48 @@ -42,11 +42,10 @@
   88.49      status
   88.50      ;;
   88.51    *)
   88.52 -    echo ""
   88.53 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   88.54 -    echo ""
   88.55 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   88.56 +    newline
   88.57      exit 1
   88.58      ;;
   88.59  esac
   88.60  
   88.61 -exit 0
   88.62 \ No newline at end of file
   88.63 +exit 0
    89.1 --- a/transmission-daemon/stuff/transmission-daemon	Wed May 25 23:07:05 2016 +0200
    89.2 +++ b/transmission-daemon/stuff/transmission-daemon	Thu May 26 20:16:45 2016 +0300
    89.3 @@ -9,7 +9,7 @@
    89.4  . /etc/daemons.conf
    89.5  
    89.6  NAME=Transmission
    89.7 -DESC="transmission daemon"
    89.8 +DESC="$(_ '%s daemon' Transmission)"
    89.9  DAEMON=/usr/bin/transmission-daemon
   89.10  OPTIONS="-g /var/transmission-daemon/ -x /var/run/transmission-daemon.pid"
   89.11  PIDFILE=/var/run/transmission-daemon.pid
   89.12 @@ -17,29 +17,29 @@
   89.13  case "$1" in
   89.14    start)
   89.15      if active_pidfile $PIDFILE transmission-daemon ; then
   89.16 -      echo "$NAME already running."
   89.17 +      _ '%s is already running.' $NAME
   89.18        exit 1
   89.19      fi
   89.20 -    echo -n "Starting $DESC: $NAME... "
   89.21 -    $DAEMON $OPTIONS 
   89.22 +    action 'Starting %s: %s...' "$DESC" $NAME
   89.23 +    $DAEMON $OPTIONS
   89.24      status
   89.25      ;;
   89.26    stop)
   89.27      if ! active_pidfile $PIDFILE transmission-daemon ; then
   89.28 -      echo "$NAME is not running."
   89.29 +      _ '%s is not running.' $NAME
   89.30        exit 1
   89.31      fi
   89.32 -    echo -n "Stopping $DESC: $NAME... "
   89.33 +    action 'Stopping %s: %s...' "$DESC" $NAME
   89.34      killall transmission-daemon
   89.35      rm $PIDFILE
   89.36      status
   89.37      ;;
   89.38    restart)
   89.39      if ! active_pidfile $PIDFILE transmission-daemon ; then
   89.40 -      echo "$NAME is not running."
   89.41 +      _ '%s is not running.' $NAME
   89.42        exit 1
   89.43      fi
   89.44 -    echo -n "Restarting $DESC: $NAME... "
   89.45 +    action 'Restarting %s: %s...' "$DESC" $NAME
   89.46      killall transmission-daemon
   89.47      rm $PIDFILE
   89.48      sleep 2
   89.49 @@ -47,9 +47,8 @@
   89.50      status
   89.51      ;;
   89.52    *)
   89.53 -    echo ""
   89.54 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   89.55 -    echo ""
   89.56 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   89.57 +    newline
   89.58      exit 1
   89.59      ;;
   89.60  esac
    90.1 --- a/unfs3/stuff/etc/init.d/unfsd	Wed May 25 23:07:05 2016 +0200
    90.2 +++ b/unfs3/stuff/etc/init.d/unfsd	Thu May 26 20:16:45 2016 +0300
    90.3 @@ -9,7 +9,7 @@
    90.4  . /etc/daemons.conf
    90.5  
    90.6  NAME=unfsd
    90.7 -DESC="NFSv3 Server"
    90.8 +DESC="$(_ '%s server' NFSv3)"
    90.9  DAEMON=/usr/bin/unfsd
   90.10  OPTIONS=
   90.11  PIDFILE=/var/run/$NAME.pid
   90.12 @@ -18,40 +18,40 @@
   90.13  test -f $DAEMON || exit 0
   90.14  
   90.15  case "$1" in
   90.16 -    start)
   90.17 -	if active_pidfile $PIDFILE unfsd ; then
   90.18 -      		echo "$NAME already running."
   90.19 -      		exit 1
   90.20 -    	fi
   90.21 +  start)
   90.22 +    if active_pidfile $PIDFILE unfsd ; then
   90.23 +      _ '%s is already running.' $NAME
   90.24 +      exit 1
   90.25 +    fi
   90.26  
   90.27 -    	echo -n "Starting $DESC: $NAME... "
   90.28 -    	$DAEMON $OPTIONS
   90.29 -    	status
   90.30 -    	
   90.31 -    	# registering PID
   90.32 -    	if [ $? -eq 0 ]; then
   90.33 -   		pidof -s $NAME > $PIDFILE
   90.34 -    	fi
   90.35 -	;;
   90.36 -    stop)
   90.37 -	if ! active_pidfile $PIDFILE unfsd ; then
   90.38 -           echo "$NAME is not running."
   90.39 -           exit 1
   90.40 -        fi
   90.41 -        echo -n "Stopping $DESC: $NAME... "
   90.42 -        kill `cat $PIDFILE`
   90.43 -        rm -f $PIDFILE
   90.44 -        status
   90.45 -	;;
   90.46 -    restart)
   90.47 -        $0 stop
   90.48 -        $0 start
   90.49 -	;;
   90.50 -    *)
   90.51 -		echo "Usage: $DAEMON {start|stop|reload|restart}"
   90.52 -		exit 1
   90.53 -	;;
   90.54 +    action 'Starting %s: %s...' "$DESC" $NAME
   90.55 +    $DAEMON $OPTIONS
   90.56 +    status
   90.57 +
   90.58 +    # registering PID
   90.59 +    if [ $? -eq 0 ]; then
   90.60 +      pidof -s $NAME > $PIDFILE
   90.61 +    fi
   90.62 +    ;;
   90.63 +  stop)
   90.64 +    if ! active_pidfile $PIDFILE unfsd ; then
   90.65 +      _ '%s is not running.' $NAME
   90.66 +      exit 1
   90.67 +    fi
   90.68 +    action 'Stopping %s: %s...' "$DESC" $NAME
   90.69 +    kill $(cat $PIDFILE)
   90.70 +    rm -f $PIDFILE
   90.71 +    status
   90.72 +    ;;
   90.73 +  restart)
   90.74 +    $0 stop
   90.75 +    $0 start
   90.76 +    ;;
   90.77 +  *)
   90.78 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   90.79 +    newline
   90.80 +    exit 1
   90.81 +    ;;
   90.82  esac
   90.83  
   90.84  exit 0
   90.85 -
    91.1 --- a/virtualbox-ose-guestutils/stuff/VBoxService	Wed May 25 23:07:05 2016 +0200
    91.2 +++ b/virtualbox-ose-guestutils/stuff/VBoxService	Thu May 26 20:16:45 2016 +0300
    91.3 @@ -7,7 +7,7 @@
    91.4  . /etc/daemons.conf
    91.5  
    91.6  NAME=VBoxService
    91.7 -DESC="VirtualBox Guest Service"
    91.8 +DESC="$(_ 'VirtualBox Guest Service')"
    91.9  DAEMON=/usr/bin/VBoxService
   91.10  OPTIONS=$VBOXSERVICE_OPTIONS
   91.11  PIDFILE=/var/run/VBoxService.pid
   91.12 @@ -15,37 +15,36 @@
   91.13  case "$1" in
   91.14  	start)
   91.15  		if active_pidfile $PIDFILE VBoxService ; then
   91.16 -			echo "$NAME already running."
   91.17 +			_ '%s is already running.' $NAME
   91.18  			exit 1
   91.19  		fi
   91.20 -		echo -n "Starting $DESC: $NAME... "
   91.21 +		action 'Starting %s: %s...' "$DESC" $NAME
   91.22  		mkdir -p $(dirname $PIDFILE)
   91.23  		$DAEMON $OPTIONS
   91.24  		status ;;
   91.25  	stop)
   91.26  		if ! active_pidfile $PIDFILE VBoxService ; then
   91.27 -			echo "$NAME is not running."
   91.28 +			_ '%s is not running.'
   91.29  			exit 1
   91.30  		fi
   91.31 -		echo -n "Stopping $DESC: $NAME... "
   91.32 +		action 'Stopping %s: %s...' "$DESC" $NAME
   91.33  		kill $(cat $PIDFILE)
   91.34  		rm $PIDFILE
   91.35  		status ;;
   91.36  	restart)
   91.37  		if ! active_pidfile $PIDFILE VBoxService ; then
   91.38 -			echo "$NAME is not running."
   91.39 +			_ '%s is not running.' $NAME
   91.40  			exit 1
   91.41  		fi
   91.42 -		echo -n "Restarting $DESC: $NAME... "
   91.43 +		action 'Restarting %s: %s...' "$DESC" $NAME
   91.44  		kill $(cat $PIDFILE)
   91.45  		rm $PIDFILE
   91.46  		sleep 2
   91.47  		$DAEMON $OPTIONS
   91.48  		status ;;
   91.49  	*)
   91.50 -		echo ""
   91.51 -		echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   91.52 -		echo ""
   91.53 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   91.54 +		newline
   91.55  		exit 1 ;;
   91.56  esac
   91.57  
    92.1 --- a/wicd/stuff/wicd	Wed May 25 23:07:05 2016 +0200
    92.2 +++ b/wicd/stuff/wicd	Thu May 26 20:16:45 2016 +0300
    92.3 @@ -9,7 +9,7 @@
    92.4  . /etc/daemons.conf
    92.5  
    92.6  NAME=Wicd
    92.7 -DESC="Network connection manager"
    92.8 +DESC="$(_ 'Network connection manager')"
    92.9  DAEMON=/usr/sbin/wicd
   92.10  OPTIONS=$WICD_OPTIONS
   92.11  PIDFILE=/var/run/wicd/wicd.pid
   92.12 @@ -17,39 +17,38 @@
   92.13  case "$1" in
   92.14    start)
   92.15      if active_pidfile $PIDFILE wicd ; then
   92.16 -      echo "$NAME already running."
   92.17 +      _ '%s is already running.' $NAME
   92.18        exit 1
   92.19      fi
   92.20 -    echo -n "Starting $DESC: $NAME... "
   92.21 -    $DAEMON $OPTIONS 
   92.22 +    action 'Starting %s: %s...' "$DESC" $NAME
   92.23 +    $DAEMON $OPTIONS
   92.24      status
   92.25      ;;
   92.26    stop)
   92.27      if ! active_pidfile $PIDFILE wicd ; then
   92.28 -      echo "$NAME is not running."
   92.29 +      _ '%s is not running.' $NAME
   92.30        exit 1
   92.31      fi
   92.32 -    echo -n "Stopping $DESC: $NAME... "
   92.33 -    kill `cat $PIDFILE`
   92.34 +    action 'Stopping %s: %s...' "$DESC" $NAME
   92.35 +    kill $(cat $PIDFILE)
   92.36      rm -f $PIDFILE
   92.37      status
   92.38      ;;
   92.39    restart)
   92.40      if ! active_pidfile $PIDFILE wicd ; then
   92.41 -      echo "$NAME is not running."
   92.42 +      _ '%s is not running.' $NAME
   92.43        exit 1
   92.44      fi
   92.45 -    echo -n "Restarting $DESC: $NAME... "
   92.46 -    kill `cat $PIDFILE`
   92.47 +    action 'Restarting %s: %s...' "$DESC" $NAME
   92.48 +    kill $(cat $PIDFILE)
   92.49      rm -f $PIDFILE
   92.50      sleep 2
   92.51      $DAEMON $OPTIONS
   92.52      status
   92.53      ;;
   92.54    *)
   92.55 -    echo ""
   92.56 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   92.57 -    echo ""
   92.58 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   92.59 +    newline
   92.60      exit 1
   92.61      ;;
   92.62  esac
    93.1 --- a/wpa_supplicant/stuff/etc/init.d/wpa_supplicant	Wed May 25 23:07:05 2016 +0200
    93.2 +++ b/wpa_supplicant/stuff/etc/init.d/wpa_supplicant	Thu May 26 20:16:45 2016 +0300
    93.3 @@ -9,7 +9,7 @@
    93.4  . /etc/daemons.conf
    93.5  
    93.6  NAME=wpa_supplicant
    93.7 -DESC="wpa_supplicant deamon"
    93.8 +DESC="$(_ '%s daemon' wpa_supplicant)"
    93.9  DAEMON=/usr/bin/wpa_supplicant
   93.10  OPTIONS=$WPA_OPTIONS
   93.11  PIDFILE=/var/run/wpa_supplicant.pid
   93.12 @@ -17,37 +17,36 @@
   93.13  case "$1" in
   93.14    start)
   93.15      if active_pidfile $PIDFILE $NAME ; then
   93.16 -      echo "$NAME already running."
   93.17 +      _ '%s is already running.' $NAME
   93.18        exit 1
   93.19      fi
   93.20 -    echo -n "Starting $DESC: $NAME... "
   93.21 -    $DAEMON $OPTIONS 
   93.22 +    action 'Starting %s: %s...' "$DESC" $NAME
   93.23 +    $DAEMON $OPTIONS
   93.24      status
   93.25      ;;
   93.26    stop)
   93.27      if ! active_pidfile $PIDFILE $NAME ; then
   93.28 -      echo "$NAME is not running."
   93.29 +      _ '%s is not running.' $NAME
   93.30        exit 1
   93.31      fi
   93.32 -    echo -n "Stopping $DESC: $NAME... "
   93.33 -    kill `cat $PIDFILE`
   93.34 +    action 'Stopping %s: %s...' "$DESC" $NAME
   93.35 +    kill $(cat $PIDFILE)
   93.36      status
   93.37      ;;
   93.38    restart)
   93.39      if ! active_pidfile $PIDFILE $NAME ; then
   93.40 -      echo "$NAME is not running."
   93.41 +      _ '%s is not running.' $NAME
   93.42        exit 1
   93.43      fi
   93.44 -    echo -n "Restarting $DESC: $NAME... "
   93.45 -    kill `cat $PIDFILE`
   93.46 +    action 'Restarting %s: %s...' "$DESC" $NAME
   93.47 +    kill $(cat $PIDFILE)
   93.48      sleep 2
   93.49      $DAEMON $OPTIONS
   93.50      status
   93.51      ;;
   93.52    *)
   93.53 -    echo ""
   93.54 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   93.55 -    echo ""
   93.56 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   93.57 +    newline
   93.58      exit 1
   93.59      ;;
   93.60  esac
    94.1 --- a/x11vnc/stuff/x11vnc	Wed May 25 23:07:05 2016 +0200
    94.2 +++ b/x11vnc/stuff/x11vnc	Thu May 26 20:16:45 2016 +0300
    94.3 @@ -1,5 +1,5 @@
    94.4  #!/bin/sh
    94.5 -# /etc/init.d/x11vnc: Start, stop and restart web server on SliTaz, 
    94.6 +# /etc/init.d/x11vnc: Start, stop and restart web server on SliTaz,
    94.7  # at boot time or with the command line. Daemons options are configured
    94.8  # with /etc/daemons.conf
    94.9  #
   94.10 @@ -7,44 +7,43 @@
   94.11  . /etc/daemons.conf
   94.12  
   94.13  NAME=x11vnc
   94.14 -DESC="VNC server"
   94.15 +DESC="$(_ '%s server' VNC)"
   94.16  DAEMON=/usr/bin/x11vnc
   94.17  OPTIONS=$X11VNC_OPTIONS
   94.18  
   94.19  case "$1" in
   94.20    start)
   94.21      if ps x | grep -v grep | grep -q $DAEMON; then
   94.22 -      echo "$NAME already running."
   94.23 +      _ '%s is already running.' $NAME
   94.24        exit 1
   94.25      fi
   94.26 -    echo -n "Starting $DESC: $NAME... "
   94.27 +    action 'Starting %s: %s...' "$DESC" $NAME
   94.28      $DAEMON $OPTIONS &
   94.29      status
   94.30      ;;
   94.31    stop)
   94.32      if ! ps x | grep -v grep | grep -q $DAEMON; then
   94.33 -      echo "$NAME is not running."
   94.34 +      _ '%s is not running.' $NAME
   94.35        exit 1
   94.36      fi
   94.37 -    echo -n "Stopping $DESC: $NAME... "
   94.38 +    action 'Stopping %s: %s...' "$DESC" $NAME
   94.39      killall $(basename $DAEMON)
   94.40      status
   94.41      ;;
   94.42    restart)
   94.43      if ! ps x | grep -v grep | grep -q $DAEMON; then
   94.44 -      echo "$NAME is not running."
   94.45 +      _ '%s is not running.' $NAME
   94.46        exit 1
   94.47      fi
   94.48 -    echo -n "Restarting $DESC: $NAME... "
   94.49 +    action 'Restarting %s: %s...' "$DESC" $NAME
   94.50      killall $(basename $DAEMON)
   94.51      sleep 2
   94.52      $DAEMON $OPTIONS &
   94.53      status
   94.54      ;;
   94.55    *)
   94.56 -    echo ""
   94.57 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   94.58 -    echo ""
   94.59 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   94.60 +    newline
   94.61      exit 1
   94.62      ;;
   94.63  esac
    95.1 --- a/ypserv/stuff/ypserv	Wed May 25 23:07:05 2016 +0200
    95.2 +++ b/ypserv/stuff/ypserv	Thu May 26 20:16:45 2016 +0300
    95.3 @@ -1,5 +1,5 @@
    95.4  #!/bin/sh
    95.5 -# /etc/init.d/ypserv: Start, stop and restart YP (NIS) Server on SliTaz, at 
    95.6 +# /etc/init.d/ypserv: Start, stop and restart YP (NIS) Server on SliTaz, at
    95.7  # boot time or with the command line.
    95.8  #
    95.9  # To start YP (NIS) Server at boot time, just put ypserver in the $RUN_DAEMONS
   95.10 @@ -9,7 +9,7 @@
   95.11  . /etc/daemons.conf
   95.12  
   95.13  NAME=ypserv
   95.14 -DESC="YP (NIS) Server"
   95.15 +DESC="$(_ '%s server' 'YP (NIS)')"
   95.16  DAEMON=/usr/sbin/ypserv
   95.17  OPTIONS=$YPSERV_OPTIONS
   95.18  PIDFILE=/var/run/ypserv.pid
   95.19 @@ -17,38 +17,37 @@
   95.20  case "$1" in
   95.21    start)
   95.22      if active_pidfile $PIDFILE ypserv ; then
   95.23 -      echo "$NAME already running."
   95.24 +      _ '%s is already running.' $NAME
   95.25        exit 1
   95.26      fi
   95.27 -    echo -n "Starting $DESC: $NAME... "
   95.28 +    action 'Starting %s: %s...' "$DESC" $NAME
   95.29      $DAEMON $OPTIONS
   95.30 -    echo "$(pidof ypserv)" > $PIDFILE
   95.31 +    pidof ypserv > $PIDFILE
   95.32      status
   95.33      ;;
   95.34    stop)
   95.35      if ! active_pidfile $PIDFILE ypserv ; then
   95.36 -      echo "$NAME is not running."
   95.37 +      _ '%s is not running.' $NAME
   95.38        exit 1
   95.39      fi
   95.40 -    echo -n "Stopping $DESC: $NAME... "
   95.41 -    kill `cat $PIDFILE`
   95.42 +    action 'Stopping %s: %s...' "$DESC" $NAME
   95.43 +    kill $(cat $PIDFILE)
   95.44      status
   95.45      ;;
   95.46    restart)
   95.47      if ! active_pidfile $PIDFILE ypserv ; then
   95.48 -      echo "$NAME is not running."
   95.49 +      _ '%s is not running.'
   95.50        exit 1
   95.51      fi
   95.52 -    echo -n "Restarting $DESC: $NAME... "
   95.53 -    kill `cat $PIDFILE`
   95.54 +    action 'Restarting %s: %s...' "$DESC" $NAME
   95.55 +    kill $(cat $PIDFILE)
   95.56      sleep 2
   95.57      $DAEMON $OPTIONS
   95.58      status
   95.59      ;;
   95.60    *)
   95.61 -    echo ""
   95.62 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
   95.63 -    echo ""
   95.64 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
   95.65 +    newline
   95.66      exit 1
   95.67      ;;
   95.68  esac