Check-in [229cbfcb8d]
Not logged in

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

Overview

SHA1 Hash:229cbfcb8d7b9e383a7278d71eaff9b09c2ff83e
Date: 2012-01-30 10:31:42
User: BarryK
Comment:rodin.s: internationalised functions4puppy4 and xorgwizard, tweaked rc.shutdown

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/etc/rc.d/functions4puppy4

@@ -2,10 +2,11 @@
 #v411 moved choosemousefunc() out of /usr/sbin/xorgwizard, want call from rc.sysinit.
 #w468 not using set_mixers() anymore, it's done in /etc/init.d/alsa.
 #w468 choosemousefunc() simplified.
 #101120 new firmware_tarball_func, as /sbin/pup_event_backend_modprobe rewritten.
 #110722 usb drive, LED light briefly flashes after unmounted, so wait a bit. 110828 remove.
+#120130 rodin.s: gettext some strings.
 
 #101119 called from rc.sysinit...
 #global $MODULE is name of module, global $KERNVER.
 firmware_tarball_func() {
  MODULEx="`echo -n "$MODULE" | tr '_' '-'`"
@@ -228,29 +229,35 @@
 #    rm -f /tmp/xorg.conf.tmp2
 # fi
 #} #choosemousefunc()
 
 choosemousefunc() { #w468 called from xorgwizard.
- MOUSEINTRO="Only very old PCs may have a serial mouse. These are recognised by the fairly large rectangular plug, technically known as a DB9 or the even larger DB25 (where the 9 or 25 refers to the number of pins in the plug). Press the UP and DOWN arrow keys to choose your mouse type, then press the ENTER key:"
+ #MOUSEINTRO="Only very old PCs may have a serial mouse. These are recognised by the fairly large rectangular plug, technically known as a DB9 or the even larger DB25 (where the 9 or 25 refers to the number of pins in the plug). Press the UP and DOWN arrow keys to choose your mouse type, then press the ENTER key:"
+ MOUSEINTRO=$(gettext 'Only very old PCs may have a serial mouse. These are recognised by the fairly large rectangular plug, technically known as a DB9 or the even larger DB25 (where the 9 or 25 refers to the number of pins in the plug). Press the UP and DOWN arrow keys to choose your mouse type, then press the ENTER key:') #120130
  DETECTEDMOUSEDEV="`cat /etc/mousedevice`"
  case $DETECTEDMOUSEDEV in
   ttyS*)
-   MOUSEMENU1a='serial'; MOUSEMENU1b='(mouse in very old computers)'
-   MOUSEMENU2a='usb/ps-2'; MOUSEMENU2b='(mouse or touchpad in all modern computers)'
+   #MOUSEMENU1a='serial'; MOUSEMENU1b='(mouse in very old computers)'
+   #MOUSEMENU2a='usb/ps-2'; MOUSEMENU2b='(mouse or touchpad in all modern computers)'
+   MOUSEMENU1a='serial'; MOUSEMENU1b=$(gettext '(mouse in very old computers)') #120130
+   MOUSEMENU2a='usb/ps-2'; MOUSEMENU2b=$(gettext '(mouse or touchpad in all modern computers)') #120130
   ;;
   *)
-   MOUSEMENU1a='usb/ps-2'; MOUSEMENU1b='(mouse or touchpad in all modern computers)'
-   MOUSEMENU2a='serial'; MOUSEMENU2b='(mouse in very old computers)'
+   #MOUSEMENU1a='usb/ps-2'; MOUSEMENU1b='(mouse or touchpad in all modern computers)'
+   #MOUSEMENU2a='serial'; MOUSEMENU2b='(mouse in very old computers)'
+   MOUSEMENU1a='usb/ps-2'; MOUSEMENU1b=$(gettext '(mouse or touchpad in all modern computers)') #120130
+   MOUSEMENU2a='serial'; MOUSEMENU2b=$(gettext '(mouse in very old computers)') #120130
   ;;
  esac
  dialog --no-cancel --menu "${MOUSEINTRO}\n\n
-Please choose mouse type..." 0 0 0 "$MOUSEMENU1a" "$MOUSEMENU1b" "$MOUSEMENU2a" "$MOUSEMENU2b" 2> /tmp/testmsx
+$(gettext 'Please choose mouse type...')" 0 0 0 "$MOUSEMENU1a" "$MOUSEMENU1b" "$MOUSEMENU2a" "$MOUSEMENU2b" 2> /tmp/testmsx #120130
  [ $? -ne 0 ] && return 1
  CHOSENMOUSETYPE="`cat /tmp/testmsx`"
  case $CHOSENMOUSETYPE in
  serial)
-  dialog --no-cancel --menu "Serial port mouse plugged into...\nUse UP/DOWN ARROW keys, ENTER key to finish" 0 0 0 ttyS0 "COM1 (most likely)" ttyS1 COM2 ttyS2 COM3 ttyS3 COM4 2> /tmp/testmsx
+  #dialog --no-cancel --menu "Serial port mouse plugged into...\nUse UP/DOWN ARROW keys, ENTER key to finish" 0 0 0 ttyS0 "COM1 (most likely)" ttyS1 COM2 ttyS2 COM3 ttyS3 COM4 2> /tmp/testmsx
+  dialog --no-cancel --menu "$(gettext 'Serial port mouse plugged into...\nUse UP/DOWN ARROW keys, ENTER key to finish')" 0 0 0 ttyS0 "$(gettext 'COM1 (most likely)')" ttyS1 COM2 ttyS2 COM3 ttyS3 COM4 2> /tmp/testmsx #120130
   [ $? -ne 0 ] && return 1
   MOUSEDEV="`cat /tmp/testmsx`"
   modprobe sermouse
   ln -snf $MOUSEDEV /dev/mouse
   echo -n "$MOUSEDEV" > /etc/mousedevice

Changes to woof-code/rootfs-skeleton/etc/rc.d/rc.shutdown

@@ -59,10 +59,11 @@
 #111106 do not execute fuser if network share mount.
 #111107 ldolse: unmount network shares before taking down the network
 #120103 karl godt: error unmounting stray partitions. 120103 karl godt: more tweaks.
 #120129 karl godt: need to rearrange order, refer http://murga-linux.com/puppy/viewtopic.php?t=71767&start=405.
 #120129 karl godt: improved ZOMBIES, see http://www.murga-linux.com/puppy/viewtopic.php?t=73122
+#120130 rodin.s: update for gettext (line 91).
 
 #110923
 . /usr/bin/gettext.sh # enables use of eval_gettext (several named variables) and ngettext (plurals)
 export TEXTDOMAIN=rc.shutdown
 export OUTPUT_CHARSET=UTF-8
@@ -84,11 +85,12 @@
 #variables created at bootup by init script in initrd...
 . /etc/rc.d/PUPSTATE #v2.02
 . /etc/DISTRO_SPECS #v412
 
 #echo "`eval_gettext \"\\\${DISTRO_NAME} is now shutting down...\"`" > /dev/console
-echo "${DISTRO_NAME} is now shutting down..." > /dev/console
+#echo "${DISTRO_NAME} is now shutting down..." > /dev/console
+echo "${DISTRO_NAME} $(gettext 'is now shutting down...')" > /dev/console #120130
 
 #100315 improper shutdown check. see /etc/rc.d/rc.sysinit, /init in initramfs, and /sbin/init...
 [ -f /fsckme.flg ] && rm -f /fsckme.flg
 [ -f /initrd${PUP_HOME}/fsckme.flg ] && rm -f /initrd${PUP_HOME}/fsckme.flg
 

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

@@ -57,12 +57,19 @@
 #110910 BK: gtkdialog3 (patriot-e version) syntax error, bump to gtkdialog4.
 #110911 'drivers-alternate' moved from /usr/lib/xorg/modules/ to /usr/lib/x/.
 #110927 fix touchpad setup.
 #111108 Karl Godt: fix for desktop drive icons getting drawn in wrong place after change resolution.
 #120129 jemimah: add Option "SHMConfig" "on".
