Check-in [ac4cda81a1]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:ac4cda81a19c6c7530b33edeee67e2b74f7f868e
Date: 2012-02-01 12:14:34
User: BarryK
Comment:rodin.s: internationalized filemnt, icon_switcher, input-wizard, loginmanager, modemprobe, modemprobe_help, modemtest. BK: ipinfo, modemprobe_erase

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/usr/sbin/filemnt

@@ -7,10 +7,15 @@
 #100831 fix KERNELSUBVER for olpc people, have 'uname -r' returning version with '_'.
 #101221 yaf-splash fix.
 #111016 fix for 3.x kernel.
 #111110 handle encrypted save-files.
 #111112 small fixes.
+#120201 rodin.s: internationalization.
+
+export TEXTDOMAIN=filemnt
+export OUTPUT_CHARSET=UTF-8
+. gettext.sh
 
 #v423...
 KERNELVER="`uname -r`"
 if vercmp $KERNELVER ge 3.0;then #111016
  SFSSTR='squashfs, version 4'
@@ -69,11 +74,11 @@
    MNTDIMG="`losetup-FULL $ONELOOP | cut -f 2 -d '(' | cut -f 1 -d ')'`"
     IMGBASE="`basename "$MNTDIMG"`"
     #echo "IMGBASE=$IMGBASE imgFileBASE=$imgFileBASE" #TEST
     #not perfect, but paths may be symlinks...
     if [ "$IMGBASE" = "$imgFileBASE" ];then #if [ "$MNTDIMG" = "$imgFile" ];then
-     xmessage "Sorry $imgFile is already mounted and in-use by Puppy"
+     xmessage "`eval_gettext \"Sorry \\\$imgFile is already mounted and in-use by Puppy\"`"
      exit
     fi
   done
 
   Ext=`echo "$imgFile" |sed 's/^.*\.//'`	# get file type from extention
@@ -96,19 +101,19 @@
 
   #v423 detect wrong squashfs version...
   if [ "$Type" = "squashfs" ];then
    if [ "`disktype "${imgFile}" | grep "$SFSSTR"`" = "" ];then
     if [ $SFSMAJOR -eq 4 ];then #100606
-     xmessage -center -bg '#FFC0C0' "NOTICE: This is an older version 3.x squashfs file, not usable.
+     xmessage -center -bg '#FFC0C0' "`gettext \"NOTICE: This is an older version 3.x squashfs file, not usable.
 All Linux kernels 2.6.29 or later require version 4.x squashfs files
 (note, some 2.6.27.47+ kernels have Squashfs4 backported to them).
-Note, there is an SFS-version-converter in the Utility menu, run that first."
+Note, there is an SFS-version-converter in the Utility menu, run that first.\"`"
     else
-     xmessage -center -bg '#FFC0C0' "NOTICE: This is a newer version 4.x squashfs file, not usable.
+     xmessage -center -bg '#FFC0C0' "`gettext \"NOTICE: This is a newer version 4.x squashfs file, not usable.
 All Linux kernels 2.6.28 or earlier require version 3.x squashfs files
 (note, an exception is some 2.6.27.47+ kernels that have Squashfs4 backported).
-Note, there is an SFS-version-converter in the Utility menu, run that first."
+Note, there is an SFS-version-converter in the Utility menu, run that first.\"`"
     fi
     exit
    fi
   fi
 
@@ -124,11 +129,11 @@
    ext2|ext3|ext4)
     case $imgFileBASE in
      *_cryptx*) #light encryption.
       CRYPTO='light'
       modprobe cryptoloop
-      rxvt -geometry 25x3 -title "Enter password" -bg orange -e losetup-FULL -E 1 $DEVLOOP $imgFile
+      rxvt -geometry 25x3 -title "$(gettext 'Enter password')" -bg orange -e losetup-FULL -E 1 $DEVLOOP $imgFile
       #losetup-FULL -E 1 $DEVLOOP $imgFile
       Err=$?
      ;;
      *_crypt*) #heavy encryption.
       CRYPTO='heavy'
@@ -136,11 +141,11 @@
       modprobe aes_generic 2>/dev/null #v407 aes name change.
       modprobe aes 2>/dev/null #for older kernel <2.6.25
       modprobe crypto_blkcipher 2>/dev/null #v407 blkcipher name change.
       modprobe blkcipher 2>/dev/null #old kernel.
       modprobe cbc
-      MYPASS="`pupdialog --title "Password required" --stdout --inputbox "Password required to open ${imgFileBASE}:" 0 0`"
+      MYPASS="`pupdialog --title "$(gettext 'Password required')" --stdout --inputbox "$(gettext 'Password required to open') ${imgFileBASE}:" 0 0`"
       Err=$?
       if [ $Err -eq 0 ];then
        echo "$MYPASS" | losetup-FULL -p 0 -e aes $DEVLOOP $imgFile
        Err=$?
       fi
@@ -158,11 +163,11 @@
 
   if [ $Err -eq 0 ] ;then
    rox -d $MntPt # mount good, run rox filer
 #   yaf-splash -timeout 6 -font "8x16" -outline 0 -margin 4 -bg green -text "SUCCESS! Click $imgFileBASE icon again to unmount it" & #BK
 #   /usr/X11R7/bin/yaf-splash -timeout 6 -font "8x16" -outline 0 -margin 4 -bg green -text "SUCCESS! Click $imgFileBASE icon again to unmount it" & #BK
-   yaf-splash -timeout 6 -bg green -text "SUCCESS! Click $imgFileBASE icon again to unmount it" & #BK
+   yaf-splash -timeout 6 -bg green -text "`eval_gettext \"SUCCESS! Click \\\$imgFileBASE icon again to unmount it\"`" & #BK
   fi
 
  else							### file's mounted, unmount it
   rox -D $MntPt #BK
   sync #111112
@@ -169,11 +174,11 @@
   umount $MntPt
   Err=$?
   #if [ "$imgFileBASE" = 'initrd' ] ;then gzip -9 $imgFile ;fi #111112 bug fix. no, remove.
 #  yaf-splash -timeout 3 -font "8x16" -outline 0 -margin 4 -bg orange -text "Unmounting $imgFileBASE" #BK
 #  /usr/X11R7/bin/yaf-splash -timeout 3 -font "8x16" -outline 0 -margin 4 -bg orange -text "Unmounting $imgFileBASE" #BK
-  yaf-splash -timeout 3 -bg orange -text "Unmounting $imgFileBASE" #BK
+  yaf-splash -timeout 3 -bg orange -text "$(gettext 'Unmounting') $imgFileBASE" #BK
   #Xdialog --title " Notice..." --no-button \
   #        --infobox "
   #UnMounting: $imgFile
   #" 0 0 2000
   echo -e "\n ### UnMount: $imgFile\n"
