- nls cant handle special characters such as '\n' - workaround this

svn-id: @629

diff --git a/po/pl.po b/po/pl.po
index f6e3a33294f1f8fdcfb8cc0318122e5765868e39..de043b91f059af71644234d6c74cdb374486cec3 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 # Polish translation of rc-scripts.
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Arkadiusz Miskiewicz <misiek@pld.org.pl>, 1999.
-# $Id: pl.po,v 1.14 1999/12/18 16:26:30 kloczek Exp $
+# $Id: pl.po,v 1.15 2000/01/31 14:29:38 misiek Exp $
 #
 msgid ""
 msgstr ""
@@ -119,34 +119,34 @@ msgstr "Host:"
 # ../rc.d/rc.sysinit:95
 # ../rc.d/rc.sysinit:238
 msgid ""
-"\n"
-"\n"
-"*** An error occurred during the file system check.\n"
-"*** Dropping you to a shell; the system will reboot\n"
-"*** when you leave the shell.\n"
+"*** An error occurred during the file system check."
 msgstr ""
-"\n"
-"\n"
-"*** Podczas sprawdzania systemow plikow wykryto blad niemozliwy do "
-"usuniecia\n"
-"*** automatycznie. Zostaje uruchomiona powloka zeby mozna by³o recznie\n"
-"*** naprawic uszkodzenie. Po wyjsciu z popwloki system zostanie\n"
-"*** automatycznie zrestartowany.\n"
+"*** Podczas sprawdzania systemow plikow wykryto blad niemozliwy do usuniecia."
+
+msgid ""
+"*** Dropping you to a shell; the system will reboot"
+msgstr ""
+"*** Uruchamiam powloke; system zostanie zrestartowany"
+
+msgid ""
+"*** when you leave the shell."
+msgstr ""
+"*** po opuszczeniu powloki."
 
 # ../rc.d/rc.sysinit:214
 msgid ""
-"\n"
-"\n"
-"*** An error occurred during the RAID startup\n"
-"*** Dropping you to a shell; the system will reboot\n"
-"*** when you leave the shell.\n"
+"*** An error occurred during the RAID startup"
+msgstr ""
+"*** Podczas inicjacji urzadzen RAID wykryto blad niemozliwy do usuniecia."
+
+msgid ""
+"*** Dropping you to a shell; the system will reboot"
+msgstr ""
+"*** Uruchamiam powloke; system zostanie zrestartowany"
+msgid ""
+"*** when you leave the shell."
 msgstr ""
-"\n"
-"\n"
-"*** Podczas inicjacji urzadzen RAID wykryto blad niemozliwy do usuniecia\n"
-"*** automatycznie. Zostaje uruchomiona powloka zeby mozna by³o recznie\n"
-"*** naprawic uszkodzenie. Po wyjsciu z powloki system zostanie\n"
-"*** automatycznie zrestartowany.\n"
+"*** po opuszczeniu powloki."
 
 msgid "Initializing random number generator"
 msgstr "Inicjalizacja generatora liczb losowych"

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 44b23fb7bede6ee9c0b8346b300f678cb9680d68..9002b17eb1106f042fc1d1c64ddd2ea8b5b9954b 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # /etc/rc.d/rc.sysinit - run once at boot time
-# $Id: rc.sysinit,v 1.42 2000/01/05 01:18:01 kloczek Exp $
+# $Id: rc.sysinit,v 1.43 2000/01/31 14:29:38 misiek Exp $
 #
 # Taken in part from Miquel van Smoorenburg's bcheckrc.
 # Changes:      Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
@@ -96,7 +96,12 @@ if [ ! -f /fastboot -a ! -n "$NFSROOT" ]; then
 
        # A return of 2 or higher means there were serious problems.
        if [ $rc -gt 1 ]; then
-               nls "\n\n*** An error occurred during the file system check.\n*** Dropping you to a shell; the system will reboot\n*** when you leave the shell.\n"
+               # don't use '\n' in nls macro !
+               echo "\n\n"
+               nls "*** An error occurred during the file system check."
+               nls "*** Dropping you to a shell; the system will reboot"
+               nls "*** when you leave the shell."
+               echo
 
                PS1="`nls "(Repair filesystem) #"`"; export PS1
                if [ "$RUN_SULOGIN_ON_ERR" = "yes" ]; then
@@ -244,7 +249,11 @@ if [ -f /proc/mdstat -a -f /etc/raidtab ]; then
        # A non-zero return means there were problems.
        if [ $rc -gt 0 ]; then
                show "Starting up RAID devices."; fail
-               nls "\n\n*** An error occurred during the RAID startup\n*** Dropping you to a shell; the system will reboot\n*** when you leave the shell.\n"
+               echo "\n\n"
+               nls "*** An error occurred during the RAID startup"
+               nls "*** Dropping you to a shell; the system will reboot"
+               nls "*** when you leave the shell."
+               echo
 
                PS1="`nls "(RAID Repair) #"`"; export PS1
                if [ "$RUN_SULOGIN_ON_ERR" = "yes" ]; then
@@ -269,7 +278,11 @@ if [ ! -f /fastboot ]; then
 
        # A return of 2 or higher means there were serious problems.
        if [ $rc -gt 1 ]; then
-               nls "\n\n*** An error occurred during the file system check.\n*** Dropping you to a shell; the system will reboot\n*** when you leave the shell.\n"
+               echo "\n\n"
+               nls "*** An error occurred during the file system check."
+               nls "*** Dropping you to a shell; the system will reboot"
+               nls "*** when you leave the shell."
+               echo
 
                PS1="`nls "(Repair filesystem) #"`"; export PS1
                if [ "$RUN_SULOGIN_ON_ERR" = "yes" ]; then