- merged some %s into nls invocations

- German translation finetuning

svn-id: @795

diff --git a/po/de.po b/po/de.po
index d4483e0b6b456adbeb465b600a152bc06b2d969a..a568e447d3d77514881ee6fc0bfdb408bb0b0d68 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
 # German translation of rc-scripts.
 # Pawel Sakowski <pawel@sakowski.eu.org>, 2000.
-# $Id: de.po,v 1.1 2000/09/18 22:32:03 saq Exp $
+# $Id: de.po,v 1.2 2000/09/19 12:46:44 saq Exp $
 #
 
 msgid ""
@@ -98,12 +98,8 @@ msgid "%s dead but pid file exists"
 msgstr "%s tot, aber pid-Datei existiert"
 
 #: ../rc.d/init.d/functions:382
-msgid "Start service"
-msgstr "Den Dienst starten"
-
-#: ../rc.d/init.d/functions:382
-msgid "(Y)es/(N)o/(C)ontinue? [Y] "
-msgstr "(J)a/(N)ein/(W)eiterführen? [J] "
+msgid "Start service %s (Y)es/(N)o/(C)ontinue? [Y] "
+msgstr "Den %s-Dienst starten (J)a/(N)ein/(W)eiterführen? [J] "
 
 #: ../rc.d/init.d/functions:470
 msgid "Loading %s kernel module(s)"
@@ -194,8 +190,8 @@ msgid "Users cannot control this device."
 msgstr "Die Benutzer dürfen dieses Gerät nicht kontrollieren."
 
 #: ../sysconfig/network-scripts/ifup:135
-msgid "Determining IP information for"
-msgstr "Erforscht wird die IP-Information für"
+msgid "Determining IP information for %s"
+msgstr "Die IP-Information für %s wird erforscht"
 
 #: ../sysconfig/network-scripts/ifup:138 ../sysconfig/network-scripts/ifup:145
 msgid " done."
@@ -210,8 +206,8 @@ msgid "/usr/sbin/dip does not exist or is not executable"
 msgstr "/usr/sbin/dip existiert nicht oder ist nicht ausführbar"
 
 #: ../sysconfig/network-scripts/ifup-sl:44
-msgid "/usr/sbin/dip does not exist or is not executable for"
-msgstr "/usr/sbin/dip existiert nicht oder ist nicht ausführbar für"
+msgid "/usr/sbin/dip does not exist or is not executable for %s"
+msgstr "/usr/sbin/dip für %s existiert nicht oder ist nicht ausführbar"
 
 #: ../sysconfig/network-scripts/ifup-sl:42
 msgid "ifup-sl for $DEVICE exiting"
@@ -222,34 +218,24 @@ msgid "does not exist"
 msgstr "existiert nicht"
 
 #: ../sysconfig/network-scripts/ifup-sl:56
-msgid "does not exist"
-msgstr "existiert nicht für"
+msgid "does not exist for %s"
+msgstr "existiert für %s nicht"
 
 #: ../sysconfig/network-scripts/ifup-sl:63
-msgid "dip started for"
-msgstr "dir gestartet für"
-
-#: ../sysconfig/network-scripts/ifup-sl:93
-msgid "slattach started for"
-msgstr "slattach gestartet für"
+msgid "dip started for %s on %s at %s"
+msgstr "dir gestartet für %s auf %s mit %s"
 
-#: ../sysconfig/network-scripts/ifup-sl:63
-#: ../sysconfig/network-scripts/ifup-sl:93
-msgid "on"
-msgstr "auf"
-
-#: ../sysconfig/network-scripts/ifup-sl:63
 #: ../sysconfig/network-scripts/ifup-sl:93
-msgid "at"
-msgstr "mit"
+msgid "slattach started for %s on %s at %s"
+msgstr "slattach gestartet für %s auf %s mit %s"
 
 #: ../sysconfig/network-scripts/ifup-sl:84
 msgid "/sbin/slattach does not exist or is not executable"
 msgstr "/sbin/slattach existiert nicht oder ist nicht ausführbar"
 
 #: ../sysconfig/network-scripts/ifup-sl:87