@@ -180,9 +185,9 @@
   sync #111112
   rmdir $MntPt
  fi
  if [ $Err -ne 0 ] ;then			# ERROR: mount/unmount
   #xmessage -title " ERROR..." "  Failed mounting or unmounting.  "
-  pupdialog --background red --title "ERROR" --msgbox "Failed mounting or unmounting" 0 0
+  pupdialog --background red --title "$(gettext 'ERROR')" --msgbox "$(gettext 'Failed mounting or unmounting')" 0 0
  fi
 
 ###END###

Changes to woof-code/rootfs-skeleton/usr/sbin/icon_switcher

@@ -6,10 +6,20 @@
 #v4.00 HairyWill: restart rox and jwm immediately.
 #w477 record name of theme in /etc/desktop_icon_theme
 #100411 fbpanel menu did not update.
 #110721 new standardised icons to show when mounted.
 #110912 modify jwm to use menu icon 'start-button.png' if present.
+#120201 rodin.s: internationalized
+
+export TEXTDOMAIN=icon_switcher
+export TEXTDOMAINDIR=/usr/share/locale
+export OUTPUT_CHARSET=UTF-8
+eval_gettext () {
+  local myMESSAGE=$(gettext "$1")
+  eval echo \"$myMESSAGE\"
+}
+export LANGORG=$LANG
 
 #  <text><label>\"${CHARPAD}\"</label></text>
 
 ICONSETSGUI=""
 for ONEDIR in `find /usr/local/lib/X11/themes/ -mindepth 1 -maxdepth 1 -type d | tr '\n' ' '`
@@ -37,18 +47,18 @@
 "
 
 done
 
 export ICONSWITCHGUI="
-<window title=\"Puppy Icon Switcher\" icon-name=\"gtk-convert\">
+<window title=\"$(gettext 'Puppy Icon Switcher')\" icon-name=\"gtk-convert\">
  <vbox>
-  <text><label>Choose the icon-set for desktop and menu</label></text>
+  <text><label>$(gettext 'Choose the icon-set for desktop and menu')</label></text>
 
   ${ICONSETSGUI}
 
   <hbox>
-   <button><input file stock=\"gtk-quit\"></input><label>QUIT</label></button>
+   <button><input file stock=\"gtk-quit\"></input><label>$(gettext 'QUIT')</label></button>
   </hbox>
  </vbox>
 </window>"
 
 echo "$ICONSWITCHGUI" > /tmp/iconswitchgui
@@ -86,11 +96,11 @@
    pngtopnm $ONEPNG | pnmscale -reduce 2 | pnmtopng -alpha=/tmp/temp2.pbm > /usr/local/lib/X11/pixmaps/${xONEBASENAME}24.png
    touch -m /usr/local/lib/X11/pixmaps/${xONEBASENAME}24.png #v3.98
   fi
  done
 
- #110721 new standardised icons to show when mounted...
+  #110721 new standardised icons to show when mounted...
  if [ "`which pngoverlay`" -a -e /usr/local/lib/X11/pixmaps/closebox_outline48.png ];then #overlay app created by vovchik (see source /usr/sbin/pngoverlay.bac)
   rm -f /usr/local/lib/X11/pixmaps/*_mntd*.png
   cd /usr/local/lib/X11/pixmaps
   cp -f /usr/sbin/pngoverlay /usr/local/lib/X11/pixmaps/ #dumb, but needs to be in same folder.
   for ONEDRV in card drive floppy optical usbdrv
@@ -117,11 +127,10 @@
     sed -i -e "$PTN2" /root/.jwmrc-tray
    fi
   fi
  fi
 
-
 # export ENDGUI="
 #<window title=\"Puppy Icon Switcher\" icon-name=\"gtk-convert\">
 # <vbox>
 #  <text><label>\"You have chosen the '${NEWTHEME}' theme.
 #These are icons for the desktop and top-level of menu.
@@ -134,15 +143,15 @@
 #</window>"
 # gtkdialog3 --program=ENDGUI
 
  #v4.00 HairyWill restart rox and jwm immediately...
  export ENDGUI="
-<window title=\"Puppy Icon Switcher\" icon-name=\"gtk-convert\">
+<window title=\"$(gettext 'Puppy Icon Switcher')\" icon-name=\"gtk-convert\">
  <vbox>
-  <text><label>\"You have chosen the '${NEWTHEME}' theme.
+  <text><label>\"`eval_gettext \"You have chosen the '\\\${NEWTHEME}' theme.
 These are icons for the desktop and top-level of menu.
-Click OK button and you will see them...\"</label></text>
+Click OK button and you will see them...\"`\"</label></text>
   <hbox>
    <button><input file stock=\"gtk-quit\"></input><label>OK</label></button>
   </hbox>
  </vbox>
 </window>"

Changes to woof-code/rootfs-skeleton/usr/sbin/input-wizard

@@ -13,56 +13,62 @@
 #100127 notice to restart X if change keyboard layout (see code in /usr/bin/xwin to sync x and console).
 #100215 moved sync code for console/xorg kbd layout from xwin.
 #100527 added jemimah's flsynclient touchpad config.
 #101112 disabled FONTMAP, see http://bkhome.org/blog/?viewDetailed=01956
 #110814 01micko: convert script from gtkdialog2 to gtkdialog3+.
+#120201 rodin.s: internationalized.
+
+export TEXTDOMAINDIR=/usr/share/locale
+export TEXTDOMAIN=input-wizard
+export OUTPUT_CHARSET=UTF-8
+. gettext.sh
 
 export MouseKeyboardWizard="
-<window title=\"Input Wizard\">
+<window title=\"$(gettext 'Input Wizard')\">
  <vbox>
   <hbox>
    <text>
-    <label>Choose keyboard layout for your country...</label>
+    <label>$(gettext 'Choose keyboard layout for your country...')</label>
    </text>
    <button>
     <input file>/usr/local/lib/X11/mini-icons/mini-keyboard.xpm</input>
     <action type=\"exit\">KEY1BUTTON</action>
    </button>
   </hbox>
   <hbox>
    <text>
-    <label>Advanced Xorg keyboard configuration...</label>
+    <label>$(gettext 'Advanced Xorg keyboard configuration...')</label>
    </text>
    <button>
     <input file>/usr/local/apps/XkbConfigurationManager/images/layout16.png</input>
     <action type=\"exit\">KEY4BUTTON</action>
    </button>
   </hbox>
 
   <hbox>
    <text>
-    <label>Choose keyboard interface...</label>
+    <label>$(gettext 'Choose keyboard interface...')</label>
    </text>
    <button>
     <input file>/usr/local/lib/X11/mini-icons/mini-keyboard.xpm</input>
     <action type=\"exit\">KEY3BUTTON</action>
    </button>
   </hbox>
 
   <hbox>
    <text>
-    <label>Choose type of mouse...</label>
+    <label>$(gettext 'Choose type of mouse...')</label>
    </text>
    <button>
     <input file>/usr/local/lib/X11/mini-icons/Mouse.xpm</input>
     <action type=\"exit\">MOUSE1BUTTON</action>
    </button>
   </hbox>
 
   <hbox>
    <text>
-    <label>Configure your touchpad...</label>
+    <label>$(gettext 'Configure your touchpad...')</label>
    </text>
    <button>
     <input file>/usr/local/lib/X11/mini-icons/Mouse.xpm</input>
     <action type=\"exit\">TOUCHPAD1BUTTON</action>
    </button>
@@ -144,11 +150,11 @@
  FONTMAP=""
  CODEPAGE=""
  CURRKMAP="us"
  [ -f /etc/keymap ] && CURRKMAP="`cat /etc/keymap | sed -e 's/\..*//'`"
  #Xdialog --title "Keyboard Wizard" --cancel-label "Cancel" --default-item "$CURRKMAP" --menubox "Select country for your keyboard:" 0 0 0 $( for F in $KEYLIST; do echo $F ; done ) 2> /tmp/kbdextlayout.txt