+#120130 rodin.s: i18n internationalise script. BK: note, edited all changes manually, as script from rodin.s had some differences.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
+
+export TEXTDOMAIN=xorgwizard
+export TEXTDOMAINDIR=/usr/share/locale
+export OUTPUT_CHARSET=UTF-8
+. gettext.sh
+export LANGORG=$LANG
 
 mkdir -p /usr/lib/x/drivers-backup
 mkdir -p /var/local/xorg #100902
 
 alternate_driver_func() { #100401 100708
@@ -224,39 +231,39 @@
  fi
 fi
 
 
 MAIN1="
-<window title=\"Xorg Video Wizard\">
+<window title=\"$(gettext 'Xorg Video Wizard')\">
 <hbox>
  <vbox>
-  <text><label>\"Welcome to the Puppy Linux
-Xorg Video Wizard!\"</label></text>
-  <text><label>\"The behaviour of Xorg is controlled
+  <text><label>\"$(gettext 'Welcome to the Puppy Linux
+Xorg Video Wizard!')\"</label></text>
+  <text><label>\"$(gettext 'The behaviour of Xorg is controlled
 by a configuration file, /etc/X11/
 xorg.conf. You have a choice here,
 either to completely reconstruct
 the /etc/X11/xorg.conf file, or
-to modify the existing file.\"</label></text>
+to modify the existing file.')\"</label></text>
  </vbox>
  <vbox>
-  <frame XorgWizard>
+  <frame $(gettext 'XorgWizard')>
   <hbox>
-   <text><label>XorgWizard completely reconstructs the /etc/X11/xorg.conf file, and X must not be running to do this. A reboot is required, and the Wizard will run in text mode, before X is launched.</label></text>
+   <text><label>$(gettext 'XorgWizard completely reconstructs the /etc/X11/xorg.conf file, and X must not be running to do this. A reboot is required, and the Wizard will run in text mode, before X is launched.')</label></text>
    <vbox>
     <button>
      <input file>/usr/local/lib/X11/mini-icons/wizard16.xpm</input>
      <action>EXIT:11</action>
     </button>
    </vbox>
   </hbox>
-  <text><label>NOTE: You can also run XorgWizard manually, without rebooting, by exiting from X to the commandline (see Shutdown menu) then run xorgwizard.</label></text>
+  <text><label>$(gettext 'NOTE: You can also run XorgWizard manually, without rebooting, by exiting from X to the commandline (see Shutdown menu) then run xorgwizard.')</label></text>
   </frame>
 
-  <frame Edit xorg.conf>
+  <frame $(gettext 'Edit xorg.conf')>
    <hbox>
-    <text><label>You can manually edit /etc/X11/xorg.conf, but note that you will need to exit from X afterward then restart X (see Shutdown menu). Click button to edit:</label></text>
+    <text><label>$(gettext 'You can manually edit /etc/X11/xorg.conf, but note that you will need to exit from X afterward then restart X (see Shutdown menu). Click button to edit:')</label></text>
     <vbox>
      <button>
       <input file>/usr/local/lib/X11/mini-icons/mini-x.xpm</input>
       <action>EXIT:15</action>
      </button>
@@ -264,47 +271,47 @@
    </hbox>
   </frame>
 
   <frame xvidtune>
    <hbox>
-    <text><label>If the screen is displaced or the width/height are wrong, xvidtune can get it right. This will modify the existing xorg.conf file. Use with caution:</label></text>
+    <text><label>$(gettext 'If the screen is displaced or the width/height are wrong, xvidtune can get it right. This will modify the existing xorg.conf file. Use with caution:')</label></text>
     <vbox>
      <button>
       <input file>/usr/local/lib/X11/mini-icons/mini-x.xpm</input>
       <action>EXIT:13</action>
      </button>
     </vbox>
    </hbox>
   </frame>
 
-  <frame Mouse/keyboard Wizard>
+  <frame $(gettext 'Mouse/keyboard Wizard')>
    <hbox>
-    <text><label>/etc/X11/xorg.conf has generic settings for mouse and keyboard and in most cases it is recommended to leave it as-is. Instead, use the MouseKeyboardWizard:</label></text>
+    <text><label>$(gettext '/etc/X11/xorg.conf has generic settings for mouse and keyboard and in most cases it is recommended to leave it as-is. Instead, use the MouseKeyboardWizard:')</label></text>
     <vbox>
      <button>
       <input file>/usr/local/lib/X11/mini-icons/wizard16.xpm</input>
       <action>EXIT:16</action>
      </button>
     </vbox>
    </hbox>
   </frame>
 
-  <frame Monitor gamma calibration>
+  <frame $(gettext 'Monitor gamma calibration')>
    <hbox>
-    <text><label>This will adjust the monitor colors, including screen brightness.</label></text>
+    <text><label>$(gettext 'This will adjust the monitor colors, including screen brightness.')</label></text>
     <vbox>
      <button>
       <input file>/usr/local/lib/X11/mini-icons/mini-x.xpm</input>
       <action>EXIT:17</action>
      </button>
     </vbox>
    </hbox>
   </frame>
 
-  <frame Resolution changer>
+  <frame $(gettext 'Resolution changer')>
    <hbox>
-    <text><label>It is possible to change screen resolutions without exiting from X:</label></text>
+    <text><label>$(gettext 'It is possible to change screen resolutions without exiting from X:')</label></text>
     <vbox>
      <button>
       <input file>/usr/local/lib/X11/mini-icons/mini-x.xpm</input>
       <action>EXIT:18</action>
      </button>
@@ -336,38 +343,38 @@
    sync
    exec killall X
    ;;
   12) #xorgconfig
    xorgcfg
-   xmessage -bg "#ff8080" -center -title "xorgcfg" "Changes to /etc/X11/xorg.conf will only take effect after X is restarted.
-
-Click OK button to restart X..."
+   xmessage -bg "#ff8080" -center -title "xorgcfg" "$(gettext 'Changes to /etc/X11/xorg.conf will only take effect after X is restarted.')
+
+$(gettext 'Click OK button to restart X...')"
    exec restartwm
    ;;
   13) #xvidtune
-   xmessage -bg violet -title "Xvidtune IMPORTANT HELP" "If you click the 'Show' button, the adjusted settings will be what
+   xmessage -bg violet -title "$(gettext 'Xvidtune IMPORTANT HELP')" "`gettext \"If you click the 'Show' button, the adjusted settings will be what
 you want permanently. After hitting the 'Quit' button, you will be