-msgid "/sbin/slattach does not exist or is not executable for"
-msgstr "/sbin/slattach existiert nicht oder ist nicht ausführbar für"
+msgid "/sbin/slattach does not exist or is not executable for %s"
+msgstr "/sbin/slattach für %s existiert nicht oder ist nicht ausführbar"
 
 #: ../sysconfig/network-scripts/ifup-sl:85
 msgid "exiting"
@@ -327,7 +313,7 @@ msgstr "Dr
 
 #: ../rc.d/rc.sysinit:57
 msgid "to enter interactive startup."
-msgstr "um in die interaktive Startetappe zu wechseln."
+msgstr "um interaktiv hochzufahren."
 
 #: ../rc.d/rc.sysinit:67
 msgid "Mounting Device Filesystem"
@@ -379,8 +365,8 @@ msgid "Loading sound module"
 msgstr "Das Laut-Modul wird geladen"
 
 #: ../rc.d/rc.sysinit:233
-msgid "Loading midi module"
-msgstr "Das MIDI-Modul wird geladen"
+#msgid "Loading midi module"
+#msgstr "Das MIDI-Modul wird geladen"
 
 #: ../rc.d/rc.sysinit:292
 msgid "Loading synthesiser module"
@@ -468,7 +454,7 @@ msgstr "Automatischer Neustart wird ausgef
 
 #: ../rc.d/rc.sysinit:281
 msgid "Finding module dependencies"
-msgstr "Modul-Abhängigkeiten werden gesucht"
+msgstr "Die Modul-Abhängigkeiten werden gesucht"
 
 ##### TIMEZONE #####
 

diff --git a/po/pl.po b/po/pl.po
index e5a2c74f43d0d896c9a9371ffa4042ed7c7566da..bd25f1a66b74e22ca9c73625d8bf92055c1e1fb5 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 # Polish translation of rc-scripts.
 # Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 # Arkadiusz Miskiewicz <misiek@pld.org.pl>, 1999, 2000.
-# $Id: pl.po,v 1.30 2000/06/29 08:24:14 waszi Exp $
+# $Id: pl.po,v 1.31 2000/09/19 12:46:44 saq Exp $
 #
 # ,fuzzy
 msgid ""
@@ -275,8 +275,8 @@ msgid "%sResource Manager: %sEntering runlevel number"
 msgstr "%sZarzadca zasobow: %sWejscie na poziom"
 
 #: ../rc.d/init.d/functions:367
-msgid "Start service"
-msgstr "Uruchomiono usluge"
+msgid "Start service %s (Y)es/(N)o/(C)ontinue? [Y] "
+msgstr "Uruchomic usluge %s (T)ak/(N)ie/(K)ontynuuj? [T] "
 
 #: ../rc.d/rc.shutdown:77
 msgid "Remounting remaining filesystems ro mode"

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index c63a60843f70b232d0cb71f1cbb58f3cca38a060..b8deb081fa0b8629535e8000bb01e051d379f791 100644 (file)
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -1,7 +1,7 @@
 # functions    This file contains functions to be used by most or all
 #              shell scripts in the /etc/init.d directory.
 #
-# $Id: functions,v 1.56 2000/09/18 22:32:04 saq Exp $
+# $Id: functions,v 1.57 2000/09/19 12:46:45 saq Exp $
 #
 # Author:      Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
 # Hacked by:    Greg Galloway and Marc Ewing