- XDLG="Xdialog --title \"Keyboard Wizard\" --cancel-label \"Cancel\" --default-item \"$CURRKMAP\" --menubox \"Select country for your keyboard:\" 0 0 0 ${KEYLIST} 2> /tmp/kbdextlayout.txt"
+ XDLG="Xdialog --title \"$(gettext 'Keyboard Wizard')\" --cancel-label \"$(gettext 'Cancel')\" --default-item \"$CURRKMAP\" --menubox \"$(gettext 'Select country for your keyboard:')\" 0 0 0 ${KEYLIST} 2> /tmp/kbdextlayout.txt"
  eval $XDLG
  [ $? != 0 ] && return 1
  KEYBOARD="`cat /tmp/kbdextlayout.txt`"
  case $KEYBOARD in #note, same code in /etc/rc.d/rc.country and init.
   de*|be*|br*|dk*|es*|fi*|fr*|it*|no*|se*|sv*|pt*) #100127 added sv
@@ -191,14 +197,14 @@
    CHECKKEY1="false"
    [ "$KEYBRDTYPE" = "usb" ] && CHECKKEY1="true"
    export KeyboardFeaturesWizard="
 <window>
  <vbox>
-  <frame Keyboard interface>
+  <frame $(gettext 'Keyboard interface')>
    <vbox>
     <text>
-     <label>Changing this only takes effect after Puppy is rebooted!</label>
+     <label>$(gettext 'Changing this only takes effect after Puppy is rebooted!')</label>
     </text>
     <checkbox>
      <label>Keyboard has USB interface</label>
      <default>$CHECKKEY1</default>
      <variable>CHECKBOX002</variable>
@@ -244,25 +250,25 @@
     DEF2="false"
     DEF3="true"
    fi
 
    RADIO1="     <radiobutton>
-      <label>PS/2 mouse (most common)</label>
+      <label>$(gettext 'PS/2 mouse (most common)')</label>
       <variable>RADIO001</variable>
       <default>$DEF1</default>
       <action>if true disable:COMPORT</action>
      </radiobutton>
 "
    RADIO2="     <radiobutton>
-      <label>Serial mouse</label>
+      <label>$(gettext 'Serial mouse')</label>
       <variable>RADIO002</variable>
       <default>$DEF2</default>
       <action>if true enable:COMPORT</action>
      </radiobutton>
 "
    RADIO3="     <radiobutton>
-      <label>USB or PS/2 mouse (also touchpad)</label>
+      <label>$(gettext 'USB or PS/2 mouse (also touchpad)')</label>
       <variable>RADIO003</variable>
       <default>$DEF3</default>
       <action>if true disable:COMPORT</action>
      </radiobutton>
 "
@@ -300,28 +306,28 @@
    #v4.11 Control "tapping" function on ALPS/Synaptics touchpads - manipulates MaxTapTime option in xorg.conf.
    TAPCHKBOX=""
    if [ -f /etc/X11/xorg.conf -a "`grep '"MaxTapTime"' /etc/X11/xorg.conf`" != "" ];then #touchpad present
     [ "`grep '"MaxTapTime"' /etc/X11/xorg.conf | grep '"0"'`" = "" ] && CHECKT="true" || CHECKT="false" #taps enabled/disabled
     TAPCHKBOX="    <checkbox>
-     <label>Enable touchpad tapping for mouse button clicks</label>
+     <label>$(gettext 'Enable touchpad tapping for mouse button clicks')</label>
      <variable>CHECKBOX013</variable>
      <default>$CHECKT</default>
     </checkbox>
 "
    fi  #v4.11 end
 
    #v1.0.7 modified for gtkdialog2... 110814: make that gtkdialog3
    export MouseWizard="
-<window title=\"Mouse Wizard\">
+<window title=\"$(gettext 'Mouse Wizard')\">
  <vbox>
-  <frame Mouse interface>
+  <frame $(gettext 'Mouse interface')>
    <hbox>
     <vbox>
      $RADIOBUTTONS
     </vbox>
     <vbox>
-       <text><label>Serial port:</label></text>
+       <text><label>$(gettext 'Serial port:')</label></text>
        <combobox>
          <item>ttyS0</item>
          <item>ttyS1</item>
          <item>ttyS2</item>
          <item>ttyS3</item>
@@ -329,29 +335,29 @@
          <visible>disabled</visible>
        </combobox>
     </vbox>
    </hbox>
   </frame>
-  <frame Mouse features>
+  <frame $(gettext 'Mouse features')>
    <vbox>
     <checkbox>
-     <label>Mouse has a scroll wheel</label>
+     <label>$(gettext 'Mouse has a scroll wheel')</label>
      <variable>CHECKBOX009</variable>
      <default>$CHECK1</default>
     </checkbox>
     <checkbox>
-     <label>Middle button emulated on a 2-button mouse</label>
+     <label>$(gettext 'Middle button emulated on a 2-button mouse')</label>
      <variable>CHECKBOX010</variable>
      <default>$CHECKM</default>
     </checkbox>
     <checkbox>
-     <label>Auto-hide mouse cursor when not moving</label>
+     <label>$(gettext 'Auto-hide mouse cursor when not moving')</label>
      <variable>CHECKBOX011</variable>
      <default>$CHECKH</default>
     </checkbox>
     <checkbox>
-     <label>Left-handed mouse (requires Xorg driver)</label>
+     <label>$(gettext 'Left-handed mouse (requires Xorg driver)')</label>
      <variable>CHECKBOX012</variable>
      <default>$CHECKL</default>
     </checkbox>
     $TAPCHKBOX
    </vbox>