-given one last chance not to make the change permanent.
-Thus:
-'Show' to record the settings (for later inclusion into xorg.conf)
-'Quit' to exit Xvidtune.
-
-Please note that Xvidtune does not work with all video hardware, meaning
-that changing the settings will cause no change on the screen." &
+given one last chance not to make the change permanent.\"`
+$(gettext 'Thus:')
+`gettext \"'Show' to record the settings (for later inclusion into xorg.conf)\"`
+`gettext \"'Quit' to exit Xvidtune.\"`
+
+$(gettext 'Please note that Xvidtune does not work with all video hardware, meaning
+that changing the settings will cause no change on the screen.')" &
    XMSGPID=$!
-   MODELINE0="`xvidtune | grep '^"[0-9]'`"
+   MODELINE0="`xvidtune | grep '^"[0-9]'`" #'geanyfix.
    kill $XMSGPID
    if [ ! "$MODELINE0" = "" ];then
-    xmessage -bg orange -title "Xvidtune: Modeline" -buttons Write:10,Quit:11 "The new modeline is:
+    xmessage -bg orange -title "$(gettext 'Xvidtune: Modeline')" -buttons Write:10,Quit:11 "$(gettext 'The new modeline is:')
 $MODELINE0
 
-Note, you will have to restart X for it to take effect. If it messes
-up X, edit from commandline 'mp /etc/X11/xorg.conf' and comment-out
-the 'UseModes' line (do not delete it) in the Monitor section.
-
-To insert this into /etc/X11/xorg.conf, click 'Write' button...
-To exit without changing xorg.conf, click 'Quit' button..."
+$(gettext 'Note, you will have to restart X for it to take effect. If it messes')
+`gettext \"up X, edit from commandline 'mp /etc/X11/xorg.conf' and comment-out\"`
+`gettext \"the 'UseModes' line (do not delete it) in the Monitor section.\"`
+
+`gettext \"To insert this into /etc/X11/xorg.conf, click 'Write' button...\"`
+`gettext \"To exit without changing xorg.conf, click 'Quit' button...\"`"
     if [ $? -eq 10 ];then
      PATTERNA="s/.*#modes0modeline0/ ModeLine $MODELINE0 #modes0modeline0/g"
      cat /etc/X11/xorg.conf | sed -e "$PATTERNA" > /tmp/xorg.conf.new
      sync
      cat /tmp/xorg.conf.new | sed -e 's/#.*UseModes/UseModes/g' > /etc/X11/xorg.conf
@@ -414,55 +421,51 @@
 
 if [ ! $1 ];then #100430
  mv -f /usr/lib/x/drivers-backup/* /usr/lib/xorg/modules/drivers/ 2>/dev/null
 fi
 
-MSGwelcome="Welcome to the Puppy Video Wizard!
+MSGwelcome="$(gettext 'Welcome to the Puppy Video Wizard!')
 "
 #100401 if xorgwizard started with any passed param, bypass initial window...
 if [ ! $1 ];then
  if [ "`which Xvesa`" != "" ];then #091125
   MSGwelcome="" #100820
   #If video adapter would hang Xvesa, tell user and allow only Xorg.
   if [ -s /tmp/ddcprobeoem.txt ] || grep -q -f /etc/xorgoverrides /tmp/ddcprobe.txt 2>/dev/null;then    #Xvesa hanger encountered
-   dialog --colors --title "Puppy Video Wizard" --yes-label "Xorg" --no-label "Commandline" --yesno "Welcome to the Puppy Video Wizard!
-
-Puppy has two X servers (to run Puppy in graphics mode):
-Xvesa: A very small and simple \"Kdrive\" X server.
-Xorg:  A very large and sophisticated X server, with many hardware-
+   dialog --colors --title "$(gettext 'Puppy Video Wizard')" --yes-label "Xorg" --no-label "$(gettext 'Commandline')" --yesno "$(gettext 'Welcome to the Puppy Video Wizard!
+Puppy has two X servers (to run Puppy in graphics mode):')
+$(gettext 'Xvesa: A very small and simple "Kdrive" X server.')
+$(gettext 'Xorg:  A very large and sophisticated X server, with many hardware-
        specific drivers for optimum performance (note: there is also
-       a generic driver named 'vesa', not the same as Xvesa!)
-
-\Z1Your video hardware would cause Xvesa to freeze Puppy, so your options are to use Xorg or exit to the command prompt.\Z0
-
-It is recommended that you choose the <Xorg> button now, but some
-quirky video hardware does not work with Xorg, in which case you must operate from the command line.  Make sure you have at least 96 MB of RAM+swap, for Xorg to function.
-
-Press ENTER for Xorg...
-Press TAB (or right-arrow) key then ENTER key to use the command line...\Zn" 0 0
+       a generic driver named "vesa", not the same as Xvesa!)')
+\Z1$(gettext 'Your video hardware would cause Xvesa to freeze Puppy, so your options are to use Xorg or exit to the command prompt.')\Z0
+
+$(gettext 'It is recommended that you choose the <Xorg> button now, but some
+quirky video hardware does not work with Xorg, in which case you must operate from the command line.  Make sure you have at least 96 MB of RAM+swap, for Xorg to function.')
+
+$(gettext 'Press ENTER for Xorg...')
+$(gettext 'Press TAB (or right-arrow) key then ENTER key to use the command line...')\Zn" 0 0
    [ ! $? -eq 0 ] && exit
   else   #normal video adapter
    #offer to drop out to Xvesa...
-   dialog --colors --title "Puppy Video Wizard" --yes-label "Xorg" --no-label "Xvesa" --yesno "Welcome to the Puppy Video Wizard!
-
-Puppy has two X servers (to run Puppy in graphics mode):
-Xvesa: A very small and simple \"Kdrive\" generic X server.
-Xorg:  A very large and sophisticated X server, with many hardware-
+   dialog --colors --title "$(gettext 'Puppy Video Wizard')" --yes-label "Xorg" --no-label "Xvesa" --yesno "$(gettext 'Welcome to the Puppy Video Wizard!
+Puppy has two X servers (to run Puppy in graphics mode):')
+$(gettext 'Xvesa: A very small and simple "Kdrive" generic X server.')
+$(gettext 'Xorg:  A very large and sophisticated X server, with many hardware-
        specific drivers for optimum performance (note: there is also
-       a generic driver named 'vesa', not the same as Xvesa!)
-
-Xvesa works flawlessly on most video hardware, simple to configure,
+       a generic driver named "vesa", not the same as Xvesa!)')
+$(gettext 'Xvesa works flawlessly on most video hardware, simple to configure,
 but one major disadvantage is that screen refresh rate is fixed.
 Also, Xvesa has limited support for input devices, and lacks features
-like hardware-acceleration (video may be jerky on slow PCs).
-
-It is recommended that you choose the <Xorg> button now, but some
+like hardware-acceleration (video may be jerky on slow PCs).')
+
+$(gettext 'It is recommended that you choose the <Xorg> button now, but some
 quirky video hardware does not work with Xorg, in which case you can
-run this Wizard again and choose the <Xvesa> button.
-
-Press ENTER for Xorg...
-Press TAB (or right-arrow) key then ENTER key for Xvesa...\Zn" 0 0
+run this Wizard again and choose the <Xvesa> button.')
+
+$(gettext 'Press ENTER for Xorg...')
+$(gettext 'Press TAB (or right-arrow) key then ENTER key for Xvesa...')\Zn" 0 0
    STATUS=$?  #v3.99
    [ $STATUS -eq -1 ] && exit   #v3.99 ESC to exit, same as above dialogs
    if [ $STATUS -eq 1 ];then   #v3.99 Xvesa selected
     ln -sf Xvesa /usr/bin/X #Xvesa is now the default X server.
     #when start xorgwizard from commandline, it messes up xorg.conf...
@@ -483,36 +486,36 @@
  FCHOOSE='nouveau'
  [ -f /usr/lib/xorg/modules/drivers/i810_drv.so ] && FCHOOSE='i810'
  [ -f /usr/lib/x/drivers-alternate/i810_drv.so ] && FCHOOSE='i810'
  case $FCHOOSE in #100820
   i810)
-   MSGchoose="EX: There are two drivers for Intel video, 'intel' and 'i810' and it may
-be necessary to choose one now as probe of the wrong one may hang the PC."
+   MSGchoose="$(gettext 'EX: There are two drivers for Intel video, "intel" and "i810" and it may
+be necessary to choose one now as probe of the wrong one may hang the PC.')"
   ;;
   *)
-   MSGchoose="EX: There are two drivers for Nvidia video, 'nv' and 'nouveau' and it may
-be necessary to choose one now as probe of the wrong one may hang the PC."
+   MSGchoose="$(gettext 'EX: There are two drivers for Nvidia video, "nv" and "nouveau" and it may
+be necessary to choose one now as probe of the wrong one may hang the PC.')"
   ;;
  esac
- dialog --colors --extra-button --title "Puppy Video Wizard" --ok-label "Probe" --cancel-label "vesa" --extra-label "Choose" --yesno "${MSGwelcome}'Xorg' (or just 'X') is software that will run Puppy in graphics mode,
+ dialog --colors --extra-button --title "$(gettext 'Puppy Video Wizard')" --ok-label "$(gettext 'Probe')" --cancel-label "vesa" --extra-label "$(gettext 'Choose')" --yesno "${MSGwelcome}`gettext \"'Xorg' (or just 'X') is software that will run Puppy in graphics mode,
 that is, display a desktop with windows, mouse, etc. Xorg has a dozen
 or so drivers for specific video hardware, and if you choose the <Probe>
 button then the Wizard will attempt to determine the correct driver for
-your video hardware.
-
-With some hardware there is no specific driver, or maybe there is one
+your video hardware.\"`
+
+`gettext \"With some hardware there is no specific driver, or maybe there is one
 but it doesn't work (or doesn't work properly), in which case you can
 fall back to the generic 'vesa' driver. The Wizard will offer to fall
 back to the vesa driver later, but if you know already that you have
-to use vesa, then you may choose it now...
-
-If you know that some other driver works, <Choose> will select it now.
+to use vesa, then you may choose it now...\"`
+
+$(gettext 'If you know that some other driver works, <Choose> will select it now.')
 ${MSGchoose}
 
-Press ENTER key to probe for correct hardware-specific driver...
-Or, TAB then ENTER to choose another driver...
-Or, TAB, TAB then ENTER to select the generic vesa driver..." 0 0
+$(gettext 'Press ENTER key to probe for correct hardware-specific driver...')
+$(gettext 'Or, TAB then ENTER to choose another driver...')
+$(gettext 'Or, TAB, TAB then ENTER to select the generic vesa driver...')" 0 0
  STATUS=$?
  [ $STATUS -lt 0 ] && exit
  ALLDRIVERS="`ls -1 /usr/lib/xorg/modules/drivers | grep 'so$'`"
  if [ $STATUS -eq 0 ];then #Probe selected
   if [ "$ALLDRIVERS" = "vesa_drv.so" ];then
@@ -668,11 +671,11 @@
 ${ONEDRV} ${ONEDRV}"
      ;;
     esac
    done
    drvLIST="`echo "$drvLIST" | sort --key=2 --field-separator=" " | tr '\n' ' '`"
-   drvDLG="dialog --title \"Xorg Video Wizard\" --menu \"Choose an Xorg driver (down-arrow or up-arrow then ENTER):\" 0 0 0 ${drvLIST}"
+   drvDLG="dialog --title \"$(gettext 'Xorg Video Wizard')\" --menu \"$(gettext 'Choose an Xorg driver (down-arrow or up-arrow then ENTER):')\" 0 0 0 ${drvLIST}"
    eval $drvDLG 2>/tmp/tagchosendrv.txt
 
    if [ $? -eq 0 ];then
     CHOSENDRV="`cat /tmp/tagchosendrv.txt`"
     alternate_driver_func $CHOSENDRV
@@ -694,11 +697,11 @@
 ln -sf Xorg /usr/bin/X
 
 # Dougal: moved echo to below xorg probing, since loop isn't slow anymore...
 clear
 echo -en "\\033[1;35m" #34=blue, 33=yellow, 32=green, 31=red, 35=purple, 36=aquablue, 38=black.
-echo -n "Probing video hardware, please wait..."
+echo -n "$(gettext 'Probing video hardware, please wait...')"
 echo -e "\\033[0;39m"
 #autoprobe...
 Xorg -configure > /tmp/xorgprobe.txt 2>&1
 #... config in /root/xorg.conf.new
 
@@ -905,11 +908,11 @@
 
 
 #modes supported by card...
 CARDCHOICES=""
 if [ -e /usr/bin/Xvesa -a "$XVESALISTOK" = "yes" ];then #format of each line: 1024x768x16
- echo -e '\nIf initialization freezes here, press ctrl-c and type "xorgwizard",\nselect "Xorg", choose monitor type and choose video mode.'   #v3.99
+ echo -e $(gettext '\nIf initialization freezes here, press ctrl-c and type "xorgwizard",\nselect "Xorg", choose monitor type and choose video mode.')   #v3.99
  grep '^oem:' /tmp/ddcprobe.txt > /tmp/ddcprobeoem.txt   #v3.99 current adapter signature
  Xvesa -listmodes 2>&1 | cut -f 2 -d ' ' | grep --extended-regexp 'x16$|x24$' | sort --field-separator=x --numeric-sort > /tmp/Xmodes.txt
  rm /tmp/ddcprobeoem.txt  #v3.99 didn't hang in Xvesa, so delete signature
 else
  #the vesa 'mode:' lines returned by ddcprobe are very limited...
@@ -1016,11 +1019,11 @@
  ##+ since we had the same tag for different options! (eg. "h31.5-90v60")
  MONCHOICES=""
  MONCUTXY=""
  while [ 1 ];do
   #need a dialog, ask generic monitor type... 100510 fix column alignment...
-  dialog --no-collapse --no-cancel --title "Puppy Video Wizard" --menu "Automatic probing of your monitor was unsuccessful, so you now need\nto choose from a list of generic monitor types.\nChoose the highest specification that describes your monitor.\nLCD: Liquid Crystal Display.\nCRT: Cathode Ray Tube (normal monitor).\nChoose \"Z\" if you have the monitor user manual, and it has the\nhorizontal and vertical frequency specifications.\nDOWN-ARROW to highlight choice, ENTER key to finish..."  0 0 0 \
+  dialog --no-collapse --no-cancel --title "$(gettext 'Puppy Video Wizard')" --menu "`gettext \"Automatic probing of your monitor was unsuccessful, so you now need\nto choose from a list of generic monitor types.\nChoose the highest specification that describes your monitor.\nLCD: Liquid Crystal Display.\nCRT: Cathode Ray Tube (normal monitor).\nChoose \"Z\" if you have the monitor user manual, and it has the\nhorizontal and vertical frequency specifications.\nDOWN-ARROW to highlight choice, ENTER key to finish...\"`"  0 0 0 \
  "A"  "h31.5v40-70      LCD Panel 640x480" \
  "B"  "h31.5-37v40-70   LCD Panel 800x600" \
  "B2" "h31.5-90v60      LCD Panel 1024x600" \
  "C"  "h31.5-48.5v40-70 LCD Panel 1024x768" \
  "D"  "h31.5-90v60      LCD Panel 1280x800" \
@@ -1036,11 +1039,11 @@
  "N"  "h31.5-35v50-61   CRT 800x600 (old 14inch monitor)" \
  "O"  "h31.5-48.5v56-72 CRT 1024x768 (basic 15inch monitor)" \
  "P"  "h31.5-79v50-90   CRT 1280x1024 (basic 17inch monitor)" \
  "Q"  "h31.5-90v50-90   CRT 1400x1050" \
  "R"  "h31.5-94v50-90   CRT 1600x1200" \
- "Z" "SELECT THIS IF YOU KNOW MONITOR FREQUENCY SPECS" \
+ "Z" "$(gettext 'SELECT THIS IF YOU KNOW MONITOR FREQUENCY SPECS')" \
   2>/tmp/taggen.txt
   CHOICE="`cat /tmp/taggen.txt 2>/dev/null`"
   [ "$CHOICE" = "" ] && continue
   ## Dougal: use case-structure for setting params -- safer than the old way
   ## (not sure why Barry only uses 16-bit, maybe worth improving?)
@@ -1139,12 +1142,12 @@
      RECMODE="1600x1200x16"
      HORIZSYNC="31.5-94"
      VERTREFRESH="50-90"
      ;;
    Z) # "SELECT THIS IF YOU KNOW MONITOR FREQUENCY SPECS"
-     dialog --title "Xorg Video Wizard" --inputbox "Please enter the horizontal frequency range of the monitor, in KHz. An example is given:" 0 0 "31.5-48.5" 2>/tmp/taghoriz.txt
-     dialog --title "Xorg Video Wizard" --inputbox "Please enter the vertical frequency range of the monitor, in Hz. An example is given:" 0 0 "56-72" 2>/tmp/tagvert.txt
+     dialog --title "$(gettext 'Xorg Video Wizard')" --inputbox "$(gettext 'Please enter the horizontal frequency range of the monitor, in KHz. An example is given:')" 0 0 "31.5-48.5" 2>/tmp/taghoriz.txt
+     dialog --title "$(gettext 'Xorg Video Wizard')" --inputbox "$(gettext 'Please enter the vertical frequency range of the monitor, in Hz. An example is given:')" 0 0 "56-72" 2>/tmp/tagvert.txt
      HORIZSYNC="`cat /tmp/taghoriz.txt 2>/dev/null`"
      VERTREFRESH="`cat /tmp/tagvert.txt 2>/dev/null`"
      [ "$HORIZSYNC" = "" ] && continue
      [ "$VERTREFRESH" = "" ] && continue
      # comment out -- it's the default from above
@@ -1162,19 +1165,19 @@
  echo -n "" > /tmp/finalchoices.txt
  if [ "$MONCHOICES" = "" ];then
   for ONECHOICE in $CARDCHOICES
   do
    if [ "$RECMODE" = "$ONECHOICE" ];then
-    echo "$ONECHOICE \"Unconfirmed MAXIMUM for monitor, OK for card\" \\" >> /tmp/finalchoices.txt
+    echo "$ONECHOICE \"$(gettext 'Unconfirmed MAXIMUM for monitor, OK for card')\" \\" >> /tmp/finalchoices.txt
    else
-    echo "$ONECHOICE \"Unconfirmed for monitor, OK for video card\" \\" >> /tmp/finalchoices.txt
+    echo "$ONECHOICE \"$(gettext 'Unconfirmed for monitor, OK for video card')\" \\" >> /tmp/finalchoices.txt
    fi
   done
   for ONECHOICE in 640x480x16 800x600x16 1024x600x16 1024x768x16 1280x800x16 1280x1024x16 1366x768x16 1400x1050x16 1440x900x16 1600x1200x16 1680x1050x16 1920x1080x16 1920x1200x16 640x480x24 800x600x24 1024x600x24 1024x768x24 1280x800x24 1280x1024x24 1366x768x24 1400x1050x24 1440x900x24 1600x1200x24 1680x1050x24 1920x1080x24 1920x1200x24
   do
    case "$CARDCHOICES" in *$ONECHOICE*) ;; *) # we've done CARDCHOICES above
-    echo "$ONECHOICE \"Unconfirmed for monitor, maybe NOT OK for card\" \\" >> /tmp/finalchoices.txt ;;
+    echo "$ONECHOICE \"$(gettext 'Unconfirmed for monitor, maybe NOT OK for card')\" \\" >> /tmp/finalchoices.txt ;;
    esac
   done
  else
   #decide on a default... (already 800x600x16 earlier) no, reset...
   RECMODE=""
@@ -1185,12 +1188,12 @@
   for ONECUTXY in $MONCUTXY #1024x768
   do
    for ONECHOICE in ${ONECUTXY}x16 ${ONECUTXY}x24
    do
     case "$CARDCHOICES" in
-     *$ONECHOICE*) echo "$ONECHOICE \"OK for monitor, OK for video card\" \\" >> /tmp/finalchoices.txt ;;
-     *) echo "$ONECHOICE \"OK for monitor, maybe NOT OK for card\" \\" >> /tmp/finalchoices.txt ;;
+     *$ONECHOICE*) echo "$ONECHOICE \"$(gettext 'OK for monitor, OK for video card')\" \\" >> /tmp/finalchoices.txt ;;
+     *) echo "$ONECHOICE \"$(gettext 'OK for monitor, maybe NOT OK for card')\" \\" >> /tmp/finalchoices.txt ;;
     esac
    done
   done
  fi
 
@@ -1198,20 +1201,20 @@
  FINALCHOICES="`cat /tmp/finalchoices.txt | sort --field-separator=x --numeric-sort`" #v3.93 rerwin
 
  if [ "$MONCHOICES" = "" ];then #100406
   echo '#!/bin/sh' > /tmp/choosexmodedlg
   echo -n "dialog --colors --extra-button --aspect 11 --default-item $RECMODE" >> /tmp/choosexmodedlg
-  echo ' --no-collapse --title "Puppy Video Wizard" --ok-label "OK" --extra-label "TEST" --cancel-label "EXIT" --menu "Please use the UP/DOWN ARROW keys to select a video mode. Choices are
+  echo ' --no-collapse --title "'$(gettext 'Puppy Video Wizard')'" --ok-label "OK" --extra-label "'$(gettext 'TEST')'" --cancel-label "'$(gettext 'EXIT')'" --menu "'$(gettext 'Please use the UP/DOWN ARROW keys to select a video mode. Choices are
 shown in the format WidthxHeightxBits, where Width and Height are
-screen resolution in pixels, 16/24 bits = 65,536/16,777,216 colors.
+screen resolution in pixels, 16/24 bits = 65,536/16,777,216 colors.')'
 ' >> /tmp/choosexmodedlg
-  [ ! "$RECMODE" = "" ] && echo "CANNOT DECIDE? ...${RECMODE} is suggested as a good choice."  >> /tmp/choosexmodedlg
-  echo '\Z1RECOMMENDATION: Choose <TEST> button to verify it works!\Z0' >> /tmp/choosexmodedlg
+  [ ! "$RECMODE" = "" ] && echo "`eval_gettext \"CANNOT DECIDE? ...\\\${RECMODE} is suggested as a good choice.\"`"  >> /tmp/choosexmodedlg
+  echo '\Z1'$(gettext 'RECOMMENDATION: Choose <TEST> button to verify it works!')'\Z0' >> /tmp/choosexmodedlg
   echo '
-OK:     Just press ENTER key to immediately use the selected mode...
-TEST: TAB key then ENTER to test and debug the mode before using it...
-EXIT: Exit to text-mode console, do not start X...\Zn" 0 0 0 \' >> /tmp/choosexmodedlg #'geanyfix.
+'$(gettext 'OK:     Just press ENTER key to immediately use the selected mode...')'
+'$(gettext 'TEST: TAB key then ENTER to test and debug the mode before using it...')'
+'$(gettext 'EXIT: Exit to text-mode console, do not start X...')'\Zn" 0 0 0 \' >> /tmp/choosexmodedlg #'geanyfix
   echo "$FINALCHOICES" >> /tmp/choosexmodedlg
   echo ' 2>/tmp/tag.txt' >> /tmp/choosexmodedlg
   echo 'exit $?' >> /tmp/choosexmodedlg
   chmod 755 /tmp/choosexmodedlg
   /tmp/choosexmodedlg
@@ -1219,22 +1222,22 @@
   [ $XAUTO -ne 0 ] && [ $XAUTO -ne 3 ] && exit #drop out to console.
  else
   #offer more resolutions if MONCHOICES inadequate...
   echo '#!/bin/sh' > /tmp/choosexmodedlg
   echo -n "dialog --colors --extra-button --aspect 11 --default-item $RECMODE" >> /tmp/choosexmodedlg
-  echo ' --no-collapse --title "Puppy Video Wizard" --ok-label "OK" --extra-label "TEST" --cancel-label "MORE" --menu "Please use the UP/DOWN ARROW keys to select a video mode. Choices are
+  echo ' --no-collapse --title "'$(gettext 'Puppy Video Wizard')'" --ok-label "OK" --extra-label "'$(gettext 'TEST')'" --cancel-label "'$(gettext 'MORE')'" --menu "'$(gettext 'Please use the UP/DOWN ARROW keys to select a video mode. Choices are
 shown in the format WidthxHeightxBits, where Width and Height are
-screen resolution in pixels, 16/24 bits = 65,536/16,777,216 colors.
+screen resolution in pixels, 16/24 bits = 65,536/16,777,216 colors.')'
 ' >> /tmp/choosexmodedlg
-  [ "$RECMODE" != "" ] && echo "CANNOT DECIDE? ...${RECMODE} is suggested as a good choice."  >> /tmp/choosexmodedlg
-  echo '\Z1RECOMMENDATION: Choose <TEST> button to verify it works!\Z0' >> /tmp/choosexmodedlg
+  [ "$RECMODE" != "" ] && echo "`eval_gettext \"CANNOT DECIDE? ...\\\${RECMODE} is suggested as a good choice.\"`"  >> /tmp/choosexmodedlg
+  echo '\Z1'$(gettext 'RECOMMENDATION: Choose <TEST> button to verify it works!')'\Z0' >> /tmp/choosexmodedlg
+  echo '
+'$(gettext 'NOTICE: If auto-probe has not detected a resolution that you know your monitor supports, click the <MORE> button to display more resolutions to choose from...')'' >> /tmp/choosexmodedlg
   echo '
-NOTICE: If auto-probe has not detected a resolution that you know your monitor supports, click the <MORE> button to display more resolutions to choose from...' >> /tmp/choosexmodedlg
-  echo '
-OK:     Just press ENTER key to immediately use the selected mode...
-TEST: TAB key then ENTER to test and debug the mode before using it...
-MORE: Display more monitor resolutions to choose from...\Zn" 0 0 0 \' >> /tmp/choosexmodedlg #'geanyfix.
+'$(gettext 'OK:     Just press ENTER key to immediately use the selected mode...')'
+'$(gettext 'TEST: TAB key then ENTER to test and debug the mode before using it...')'
+'$(gettext 'MORE: Display more monitor resolutions to choose from...')'\Zn" 0 0 0 \' >> /tmp/choosexmodedlg #'geanyfix.
   echo "$FINALCHOICES" >> /tmp/choosexmodedlg
   echo ' 2>/tmp/tag.txt' >> /tmp/choosexmodedlg
   echo 'exit $?' >> /tmp/choosexmodedlg
   chmod 755 /tmp/choosexmodedlg
   /tmp/choosexmodedlg
@@ -1497,38 +1500,38 @@
   #input/mice) MOUSETYPE="usb" ;;
   #psaux) MOUSETYPE="ps/2" ;;
   tty*)
    #MOUSETYPE="serial"
    MOUSEMSG="
-Puppy thinks that you have a serial mouse. This type of mouse is
+$(gettext 'Puppy thinks that you have a serial mouse. This type of mouse is
 on ancient PCs. Most modern PCs use a usb or ps/2 mouse. If your
 PC does not have a serial mouse, then you must choose the
-<Change_mouse> button now."
+<Change_mouse> button now.')"
   ;;
   *)
    MOUSEMSG="
-Puppy thinks that you have a usb or ps/2 mouse. This is okay for
+$(gettext 'Puppy thinks that you have a usb or ps/2 mouse. This is okay for
 most cases, but some old computers have a serial mouse. If you have
 an ancient PC that you know has a serial mouse, then you must choose
-the <Change_mouse> button now."
+the <Change_mouse> button now.')"
   ;;
  esac
 
- dialog --title "Xorg Video Wizard" --yes-label "TEST_X_NOW" --no-label "Change_mouse" --yesno "Okay, just about to take the plunge.
+ dialog --title "$(gettext 'Xorg Video Wizard')" --yes-label "$(gettext 'TEST_X_NOW')" --no-label "$(gettext 'Change_mouse')" --yesno "$(gettext 'Okay, just about to take the plunge.')
 ${MOUSEMSG}
 
-After choosing <TEST_X_NOW> button, if the next screen shows a nice
+$(gettext 'After choosing <TEST_X_NOW> button, if the next screen shows a nice
 dialog box, then X started okay. If the screen is blank or garbage,
 then failure (In such a case, just press the ENTER key to terminate
-the test, preferably within the 60 second test timeout).
-
-IMPORTANT: If the ENTER key does not terminate the test, press the
+the test, preferably within the 60 second test timeout).')
+
+$(gettext 'IMPORTANT: If the ENTER key does not terminate the test, press the
 combination CTRL-ALT-BACKSPACE (some odd old PCs may even require
-you to press CTRL-ALT-BACKSPACE twice to terminate the test!)
-
-Press ENTER key now to start X graphics mode (may take a few secs)...
-TAB then ENTER to change the mouse (afterward will return here)..." 0 0
+you to press CTRL-ALT-BACKSPACE twice to terminate the test!)')
+
+$(gettext 'Press ENTER key now to start X graphics mode (may take a few secs)...')
+$(gettext 'TAB then ENTER to change the mouse (afterward will return here)...')" 0 0
 
  if [ ! $? -eq 0 ];then
   #change the mouse... (then go back up to above dialog)
   choosemousefunc
   #w480 bugfix, latter used if choose tweak refresh...
@@ -1542,33 +1545,33 @@
 
  eval "`cat /tmp/xorgwizard_initrc_test_results`" #results from xinitrc_test
 #...XTEST, YTEST, HSTEST, VRTEST.
 
  if [ -e /usr/bin/Xvesa ];then
-  TWKMSG="Note: If you have tweaked away, to no avail, choose \"FINISHED\" and you
+  TWKMSG="$(gettext "Note: If you have tweaked away, to no avail, choose \"FINISHED\" and you
       will get one final chance to fall back to using Xvesa.
 Note: If display has only minor displacement or proportions error, run
       (with care) Xvidtune module in Xorg Wizard within X (Setup menu).
 
-Press ENTER if test was okay (or to fall back to Xvesa)... "
+Press ENTER if test was okay (or to fall back to Xvesa)...") "
  else
-  TWKMSG="Press ENTER key if test was okay..."
+  TWKMSG="$(gettext 'Press ENTER key if test was okay...')"
  fi
 
- dialog --no-collapse --title "Xorg Video Wizard" --yes-label "FINISHED" --no-label "Tweak" --yesno "Report on X test:
-                  Resolution:           ${XTEST}x${YTEST} pixels
-                  Horizontal frequency: $HSTEST KHz
-                  Refresh frequency:    $VRTEST Hz
-                  Video driver:         $CARD0DRIVER
-
-If you are reporting success, great, but if the display was not quite
+ dialog --no-collapse --title "$(gettext 'Xorg Video Wizard')" --yes-label "$(gettext 'FINISHED')" --no-label "$(gettext 'Tweak')" --yesno "$(gettext 'Report on X test:')
+                  `eval_gettext \"Resolution:           \\\${XTEST}x\\\${YTEST} pixels\"`
+                  `eval_gettext \"Horizontal frequency: \\\$HSTEST KHz\"`
+                  `eval_gettext \"Refresh frequency:    \\\$VRTEST Hz\"`
+                  `eval_gettext \"Video driver:         \\\$CARD0DRIVER\"`
+
+$(gettext 'If you are reporting success, great, but if the display was not quite
 right, say displaced or distorted, you now have the option of tweaking
 various parameters, even choose a different video driver.
-Ditto if testing X was an abysmal failure.
+Ditto if testing X was an abysmal failure.')
 
 ${TWKMSG}
-TAB then ENTER to tweak parameters & retest X..." 0 0
+$(gettext 'TAB then ENTER to tweak parameters & retest X...')" 0 0
 
  if [ $? -eq 0 ];then
   break
  fi
 
@@ -1586,95 +1589,95 @@
    if [ -f /usr/lib/x/drivers-alternate/i810_drv.so ];then
     TRYDRV='i810'
     EXTRABUTTON='--extra-button'
     EXTRALABEL='--extra-label Old_i810_driver'
     EXTRADRVMSG="
-ATTN: There is an older 'i810' Intel video driver that might work better..."
+$(gettext "ATTN: There is an older 'i810' Intel video driver that might work better...")"
    fi
   ;;
   i810)
    if [ -f /usr/lib/x/drivers-alternate/intel_drv.so ];then
     TRYDRV='intel'
     EXTRABUTTON='--extra-button'
     EXTRALABEL='--extra-label New_intel_driver'
     EXTRADRVMSG="
-ATTN: There is an newer 'intel' Intel video driver that might work better..."
+$(gettext "ATTN: There is an newer 'intel' Intel video driver that might work better...")"
    fi
   ;;
   nv)
    if [ -f /usr/lib/x/drivers-alternate/nvidia_drv.so ];then
     TRYDRV='nvidia'
     EXTRABUTTON='--extra-button'
     EXTRALABEL='--extra-label Alt_nvidia_driver'
     EXTRADRVMSG="
-ATTN: There is an alternative 'nvidia' Nvidia video driver that might work better..."
+$(gettext "ATTN: There is an alternative 'nvidia' Nvidia video driver that might work better...")"
    else
     if [ -f /usr/lib/x/drivers-alternate/nouveau_drv.so ];then
      TRYDRV='nouveau'
      EXTRABUTTON='--extra-button'
      EXTRALABEL='--extra-label Alt_nouveau_driver'
      EXTRADRVMSG="
-ATTN: There is an alternative 'nouveau' Nvidia video driver that might work better..."
+$(gettext "ATTN: There is an alternative 'nouveau' Nvidia video driver that might work better...")"
     fi
    fi
   ;;
   nouveau)
    if [ -f /usr/lib/x/drivers-alternate/nv_drv.so ];then
     TRYDRV='nv'
     EXTRABUTTON='--extra-button'
     EXTRALABEL='--extra-label Alternate_nv_driver'
     EXTRADRVMSG="
-ATTN: There is an alternative 'nv' Nvidia video driver that might work better..."
+$(gettext "ATTN: There is an alternative 'nv' Nvidia video driver that might work better...")"
    fi
   ;;
   nvidia)
    if [ -f /usr/lib/x/drivers-alternate/nv_drv.so ];then
     TRYDRV='nv'
     EXTRABUTTON='--extra-button'
     EXTRALABEL='--extra-label Alternate_nv_driver'
     EXTRADRVMSG="
-ATTN: There is an alternative 'nv' Nvidia video driver that might work better..."
+$(gettext "ATTN: There is an alternative 'nv' Nvidia video driver that might work better...")"
    fi
   ;;
  esac
 
  if [ "$CARD0DRIVER" != "vesa" ];then #v2.11 100109 fix yes/no labels...
   #current version of dialog in quirky has very annoying bug, --yes-label/no-label must be changed to --ok-label/cancel-label...
   if [ "$EXTRABUTTON" = "" ];then #100113
-   dialog --no-collapse --title "Xorg Video Wizard" --yes-label "Tweak_xorg.conf" --no-label "Vesa_driver" --yesno "Before continuing to tweaking xorg.conf, one other thing to consider.
+   dialog --no-collapse --title "$(gettext 'Xorg Video Wizard')" --yes-label "$(gettext 'Tweak_xorg.conf')" --no-label "Vesa_driver" --yesno "`eval_gettext \"Before continuing to tweaking xorg.conf, one other thing to consider.
 Xorg has a dozen or so drivers for particular video hardware, which
 optimises performance for the matching hardware, but sometimes a
 driver does not work right or there is no exact driver to match the
 hardware. The workaround for this is that Xorg has a generic driver
 called 'vesa' (note, this is not the Xvesa X server!), that works with
 most video hardware, but some performance may be lost.
 
-The current driver being used by Xorg is '${CARD0DRIVER}', and your video
-vendor is:  '${CARD0VENDOR}'
-board info: '${CARD0BOARD}'
+The current driver being used by Xorg is '\\\${CARD0DRIVER}', and your video
+vendor is:  '\\\${CARD0VENDOR}'
+board info: '\\\${CARD0BOARD}'
 
 So, if you have already tried 'tweaking' or you know that the Xorg
-'${CARD0DRIVER}' driver does not work on your hardware, consider the
+'\\\${CARD0DRIVER}' driver does not work on your hardware, consider the
 generic driver. Click <Vesa_driver> to change Xorg to using the
-generic driver, otherwise press ahead and try tweaking..." 0 0
+generic driver, otherwise press ahead and try tweaking...\"`" 0 0
   else
-   dialog --no-collapse ${EXTRABUTTON} --title "Xorg Video Wizard" --ok-label "Tweak_xorg.conf" --cancel-label "Vesa_driver" ${EXTRALABEL} --yesno "Before continuing to tweaking xorg.conf, one other thing to consider.
+   dialog --no-collapse ${EXTRABUTTON} --title "$(gettext 'Xorg Video Wizard')" --ok-label "$(gettext 'Tweak_xorg.conf')" --cancel-label "Vesa_driver" ${EXTRALABEL} --yesno "`eval_gettext \"Before continuing to tweaking xorg.conf, one other thing to consider.
 Xorg has a dozen or so drivers for particular video hardware, which
 optimises performance for the matching hardware, but sometimes a
 driver does not work right or there is no exact driver to match the
 hardware. The workaround for this is that Xorg has a generic driver
 called 'vesa' (note, this is not the Xvesa X server!), that works with
 most video hardware, but some performance may be lost.
 
-The current driver being used by Xorg is '${CARD0DRIVER}', and your video
-vendor is:  '${CARD0VENDOR}'
-board info: '${CARD0BOARD}'
+The current driver being used by Xorg is '\\\${CARD0DRIVER}', and your video
+vendor is:  '\\\${CARD0VENDOR}'
+board info: '\\\${CARD0BOARD}'
 
 So, if you have already tried 'tweaking' or you know that the Xorg
-'${CARD0DRIVER}' driver does not work on your hardware, consider the
+'\\\${CARD0DRIVER}' driver does not work on your hardware, consider the
 generic driver. Click 'Vesa_driver' to change Xorg to using the
-generic driver, otherwise press ahead and try tweaking...${EXTRADRVMSG}" 0 0
+generic driver, otherwise press ahead and try tweaking...\\\${EXTRADRVMSG}\"`" 0 0
   fi
   RET2=$?
   SUBSTDRV='vesa'
   #[ $RET2 -eq 3 ] && SUBSTDRV="$TRYDRV" #w482 intel or i810
   #100113 if change driver, really should probe again...
@@ -1737,17 +1740,17 @@
 
   #100330 offer to go back to probing all drivers...
   if [ "$DRVSNUM" = "1" ];then
    DRVSBKUP=`ls -1 /usr/lib/x/drivers-backup | wc -l`
    if [ $DRVSBKUP -gt 1 ];then
-    dialog --no-collapse --title "Xorg Video Wizard" --yes-label "Vesa" --no-label "Probe" --yesno "
-Earlier you chose to use the Vesa driver and not probe for a hardware
+    dialog --no-collapse --title "$(gettext 'Xorg Video Wizard')" --yes-label "Vesa" --no-label "$(gettext 'Probe')" --yesno "
+$(gettext 'Earlier you chose to use the Vesa driver and not probe for a hardware
 -specific driver, but if you are not happy with that choice you can
 now restart the Video Wizard and choose a full probe.
 
 Choose <Vesa> if you are happy with the Vesa driver...
-Choose <Probe> to go back and probe for a hardware-specific driver..." 0 0
+Choose <Probe> to go back and probe for a hardware-specific driver...')" 0 0
     if [ $? -ne 0 ];then
      cp -a -f --remove-destination /usr/lib/x/drivers-backup/* /usr/lib/xorg/modules/drivers/
      rm -f /usr/lib/x/drivers-backup/*
      exec xorgwizard ###EXIT###
     fi
@@ -1768,15 +1771,15 @@
       nvidia) xONEALT='Nvidia' ;;
      esac
      xALTERNATEDRIVERS="$xALTERNATEDRIVERS $ONEALT $xONEALT"
     done
     rm -f /tmp/xorgwizard-altdrv 2>/dev/null
-    dialog --title "Xorg Video Wizard" --menu "There are some alternative video drivers that Xorg is currently not using. If you think that your video hardware may need one of these, select it, otherwise stay with 'vesa'...
+    dialog --title "$(gettext 'Xorg Video Wizard')" --menu "`gettext \"There are some alternative video drivers that Xorg is currently not using. If you think that your video hardware may need one of these, select it, otherwise stay with 'vesa'...
 
 NOTICE: if you choose a driver other than 'vesa', then the Xorg Wizard will restart so that Xorg can probe the hardware with the chosen driver enabled.
 
-TECHNICAL NOTE: Unused drivers are kept at /usr/lib/x/drivers-alternate. If you choose one (other than 'vesa'), it will be moved to /usr/lib/xorg/modules/drivers." 0 0 0 vesa Generic_driver $xALTERNATEDRIVERS 2> /tmp/xorgwizard-altdrv
+TECHNICAL NOTE: Unused drivers are kept at /usr/lib/x/drivers-alternate. If you choose one (other than 'vesa'), it will be moved to /usr/lib/xorg/modules/drivers.\"`" 0 0 0 vesa Generic_driver $xALTERNATEDRIVERS 2> /tmp/xorgwizard-altdrv
     if [ -s /tmp/xorgwizard-altdrv ];then
      ALTDRV="`cat /tmp/xorgwizard-altdrv`"
      mv -f /usr/lib/x/drivers-alternate/${ALTDRV}_drv.so /usr/lib/xorg/modules/drivers/
      exec xorgwizard ${ALTDRV} ###RESTART###
     fi
@@ -1783,42 +1786,42 @@
    fi
   fi
  fi
 
  #tweak...
- dialog --no-collapse --title "Xorg Video Wizard" --yes-label "Tweak_refresh" --no-label "Edit_xorg.conf" --yesno "If the graphics mode display was distorted, displaced, or a complete
+ dialog --no-collapse --title "$(gettext 'Xorg Video Wizard')" --yes-label "$(gettext 'Tweak_refresh')" --no-label "$(gettext 'Edit_xorg.conf')" --yesno "$(gettext 'If the graphics mode display was distorted, displaced, or a complete
 mess, the simplest option now is to adjust the vertical screen refresh
 frequency up or down slightly.
 However, if you are more experienced with Linux and X, you may prefer
 to open xorg.conf in a text editor and change whatever you wish.
 
 Press ENTER key for the easy option, tweak refresh frequency...
-Press TAB then ENTER to open xorg.conf in a text editor..." 0 0
+Press TAB then ENTER to open xorg.conf in a text editor...')" 0 0
 
  if [ $? -eq 0 ];then
   if [ "$MONCHOICES" = "" ];then
    #not plug-n-play.
-   MSGPNP="WARNING: Your monitor is not plug-and-play so this Wizard cannot
+   MSGPNP="$(gettext 'WARNING: Your monitor is not plug-and-play so this Wizard cannot
          determine its max allowable refresh frequency. A very cheap old
-         CRT monitor may not handle more than 70Hz, better quality, 85Hz."
+         CRT monitor may not handle more than 70Hz, better quality, 85Hz.')"
   else
-   MSGPNP="WARNING: the maximum screen refresh frequency is specified
-         as ${MAXVERT}Hz (times per second). Do not choose any entry
-         in the list below that exceeds this."
+   MSGPNP="`eval_gettext \"WARNING: the maximum screen refresh frequency is specified
+         as \\\${MAXVERT}Hz (times per second). Do not choose any entry
+         in the list below that exceeds this.\"`"
   fi
-  MSGGEN="Note1: It is unwise to push a monitor too hard. Just go high enough so
+  MSGGEN="$(gettext 'Note1: It is unwise to push a monitor too hard. Just go high enough so
        that there is no flicker. 72Hz-85Hz for CRT, 60Hz for LCD.
-Note2: Display displaced to right is often due to frequency too high."
+Note2: Display displaced to right is often due to frequency too high.')"
   #just offer standard freqs...
-  VERT0=56; MSGV0="Very noticeable flicker on CRT screens"
-  VERT1=60; MSGV1="Okay for most LCD screens, flicker on CRT"
-  VERT2=72; MSGV2="Sensitive eyes may notice flicker on CRT"
-  VERT3=75; MSGV3="Sensitive eyes may notice flicker on CRT"
-  VERT4=80; MSGV4="Usually no flicker on CRT"
-  VERT5=85; MSGV5="No flicker on CRT"
-
-  dialog --no-cancel --title "Xorg Video Wizard" --menu "Xorg is currently set to refresh the screen $VRTEST times per second. Taking this up or down may remove distortion etc., but note that the choices here are only suggested upper limits and Xorg may not use exactly the frequency chosen here.
+  VERT0=56; MSGV0="$(gettext 'Very noticeable flicker on CRT screens')"
+  VERT1=60; MSGV1="$(gettext 'Okay for most LCD screens, flicker on CRT')"
+  VERT2=72; MSGV2="$(gettext 'Sensitive eyes may notice flicker on CRT')"
+  VERT3=75; MSGV3="$(gettext 'Sensitive eyes may notice flicker on CRT')"
+  VERT4=80; MSGV4="$(gettext 'Usually no flicker on CRT')"
+  VERT5=85; MSGV5="$(gettext 'No flicker on CRT')"
+
+  dialog --no-cancel --title "$(gettext 'Xorg Video Wizard')" --menu "`eval_gettext \"Xorg is currently set to refresh the screen \\\$VRTEST times per second. Taking this up or down may remove distortion etc., but note that the choices here are only suggested upper limits and Xorg may not use exactly the frequency chosen here.\"`
 
 $MSGGEN
 
 $MSGPNP" 0 0 0 \
  "$VERT0" "$MSGV0" \
@@ -1857,34 +1860,34 @@
    sed -i -e "$mm2PATTERN" /etc/X11/xorg.conf
   fi
 
   rm -f /tmp/xorg.conf.tmp2
  else
-  dialog --no-collapse --title "Xorg Video Wizard" --msgbox "Before editing xorg.conf, consider this...
+  dialog --no-collapse --title "$(gettext 'Xorg Video Wizard')" --msgbox "`eval_gettext \"Before editing xorg.conf, consider this...
 
 /etx/X11/xorg.conf has these lines in the Monitor section:
-  HorizSync    $HORIZSYNC
-  VertRefresh  $VERTREFRESH
+  HorizSync    \\\$HORIZSYNC
+  VertRefresh  \\\$VERTREFRESH
 
 For the resolution that you want to run at, you many want to narrow
 -down the specs in xorg.conf. For example, say you want 1024x768@85,
 but xorg.conf has VertRefresh 50-160. -- maybe narrow that to 50-85.
 
-Press ENTER key to edit xorg.conf..." 0 0
+Press ENTER key to edit xorg.conf...\"`" 0 0
   #edit xorg.conf...
   mp /etc/X11/xorg.conf
  fi
 done #testloop
 
 if [ $XAUTO -ne 0 ];then #<FIX> (XAUTO=0 is <OK> button)
  if [ -e /usr/bin/Xvesa ];then
-  dialog --title "Xorg Video Wizard" --yes-label "DONE" --no-label "Xvesa" --yesno "Just press ENTER key if all is fine and you are ready to run
+  dialog --title "$(gettext 'Xorg Video Wizard')" --yes-label "$(gettext 'DONE')" --no-label "Xvesa" --yesno "$(gettext "Just press ENTER key if all is fine and you are ready to run
 Puppy with Xorg.
 
 If you cannot get Xorg to work, press TAB then ENTER to choose
 the \"Xvesa\" button. This will start Puppy with the simple Xvesa
-graphics server that runs on most video hardware." 0 0
+graphics server that runs on most video hardware.")" 0 0
 
   if [ ! $? -eq 0 ];then
    ln -sf Xvesa /usr/bin/X
   else
    #prevent Xvesa video wizard from running after X has started...
@@ -1902,20 +1905,20 @@
 if [ $XAUTO -ne 0 ];then #<FIX> (XAUTO=0 is <OK> button)
  #need to do this here again in case of tweaking made some changes...
  #create a copy of xorg.conf with the profile in the filename...
  cp -af /etc/X11/xorg.conf /etc/X11/xorg.conf.${PROFILECHIP}${PROFILEMONITOR}
  clear
- echo "Xorg Video Wizard completed. Type 'xwin' to start X..."
+ echo "$(gettext "Xorg Video Wizard completed. Type 'xwin' to start X...")"
 else
  clear
  #user chose the <OK> button, so going directly into X without testing.
  echo -en "\\033[1;31m" #34=blue, 33=yellow, 32=green, 31=red, 35=purple, 36=aquablue, 38=black.
- echo "If X did not work, type 'xorgwizard' to run the Video Wizard again."
- echo "After that, type 'xwin' to run X graphics mode."
- echo "Note, if X works but needs minor adjustment to the display, run the"
- echo "Video Wizard from within X (in the Setup menu) -- module 'Xvidtune'"
- echo -n "may be used, with caution, to finetune the display dimensions."
+ echo "$(gettext "If X did not work, type 'xorgwizard' to run the Video Wizard again.")"
+ echo "$(gettext "After that, type 'xwin' to run X graphics mode.")"
+ echo "$(gettext "Note, if X works but needs minor adjustment to the display, run the")"
+ echo "$(gettext "Video Wizard from within X (in the Setup menu) -- module 'Xvidtune'")"
+ echo -n "$(gettext "may be used, with caution, to finetune the display dimensions.")"
  echo -e "\\033[0;39m"
 fi
 
 #v3.99 begin
 [ -z /tmp/ddcprobeoem.txt ] && rm /tmp/ddcprobeoem.txt  #empty