@@ -379,7 +379,7 @@ status()
 
 # Confirm whether we really want to run this service
 confirm() {
-       echo -n "`nls "Start service"` $1 `nls "(Y)es/(N)o/(C)ontinue? [Y] "`"
+       echo -n "`nls "Start service %s (Y)es/(N)o/(C)ontinue? [Y] " $1`"
        read answer
        case $answer in
                y|Y|t|T|j|J|"")

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 67451bd8463a7d5707b005944b5ee77cc7c04eb6..f3668d2eb36c1e57e2a0ebae73d3732ce32c5bfe 100755 (executable)
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifup,v 1.46 2000/09/03 02:29:02 baggins Exp $
+#      $Id: ifup,v 1.47 2000/09/19 12:46:45 saq Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
@@ -132,7 +132,7 @@ fi
 
 if [ -n "$DYNIP" -a "$ISALIAS" = "no" ]; then
 
-    echo -n "`nls "Determining IP information for"` $FULLDEVNAME..."
+    echo -n "`nls "Determining IP information for %s" $FULLDEVNAME...`"
     if [ "$DYNIP" = "pump" ]; then
        if /sbin/pump -i $FULLDEVNAME ; then
           nls " done."

diff --git a/sysconfig/network-scripts/ifup-sl b/sysconfig/network-scripts/ifup-sl
index 5bf8457760f00d9299d8b6ffd93f886b4736185a..c25a708a4d4353854e29ea53ba034902065fd970 100755 (executable)
--- a/sysconfig/network-scripts/ifup-sl
+++ b/sysconfig/network-scripts/ifup-sl
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifup-sl,v 1.16 2000/06/12 08:38:15 waszi Exp $
+#      $Id: ifup-sl,v 1.17 2000/09/19 12:46:45 saq Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
@@ -41,7 +41,7 @@ if is_no "$DIRECT_CONNECT"; then
   nls "/usr/sbin/dip does not exist or is not executable"
   nls "ifup-sl for $DEVICE exiting"
   logger -p daemon.info -t ifup-sl \
-    "`nls '/usr/sbin/dip does not exist or is not executable for'` $DEVICE"
+    "`nls '/usr/sbin/dip does not exist or is not executable for %s' $DEVICE`"
   exit 1
 }
 
@@ -53,14 +53,14 @@ DIPSCRIPT=/etc/sysconfig/interfaces/data/dip-$DEVNAME
   echo "/etc/sysconfig/interfaces/data/dip-$DEVICE `nls 'does not exist'`"
   echo "ifup-sl for $DEVICE exiting"
   logger -p daemon.info -t ifup-sl \
-    "/etc/sysconfig/interfaces/data/dip-$DEVICE `nls 'does not exist for'` $DEVICE"
+    "/etc/sysconfig/interfaces/data/dip-$DEVICE `nls 'does not exist for %s' $DEVICE`"
   exit 1
 }
 
 while : ; do
   echo > /var/run/sl-$DEVICE.dev
   (logger -p daemon.info -t ifup-sl \
-    "`nls 'dip started for'` $DEVICE `nls 'on'` $MODEMPORT `nls 'at'` $LINESPEED" &)&
+    "`nls 'dip started for %s on %s at %s' $DEVICE $MODEMPORT $LINESPEED`" &)&
   doexec /usr/sbin/dip dip-$DEVICE $DIPSCRIPT
   if is_no "$PERSIST" || [ ! -f /var/run/sl-$DEVICE.dev ] ; then
     exit 0
@@ -84,13 +84,13 @@ else
        nls "/sbin/slattach does not exist or is not executable"
         echo "ifup-sl - $DEVICE `nls exiting`"
         logger -p daemon.info -t ifup-sl \
-        "`nls '/sbin/slattach does not exist or is not executable for'` $DEVICE"
+        "`nls '/sbin/slattach does not exist or is not executable for %s' $DEVICE`"
         exit 1
 }
 
         echo > /var/run/sl-$DEVICE.dev
         (logger -p daemon.info -t ifup-sl \
-        "`nls 'slattach started for'` $DEVICE `nls on` $MODEMPORT `nls at` $LINESPEED" &)&
+        "`nls 'slattach started for %s on %s at %s' $DEVICE $MODEMPORT $LINESPEED`" &)&
 
          slattach -p $PROTOCOL -s $LINESPEED $MODEMPORT &
          usleep 1500