@@ -532,20 +538,20 @@
    if [ -d /etc/X11/xkb/symbols/pc ];then #100127 fallback... 100215 improved...
     if [ ! -f /etc/X11/xkb/symbols/pc/${XKEYMAP} ];then
      if [ ! -f /etc/X11/xkb/symbols/${XKEYMAP} ];then
       #echo "ERROR: Console keyboard `cat /etc/keymap` no matching Xorg layout. PLEASE REPORT TO BK"
       XKEYMAP='us'
-      KMAPERR="There is a problem.
-You have chosen \"$KMAP\" console keyboard map, however Xorg
+      KMAPERR="`eval_gettext \"There is a problem.
+You have chosen \"\\\$KMAP\" console keyboard map, however Xorg
 cannot find a matching layout. Note, available Xorg layouts
 are in /etc/X11/xkb/symbols/pc.
 Would you kindly contact BarryK at http://bkhome.org/blog and
-report this. If you can suggest a correct match for \"$KMAP\"
+report this. If you can suggest a correct match for \"\\\$KMAP\"
 in /etc/X11/xkb/symbols/pc, that will be very helpful.
 
-For now, setting Xorg to use \"us\" layout."
-      Xdialog --title "Keyboard Wizard: ERROR" --msgbox "$KMAPERR" 0 0
+For now, setting Xorg to use \"us\" layout.\"`"
+      Xdialog --title "$(gettext 'Keyboard Wizard: ERROR')" --msgbox "$KMAPERR" 0 0
      fi
     fi
    fi
    currXKEYMAP="`grep '#xkeymap0' /etc/X11/xorg.conf | tr '\t' ' ' | tr -s ' ' | cut -f 4 -d '"'`" #'geany fix
    if [ "$currXKEYMAP" != "$XKEYMAP" ];then
@@ -552,20 +558,20 @@
     skPATTERN="s%.*#xkeymap0%	Option      \"XkbLayout\" \"${XKEYMAP}\" #xkeymap0%"
     sed -i -e "${skPATTERN}" /etc/X11/xorg.conf #100130
    fi
   fi
 
-  KMAPMSG="You have chosen \"$KMAP\" keyboard map.
+  KMAPMSG="`eval_gettext \"You have chosen \"\\\$KMAP\" keyboard map.
 Note, this information is saved in file /etc/keymap
 
 YOU WILL NEED TO RESTART X FOR THIS TO TAKE EFFECT
 
-Press OK button to continue Wizard..."
-  Xdialog --title "Keyboard Wizard" --msgbox "$KMAPMSG" 0 0
+Press OK button to continue Wizard...\"`"
+  Xdialog --title "$(gettext 'Keyboard Wizard')" --msgbox "$KMAPMSG" 0 0
  fi
 
 done #end while loop.
 unset MouseKeyboardWizard
 unset MouseWizard
 unset KeyboardFeaturesWizard
 
 ###END###

Changes to woof-code/rootfs-skeleton/usr/sbin/ipinfo

@@ -1,13 +1,13 @@
 #!/bin/bash
-
-# --------------
-# PROGRAM: ipdisp
 # AUTHOR: Vovchik
 # PURPOSE: GUI to show IP config info
 # DATE: 14 May 2009
-# --------------
+#120201 BK: internationalized.
+
+export TEXTDOMAIN=ipinfo
+export OUTPUT_CHARSET=UTF-8
 
 # --------------
 # functions
 # --------------
 
@@ -17,13 +17,13 @@
 {
 	nl='
 '
 	# external ip
 	var0="`wget -O - -q icanhazip.com`"
-	var0="External IP: ""$var0"
+	var0="$(gettext 'External IP:') ""$var0"
 	# tab 1 - interfaces
-	var01=`echo Hostname: "$HOSTNAME"`
+	var01=`echo $(gettext 'Hostname:') "$HOSTNAME"`
 	var02=`ifconfig`
 	# tab 3 - routing
 	var03="`route -n | sed -e 's%Kernel IP routing table%%'`"
 	# tab 2
 	var04="DNS:"
@@ -41,11 +41,11 @@
 		var11=`iwlist rate 2>&1 | grep Current`
 		# concatenate wireless data for display
 		var12="$var06""$nl""$var07""$nl""$var08""$nl""$var09""$nl""$var10""$nl""$var11""$nl"
 		var12=`echo "$var12" | sed '/^$/d' `
 	else
-		var12="<b>No wireless extensions detected.</b>"
+		var12="<b>$(gettext 'No wireless extensions detected.')</b>"
 	fi
 	# tab 5 - collect connection data
 	var13="`netstat -tan`"
 }
 # --------------
@@ -68,14 +68,14 @@
 # --------------
 make_gui()
 # --------------
 {
 export show_ip_info="
-<window title=\"IP Info\" icon-name=\"gtk-about\">
+<window title=\"$(gettext 'IP Info')\" icon-name=\"gtk-about\">
 	<vbox>
-		<frame Network Configuration>
-			<notebook labels=\"Interfaces|DNS|Routing|Wireless|Statistics\">
+		<frame $(gettext 'Network Configuration')>
+			<notebook labels=\"$(gettext 'Interfaces')|$(gettext 'DNS')|$(gettext 'Routing')|$(gettext 'Wireless')|$(gettext 'Statistics')\">
 				<vbox>
 					<text use-markup=\"true\" wrap=\"false\">
 						<label>\"<tt><b>${nl}${var01}</b>${nl}${var0}${nl}${nl}${var02}</tt>\"</label>
 					</text>
 				</vbox>
@@ -84,20 +84,20 @@
 						<label>\"<tt><b>${nl}${var04}${nl}</b>${nl}${var05}</tt>\"</label>
 					</text>
 				</vbox>
 				<vbox>
 					<text use-markup=\"true\" wrap=\"false\">
-						<label>\"<tt>${nl}<b>Kernel IP routing table</b>${nl}${var03}${nl}${nl}</tt>\"</label>
+						<label>\"<tt>${nl}<b>$(gettext 'Kernel IP routing table')</b>${nl}${var03}${nl}${nl}</tt>\"</label>
 					</text>
 				</vbox>
 				<vbox>
 					<text use-markup=\"true\" wrap=\"false\">
-						<label>\"<tt><b>${nl}Wireless configuration:${nl}</b>${nl}${var12}</tt>\"</label>
+						<label>\"<tt><b>${nl}$(gettext 'Wireless configuration:')${nl}</b>${nl}${var12}</tt>\"</label>
 					</text>
 				</vbox>
 				<vbox>
-<text use-markup=\"true\" wrap=\"false\"><label>\"<tt>${nl}<b>Network statistics:</b>${nl}${nl}${var13}</tt>\"</label></text>
+<text use-markup=\"true\" wrap=\"false\"><label>\"<tt>${nl}<b>$(gettext 'Network statistics:')</b>${nl}${nl}${var13}</tt>\"</label></text>
 				</vbox>
 			</notebook>
 		</frame>
 		<hbox>
 			<button ok></button>
@@ -121,11 +121,11 @@
 
 # --------------
 # main
 # --------------
 
-xmessage -buttons "" -center -bg orange "Please wait, probing..." &
+xmessage -buttons "" -center -bg orange "$(gettext 'Please wait, probing...')" &
 XPID=$!
 get_data
 show_data
 make_gui
 kill $XPID

Changes to woof-code/rootfs-skeleton/usr/sbin/loginmanager

@@ -1,34 +1,39 @@
 #!/bin/sh
 #110507 TaZOC bug fix.
+#120201 rodin.s: internationalized.
+
+export TEXTDOMAIN=loginmanager
+export TEXTDOMAINDIR=/usr/share/locale
+export OUTPUT_CHARSET=UTF-8
 
 HOMEUSER="`whoami`"
 
 CHANGE2ROOT=""
 if [ "$HOMEUSER" != "root" ];then
- CHANGE2ROOT="<text><label>However, if you wish, you can change to the administrator (root) permanently on the next boot. Just tick this box and it will be so:</label></text>
+ CHANGE2ROOT="<text><label>$(gettext 'However, if you wish, you can change to the administrator (root) permanently on the next boot. Just tick this box and it will be so:')</label></text>
   <checkbox>
-   <label>Tick box to become administrator permanently</label>
+   <label>$(gettext 'Tick box to become administrator permanently')</label>
    <default>false</default>
    <variable>CHECKADMIN</variable>
   </checkbox>
   <hbox>
    <entry invisible_char=\"x\" visibility=\"false\">
     <variable>ADMINPASSWORD</variable>
    </entry>
-   <text><label>Type admin password here</label></text>
+   <text><label>$(gettext 'Type admin password here')</label></text>
   </hbox>
- <text><label>This will take affect after reboot.</label></text>
+ <text><label>$(gettext 'This will take affect after reboot.')</label></text>
  "
 
 fi
 
 
 export MAIN_DIALOG="
 <window title=\"LoginManager\" icon-name=\"gtk-execute\">
  <vbox>
-  <text use-markup=\"true\"><label>\"<b>Currently you are logged in as '${HOMEUSER}'</b>\"</label></text>
+  <text use-markup=\"true\"><label>\"<b>$(gettext 'Currently you are logged in as') '${HOMEUSER}'</b>\"</label></text>
 
   ${CHANGE2ROOT}
 
   <hbox>
    <button ok></button>
@@ -48,13 +53,13 @@
 
 #if [ "$CHANGE2ROOT" != "" ];then
  if [ "$CHECKADMIN" = "true" ];then
   echo "$ADMINPASSWORD" | su root
   if [ $? -ne 0 ];then
-   xmessage -bg red -center "Sorry, admin password is wrong"
+   xmessage -bg red -center "$(gettext 'Sorry, admin password is wrong')"
    exit
   fi
   rootEXPR="s%^tty1.*%tty1::respawn:/sbin/mingetty --autologin root tty1%"
   sed -i -e "$rootEXPR" /etc/inittab #110507 TaZOC bug fix.
-  xmessage -bg green -center "Ok, you will be administrator at next boot"
+  xmessage -bg green -center "$(gettext 'Ok, you will be administrator at next boot')"
  fi
 #fi

Changes to woof-code/rootfs-skeleton/usr/sbin/modemprobe

@@ -6,16 +6,26 @@
 #v477 rerwin: v413 handle both lspci formats (replacing v003).
 #v477 rerwin: v413 added more module names for wireless modems
 #101202 bk: choose erase, remove /var/local/pupdial/hotpluggable (see pupdial).
 #101203 wvdialconf will ignore many devs that are not /dev/ttyS*, for example /dev/ttyAGS3 (agrmodem).
 #101206 changes to pupdial_init_hotpluggable.
+#120201 rodin.s: internationalized.
+
+export TEXTDOMAIN=modemprobe
+export TEXTDOMAINDIR=/usr/share/locale
+export OUTPUT_CHARSET=UTF-8
+eval_gettext () {
+  local myMESSAGE=$(gettext "$1")
+  eval echo \"$myMESSAGE\"
+}
+export LANGORG=$LANG
 
 MODEMDEV=""
 if [ -h /dev/modem ];then
  MODEMDEV="`readlink /dev/modem`"
  MSGMDM3="
-PORT: /dev/modem is currently linked to port ${MODEMDEV}."
+$(gettext 'PORT: /dev/modem is currently linked to port') ${MODEMDEV}."
 fi
 
 #find all loaded modem modules...
 KERNVER=`uname -r` #v433
 ALSAMODEMINFO="`cat /proc/asound/pcm 2>/dev/null | grep ' Modem :'`"
@@ -38,80 +48,80 @@
 
 case $MMCNT in
  0)
 #v412 Check for any driver of a modem that is not detected automatically.
 #v433 This check is no longer valid, since any such modem is now supported through the udev rules file /etc/udev/rules.d/60-dialup-modem.rules and, thus, will have its driver loaded. Logic removed.
- MSGMDM1="Well, Puppy did not detect anything at bootup, so if the modem was turned-on then it probably is not supported by any of the drivers in Puppy. Tough, you need to get another modem -- an old serial modem is best. There are some USB modems that work well."
+ MSGMDM1="$(gettext 'Well, Puppy did not detect anything at bootup, so if the modem was turned-on then it probably is not supported by any of the drivers in Puppy. Tough, you need to get another modem -- an old serial modem is best. There are some USB modems that work well.')"
  ;;
  1)
-  MSGMDM1="Puppy did detect a modem at bootup, and loaded this driver:
+  MSGMDM1="$(gettext 'Puppy did detect a modem at bootup, and loaded this driver:')
 ${MODEMMODS}${MSGMDM2}${MSGMDM3}"
  ;;
  *)
-  MSGMDM1="Puppy detected more than one modem at bootup and and loaded these drivers:
+  MSGMDM1="$(gettext 'Puppy detected more than one modem at bootup and and loaded these drivers:')
 ${MODEMMODS}${MSGMDM2}${MSGMDM3}"
  ;;
 esac
 
 
 
 export MAINDIALOG="
-<window title=\"PupDial modem selection\" icon-name=\"gtk-connect\">
+<window title=\"$(gettext 'PupDial modem selection')\" icon-name=\"gtk-connect\">
  <vbox>
 
-  <frame Automatic probing>
+  <frame $(gettext 'Automatic probing')>
    <hbox>
-    <text  use-markup=\"true\"><label>\"<b>Click this button to use the 'wvdialconf' program to automatically probe and setup a modem for use by PupDial. If successful will create or update /etc/wvdial.conf and will set /dev/modem as a link to the correct modem port:</b>\"</label></text>
+    <text  use-markup=\"true\"><label>\"<b>`gettext \"Click this button to use the 'wvdialconf' program to automatically probe and setup a modem for use by PupDial. If successful will create or update /etc/wvdial.conf and will set /dev/modem as a link to the correct modem port:\"`</b>\"</label></text>
     <button>
-     <label>PROBE</label>
+     <label>$(gettext 'PROBE')</label>
      <action type=\"exit\">SETUP</action>
     </button>
    </hbox>
   </frame>
 
-  <notebook labels=\"Automatic detection|Manual probing\">
+  <notebook labels=\"$(gettext 'Automatic detection')|$(gettext 'Manual probing')\">
   <vbox>
    <hbox>
-    <text><label>\"Most modems are autodetected by Puppy at bootup, but it has to be turned on! (or plugged in). ${MSGMDM1}\"</label></text>
+    <text><label>\"$(gettext 'Most modems are autodetected by Puppy at bootup, but it has to be turned on! (or plugged in).') ${MSGMDM1}\"</label></text>
 
     <vbox>
     <button>
-     <label>HELP</label>
+     <label>$(gettext 'HELP')</label>
      <action>/usr/sbin/modemprobe_help &</action>
     </button>
     </vbox>
    </hbox>
 
-   <frame Detection control>
+   <frame $(gettext 'Detection control')>
    <hbox>
-    <text><label>Click this button to blacklist a modem module. Note that you will then have to click the ERASE button, then reboot Puppy so that autodetection can re-occur.</label></text>
+    <text><label>$(gettext 'Click this button to blacklist a modem module. Note that you will then have to click the ERASE button, then reboot Puppy so that autodetection can re-occur.')</label></text>
     <vbox>
     <button>
-     <label>BLACKLIST</label>
+     <label>$(gettext 'BLACKLIST')</label>
      <action>/usr/sbin/bootmanager blacklist & </action>
     </button>
     </vbox>
    </hbox>
 
    <hbox>
-    <text><label>Click this button to erase current modem settings. This will delete /dev/modem thus allowing a fresh auto-probe and will cancel the 'Modem' entry in /etc/wvdial.conf. CLICKING THIS BUTTON WILL CAUSE EXIT FROM PupDial. A REBOOT WILL THEN BE REQUIRED TO PROPERLY RE-DETECT INTERNAL MODEMS (for external modem not essential to reboot)</label></text>
+    <text><label>`gettext \"Click this button to erase current modem settings. This will delete /dev/modem thus allowing a fresh auto-probe and will cancel the 'Modem' entry in /etc/wvdial.conf. CLICKING THIS BUTTON WILL CAUSE EXIT FROM PupDial. A REBOOT WILL THEN BE REQUIRED TO PROPERLY RE-DETECT INTERNAL MODEMS (for external modem not essential to reboot)\"`</label></text>
     <vbox>
     <button>
-     <label>ERASE</label>
+     <label>$(gettext 'ERASE')</label>
      <action>/usr/sbin/modemprobe_erase</action>
     </button>
     </vbox>
    </hbox>
    </frame>
 
  </vbox>
  <vbox>
-  <text><label>The PROBE button does a fully automatic probe.  But if it is unsatisfactory you can consider some manual probing...</label></text>
-
-  <frame Serial hardware modem>
+  <text><label>$(gettext 'The PROBE button does a fully automatic probe.  But if it is unsatisfactory you can consider some manual probing...')</label></text>
+
+  <frame $(gettext 'Serial hardware modem')>
   <hbox>
-   <text><label>If you have a true-hardware external serial or internal ISA card (or in some rare cases an internal PCI card), or think you might, click a button to probe. Note that 'ttyS0' is the same as 'com1' in DOS/Windows. Note also, 'ttyS0' is the most likely port, unless you have some other serial device such as a mouse. If the test is succesful then you will be offered to set /dev/modem and basic setup of /etc/wvdial.conf. (Note that these modems are not autodetected at bootup by Puppy, but are probed by the automatic PROBE button above)</label></text>
+   <text><label>`gettext \"If you have a true-hardware external serial or internal ISA card (or in some rare cases an internal PCI card), or think you might, click a button to probe. Note that 'ttyS0' is the same as 'com1' in DOS/Windows. Note also, 'ttyS0' is the most likely port, unless you have some other serial device such as a mouse. If the test is succesful then you will be offered to set /dev/modem and basic setup of /etc/wvdial.conf. (Note that these modems are not autodetected at bootup by Puppy, but are probed by the automatic PROBE button above)\"`</label></text>
    <vbox>
     <button>
      <label>ttyS0</label>
      <action>/usr/sbin/modemtest ttyS0 &</action>
      <action type=\"exit\">TTYSN</action>
@@ -160,15 +170,15 @@
 [ "$EXIT" != "SETUP" ] && exit
 
 #101202
 if [ ! -f /var/local/pupdial/hotpluggable ];then #101202 see also pupdial, erase button above.
  export HOTDIALOG="
- <window title=\"PupDial modem Internet dialer\" icon-name=\"gtk-connect\">
+ <window title=\"$(gettext 'PupDial modem Internet dialer')\" icon-name=\"gtk-connect\">
   <vbox>
-   <text><label>Before probing, a basic question: do you want to connect to the Internet using an internal fixed modem, or a removable (USB, serial, PCMCIA) modem?</label></text>
-   <text><label>The reason for asking this, is an internal modem will have been detected at bootup, but a 'hotpluggable' external modem may not have have been detected if plugged in after bootup. Also, if you have both, say an internal analog dialup modem, plus a USB modem, PupDial may choose the wrong one -- ticking or unticking the checkbox here will avoid that confusion...</label></text>
-   <checkbox><label>Tick checkbox if external modem</label><variable>CHK_HOT</variable></checkbox>
+   <text><label>$(gettext 'Before probing, a basic question: do you want to connect to the Internet using an internal fixed modem, or a removable (USB, serial, PCMCIA) modem?')</label></text>
+   <text><label>`gettext \"The reason for asking this, is an internal modem will have been detected at bootup, but a 'hotpluggable' external modem may not have have been detected if plugged in after bootup. Also, if you have both, say an internal analog dialup modem, plus a USB modem, PupDial may choose the wrong one -- ticking or unticking the checkbox here will avoid that confusion...\"`</label></text>
+   <checkbox><label>$(gettext 'Tick checkbox if external modem')</label><variable>CHK_HOT</variable></checkbox>
    <hbox><button ok></button></hbox>
   </vbox>
  </window>"
  RETSTRING="`gtkdialog3 --center --program=HOTDIALOG`"
  CHK_HOT="`echo "$RETSTRING" | grep '^CHK_HOT' | cut -f 2 -d '"'`" #'geany
@@ -206,11 +216,11 @@
    MODEMDEV="$SMODEMDEV"
   fi
  fi
 fi
 
-yaf-splash -placement center -bg orange -text "Please wait, probing for modems..." &
+yaf-splash -placement center -bg orange -text "$(gettext 'Please wait, probing for modems...')" &
 X1PID=$!
 
 #100918 If no modem selected, check bluetooth modem and set as /dev/modem...
 if [ "$MODEMDEV" = "" ] && which rfcomm >/dev/null;then
  BTMODEMDEVS="`get_bluetooth_connection DUN`"

Changes to woof-code/rootfs-skeleton/usr/sbin/modemprobe_erase

@@ -2,10 +2,14 @@
 #called from modemprobe
 #delete current modem setting.
 #v416 manage linuxant modems
 #v432 Undo automatic HCF/HSF overrides if modem selection is already cleared, to require second erase to reset the overrides.
 #101203 bk: modified.
+#120201 BK: internationalized.
+
+export TEXTDOMAIN=modemprobe_erase
+export OUTPUT_CHARSET=UTF-8
 
 KERNVER="`uname -r`"
 
 rm -f /dev/modem
 
@@ -55,14 +59,14 @@
 ALLPS="`ps`"
 [ "`echo "$ALLPS" | grep -w 'slmodemd' | grep -w '/dev/slusb0'`" != "" ] \
  && killall -q slmodemd
 
 #xmessage "/dev/modem deleted, 'Modem' entry in /etc/wvdialconf initialized."
-yaf-splash -bg yellow -placement center -close box -text "/dev/modem deleted, 'Modem' entry in /etc/wvdial.conf initialized. You need to reboot before trying PupDial again. Well, you do need to reboot for internal modems, as they get detected at bootup. For an external 'hotpluggable' nodem, there is no need to reboot -- if the modem is plugged in, run PupDial now (wait several seconds after plugging it in before starting PupDial)" &
+yaf-splash -bg yellow -placement center -close box -text "$(gettext "/dev/modem deleted, 'Modem' entry in /etc/wvdial.conf initialized. You need to reboot before trying PupDial again. Well, you do need to reboot for internal modems, as they get detected at bootup. For an external 'hotpluggable' nodem, there is no need to reboot -- if the modem is plugged in, run PupDial now (wait several seconds after plugging it in before starting PupDial)")" &
 
 #101203 kill pupdial...
 ALLPS="`ps`"
 PIDS="`echo "$ALLPS" | grep -E 'gtkdialog3 --center --program=MAINDIALOG|modemprobe|pupdial' | grep -v 'modemprobe_erase' | cut -f 1 -d ' ' | tr '\n' ' '`"
 kill $PIDS 2>/dev/null
 kill $PIDS 2>/dev/null
 
 ###END###

Changes to woof-code/rootfs-skeleton/usr/sbin/modemprobe_help

@@ -1,13 +1,17 @@
 #!/bin/sh
 #called from modemprobe.
+#120201 rodin.s: internationalized.
+
+export TEXTDOMAIN=modemprobe_help
+export OUTPUT_CHARSET=UTF-8
 
 export HELPDIALOG="
-<window title=\"PupDial modem probe help\" icon-name=\"gtk-connect\">
+<window title=\"$(gettext 'PupDial modem probe help')\" icon-name=\"gtk-connect\">
  <vbox>
- <text  use-markup=\"true\"><label>\"<b>ALSA modem driver</b>
-A driver starting with the text 'snd_' is an ALSA sound driver, but some of these also support on-board modems (port ttySL0). Thus, you cannot blacklist such a driver as that will also kill the sound.
+ <text  use-markup=\"true\"><label>\"<b>$(gettext 'ALSA modem driver')</b>
+`gettext \"A driver starting with the text 'snd_' is an ALSA sound driver, but some of these also support on-board modems (port ttySL0). Thus, you cannot blacklist such a driver as that will also kill the sound.
 
 <b>/dev/modem</b>
 If this does not exist then at bootup Puppy will assign /dev/modem to the first modem driver that is found. If two modem drivers have loaded and you want to use the second, there are various ways to do this:
 
 1. Totally manual
@@ -15,13 +19,15 @@
 
 2. Blacklist and erase
 You can click the BLACKLIST button and blacklist the driver that you do not want, then click the ERASE button which will delete /dev/modem and initialize the 'Modem' entry in /etc/wvdial.conf. Then at next bootup the correct modem should get selected.
 
 <b>Hardware modems</b>
-Puppy may autodetect some hardware modems at bootup, for example USB hardware modems, but serial modems and true-hardware plugin cards (ISA or PCI bus) are not autodetected at bootup. However, the PROBE button will scan for these, and you can even fall back to the individual 'ttyS0', 'ttyS1', etc., buttons if PROBE did not work right.\"</label></text>
+Puppy may autodetect some hardware modems at bootup, for example USB hardware modems, but serial modems and true-hardware plugin cards (ISA or PCI bus) are not autodetected at bootup. However, the PROBE button will scan for these, and you can even fall back to the individual 'ttyS0', 'ttyS1', etc., buttons if PROBE did not work right.\"`\"</label></text>
 
 
  </vbox>
 </window>
 "
 
 gtkdialog3 --program=HELPDIALOG
+
+#TEXTDOMAIN=puppy

Changes to woof-code/rootfs-skeleton/usr/sbin/modemtest

@@ -6,10 +6,20 @@
 #v465 rerwin: v413 move init string to Init3
 #v477 rerwin: v413 wait longer for modem response; add splash message during sleep
 #v424 rerwin: reset skip-PIN flag
 #101203 bk: message modification.
 #101220 bk: info box if get empty string.
+#120201 rodin.s: internationalized.
+
+export TEXTDOMAIN=modemtest
+export TEXTDOMAINDIR=/usr/share/locale
+export OUTPUT_CHARSET=UTF-8
+eval_gettext () {
+  local myMESSAGE=$(gettext "$1")
+  eval echo \"$myMESSAGE\"
+}
+export LANGORG=$LANG
 
 #[ ! $1 ] && exit
 DEVM=$1
 PARAM2=$2
 
@@ -21,25 +31,25 @@
 #a fallback if user runs this script directly...
 [ "$DEVM" = "" ] && [ "$MODEMDEV" = "" ] && exit
 [ "$DEVM" = "" ] && [ "$MODEMDEV" != "" ] && DEVM="$MODEMDEV"
 
 if [ "$PARAM2" = "initonly" ];then
- MSGSUCCESS="Okay, the modem was probed and it responded, confirming that it does exist,\n
+ MSGSUCCESS="`gettext \"Okay, the modem was probed and it responded, confirming that it does exist,\n
 now the probe can be done to determine a suitable initialization string.\n
 Click the 'Yes' button to do this (recommended), or\n
 'No' if you already have a suitable initialization string for this modem in\n
 /etc/wvdial.conf (the configuration file for PupDial) ...that would probably\n
 be the case if you had used this modem the last time that you ran PupDial.\n
 \n
 Note: For some modern modems, the default 'ATZ' initialization string is\n
 sufficient and you do not have to do this probe, however it does not do any\n
-harm to do so (and gives further confirmation the modem works)..."
+harm to do so (and gives further confirmation the modem works)...\"`"
 else
- MSGSUCCESS="Success, the modem responds as $DEVM! (The modem is there; getting it to dial out is another matter!)\n
-Click the 'yes' button if you would like /dev/modem to be a link to ${DEVM} and the Wvdial\n
-configuration file /etc/wvdial.conf set with entry 'Modem = /dev/${DEVM}. An attempt will\n
-also be made to determine appropriate modem initialization strings."
+ MSGSUCCESS="`eval_gettext \"Success, the modem responds as \\\$DEVM! (The modem is there; getting it to dial out is another matter!)\n
+Click the 'yes' button if you would like /dev/modem to be a link to \\\${DEVM} and the Wvdial\n
+configuration file /etc/wvdial.conf set with entry 'Modem = /dev/\\\${DEVM}. An attempt will\n
+also be made to determine appropriate modem initialization strings.\"`"
 fi
 
 
 #return the IRQ that respond to a given device...
 irq_from_device_func() { #device passed in, ex: /dev/ttyS0
@@ -92,26 +102,26 @@
 
 modem_test_func() {
  [ "$DEVM" = "" ] && DEVM='invalid'
  #case $DEVM in
  #tty*)
-#  yaf-splash -font "8x16" -outline 0 -margin 4 -bg orange -text "Verifying modem is present..." &
-  /usr/X11R7/bin/yaf-splash -font "8x16" -outline 0 -margin 4 -bg orange -text "Verifying modem is present..." &
+yaf-splash -outline 0 -margin 4 -bg orange -text "$(gettext 'Verifying modem is present...')" &
+# /usr/X11R7/bin/yaf-splash -font "8x16" -outline 0 -margin 4 -bg orange -text "Verifying modem is present..." &
   X8PID=$! #v413
   IRQM=$(irq_from_device_func /dev/${DEVM})
   fuser -k /dev/${DEVM} 2>/dev/null #kill processing attached to device.
   chat_with_func /dev/$DEVM
   if [ $? -eq 0 ];then
    kill $X8PID #v413
    modem_device_to_conf_func $DEVM #v433 set tested dev
    if [ "$DEVM" = "$MODEMDEV" -a "$PARAM2" = "" ];then
-    Xdialog --left --wmclass "pupdial" --title "PupDial: modem test" --no-cancel --msgbox "Success, the modem responds as $DEVM! (The modem is there; getting it to dial out is another matter!)" 0 0
+    Xdialog --left --wmclass "pupdial" --title "$(gettext 'PupDial: modem test')" --no-cancel --msgbox "`eval_gettext \"Success, the modem responds as \\\$DEVM! (The modem is there; getting it to dial out is another matter!)\"`" 0 0
    else
-    Xdialog --left --wmclass "pupdial" --title "PupDial: modem test" --no-cancel --yesno "${MSGSUCCESS}" 0 0
+    Xdialog --left --wmclass "pupdial" --title "$(gettext 'PupDial: modem test')" --no-cancel --yesno "${MSGSUCCESS}" 0 0
     if [ $? -eq 0 ];then
-#     yaf-splash -font "8x16" -outline 0 -margin 4 -bg orange -text "Please wait, updating settings..." &
-     /usr/X11R7/bin/yaf-splash -font "8x16" -outline 0 -margin 4 -bg orange -text "Please wait, updating settings..." &
+     yaf-splash -outline 0 -margin 4 -bg orange -text "$(gettext 'Please wait, updating settings...')" &
+#     /usr/X11R7/bin/yaf-splash -font "8x16" -outline 0 -margin 4 -bg orange -text "Please wait, updating settings..." &
      X9PID=$!
      ln -snf $DEVM /dev/modem
 
      waitmax 29 gen_modem_init_string > /dev/null #writes to /tmp/mymodeminitstring
      FLAGBADINITSTRING='no' #101220
@@ -126,26 +136,26 @@
      else
       FLAGBADINITSTRING='yes' #101220
      fi
      kill $X9PID
      if [ "$FLAGBADINITSTRING" = "yes"  ];then #101220
-      Xdialog --left --wmclass "pupdial" --title "PupDial: Initialization string" --msgbox "There is a problem, probing did not generate an initialization string. You could try\n
+      Xdialog --left --wmclass "pupdial" --title "$(gettext 'PupDial: Initialization string')" --msgbox "$(gettext 'There is a problem, probing did not generate an initialization string. You could try\n
 unplugging the modem, reboot Puppy then plug-in the modem and try again with PupDial.\n
 Alternatively, in the PupDial main GUI window, try one of these strings in the second\n
-initialization-string entry box (write them down!):\n\n
+initialization-string entry box (write them down!)'):\n\n
       AT &FE0 V1 X1 &D2 &C1 s0=0\n
       AT Q0 V1 E1 S0=0 &C1 &D2" 0 0
      fi
     else
      #101203...
      INIT3="`cat /etc/wvdial.conf | grep '^Init3' | tr -d ' ' | cut -f 2-9 -d '='`"
      if [ "$INIT3" ];then
-      Xdialog --left --wmclass "pupdial" --title "PupDial: Initialization string" --no-cancel --yesno "The PupDial configuration file /etc/wvdial.conf does have initialization\n
+      Xdialog --left --wmclass "pupdial" --title "$(gettext 'PupDial: Initialization string')" --no-cancel --yesno "`gettext \"The PupDial configuration file /etc/wvdial.conf does have initialization\n
 strings in it from previous usage of PupDial. Would you like to reset\n
 them to the default ('ATZ' only)?\n
 Note, you might want to do this if you have changed modems and you know\n
-that the defaults are sufficient. If in doubt, click 'No'..." 0 0
+that the defaults are sufficient. If in doubt, click 'No'...\"`" 0 0
       if [ $? -eq 0 ];then
        #modify [Dialer Defaults] only...
        echo -n "" > /tmp/wvdial.conf-modemtest
        cat /etc/wvdial.conf |
        while read ONELINE
@@ -169,11 +179,11 @@
    fi
    touch /tmp/.pupdial-modem_detected #v433
   else
    kill $X8PID #v413
    modem_device_to_conf_func $MODEMDEV #v433 set current dev
-   Xdialog --left --wmclass "pupdial" --title "PupDial: modem test" --no-cancel --msgbox "Sorry, the modem was not detected as $DEVM." 0 0
+   Xdialog --left --wmclass "pupdial" --title "$(gettext 'PupDial: modem test')" --no-cancel --msgbox "$(gettext 'Sorry, the modem was not detected as') $DEVM." 0 0
    rm -f /tmp/.pupdial_pin_sent #v433
    rm -f /tmp/.pupdial-modem_detected #v433
   fi
  # ;;
  #*)