Check-in [57bb7bf225]
Not logged in

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

Overview

SHA1 Hash:57bb7bf22555c2e1eb966ee9a43c17c506334417
Date: 2012-02-02 23:20:27
User: BarryK
Comment:internationalized: remove_builtin, resizepfile.sh, set_hwclock_type, set_time_for_puppy, sfsget, usb_modeswitch_status, video-wizard, wakepup2, wizardwizard, xinitrc_test, xserverwixard

Tags And Properties
Changes

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

@@ -2,61 +2,71 @@
 #Barry Kauler Dec. 2010, license GPL v3 /usr/share/doc/legal.
 #based on a script by technosaurus, Dec. 2010.
 #101222 fix menu.
 #101227 technosaurus: fixed reverse dependency check.
 #110505 support sudo for non-root user.
+#120202 rodin.s: internationalized.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
-export LANG=C #keep Xdialog happy.
+export TEXTDOMAIN=remove_builtin
+export TEXTDOMAINDIR=/usr/share/locale
+export OUTPUT_CHARSET=UTF-8
+eval_gettext () {
+  local myMESSAGE=$(gettext "$1")
+  eval echo \"$myMESSAGE\"
+}
+export LANGORG=$LANG
+
+#export LANG=C #keep Xdialog happy. #off for gettext
 
-MSG1="Simple utility to 'delete' packages that are builtin\nto the read-only .sfs file (Squashfs filesystem)"
+MSG1="`gettext \"Simple utility to 'delete' packages that are builtin\nto the read-only .sfs file (Squashfs filesystem)\"`"
 
 #!/bin/sh
 D=$HOME/.packages/builtin_files
 
 while [ 1 ];do
  FIXMENU='no' #101222
  PKGS=`ls -1 $D`
- PKG=`Xdialog --left --screen-center --backtitle "${MSG1}" --title "Remove builtin packages" --stdout --help "In all modes of running Puppy, other than a full hard-drive installation,\n
+ PKG=`Xdialog --left --screen-center --backtitle "${MSG1}" --title "$(gettext 'Remove builtin packages')" --stdout --help "$(gettext "In all modes of running Puppy, other than a full hard-drive installation,\n
 all of the Puppy files are in a compressed read-only file named 'puppy.sfs'\n
 or 'wary_500.sfs' (or some similar name). So you can't actually delete these\n
 files. However, if you want to remaster the live-CD to create your own custom\n
 Puppy (see Setup menu), you can use this little program to 'pretend' to delete\n
 them -- and they will really be gone in the remastered CD. So, for example if\n
 you remove SeaMonkey, it will be gone in the remastered CD thus reducing the\n
 size of the .iso live-CD file.\n\n
 Technical note: the lists of builtin files is at /root/.packages/builtin_files,\n
-        the list of builtin pkgs is in /root/.packages/woof-installed-packages." --combobox "Select package to remove:" 0 0 $PKGS`
+        the list of builtin pkgs is in /root/.packages/woof-installed-packages.")" --combobox "$(gettext 'Select package to remove:')" 0 0 $PKGS`
  if [ "$PKG" ];then
   aREGEX="|${PKG}|"
   DESCR="`grep "$aREGEX" /root/.packages/woof-installed-packages |cut -d "|" -f 10`"
-  Xdialog --left --screen-center --backtitle "Confirm that you want to delete '${PKG}'" --title "Remove builtin packages" --yesno "Description of package:\n
+  Xdialog --left --screen-center --backtitle "$(gettext 'Confirm that you want to delete') '${PKG}'" --title "$(gettext 'Remove builtin packages')" --yesno "$(gettext 'Description of package:')\n
 ${DESCR}\n\n
-For information only, these are dependencies of '${PKG}':\n
+$(gettext 'For information only, these are dependencies of') '${PKG}':\n
 `grep "$aREGEX" /root/.packages/woof-installed-packages |cut -d "|" -f 9 | sed -e 's%^+%%' -e 's%,+% %g'`
 \n
-Warning, removing '${PKG}' _may_ break the following packages:\n
+`eval_gettext \"Warning, removing '\\\${PKG}' _may_ break the following packages:\"`\n
 `grep +${PKG} /root/.packages/woof-installed-packages |cut -d "|" -f 2 |tr "\n" " "`
 \n
-Continue?" 0 0
+$(gettext 'Continue?')" 0 0
   if [ $? -eq 0 ];then
    [ "`grep '\.desktop$' ${D}/${PKG}`" != "" ] && FIXMENU='yes' #101222
    for x in `cat $D/$PKG`; do [ -d $x ] && cd $x || rm $x; done
    for x in `tac $D/$PKG`; do [ -d $x ] && [ ! "`ls $x`" ] && rmdir $x; done
    rm $D/$PKG
    grep -v "$aREGEX" /root/.packages/woof-installed-packages > /tmp/woof-installed-packages-cut2
    mv -f /tmp/woof-installed-packages-cut2 /root/.packages/woof-installed-packages
-   MSG1="Package '${PKG}' was removed. Choose another..."
+   MSG1="`eval_gettext \"Package '\\\${PKG}' was removed. Choose another...\"`"
    if [ "$FIXMENU" = "yes" ];then #101222
     fixmenus
     [ "`pidof jwm`" != "" ] && jwm -restart
     sleep 1
    fi
   else
-   MSG1="Package '${PKG}' was not removed. Choose another..."
+   MSG1="`eval_gettext \"Package '\\\${PKG}' was not removed. Choose another...\"`"
   fi
   #exec remove_builtin.sh "$MSG1"
   continue
  fi
  break
 done

Changes to woof-code/rootfs-skeleton/usr/sbin/resizepfile.sh

@@ -2,10 +2,19 @@
 #2007 Lesser GPL licence v2 (http://www.fsf.org/licensing/licenses/lgpl.html)
 #make the pup_save.2fs file bigger.
 #v412 /etc/DISTRO_SPECS, renamed pup_xxx.sfs, pup_save.2fs etc.
 #v555 pup files renamed to woofr555.sfs, woofsave.2fs.
 #100913 simplified filenames, minor update of comments.
+#120202 rodin.s: internationalized.
+
+export TEXTDOMAIN=resizepfile.sh
+export TEXTDOMAINDIR=/usr/share/locale
+export OUTPUT_CHARSET=UTF-8
+eval_gettext () {
+  local myMESSAGE=$(gettext "$1")
+  eval echo \"$myMESSAGE\"
+}
 
 #variables created at bootup by /initrd/usr/sbin/init...
 . /etc/rc.d/PUPSTATE
 . /etc/DISTRO_SPECS #v412
 
@@ -21,21 +30,21 @@
   CANDOIT="yes"
   ;;
 esac
 
  if [ "$CANDOIT" != "yes" ];then
-  xmessage -center -bg "#ffc0c0" -title "Resize personal storage file: ERROR" "Sorry, Puppy is not currently using a personal persistent
-storage file. If this is the first time that you booted
-Puppy, say from a live-CD, you are currently running
-totally in RAM and you will be asked to create a personal
-storage file when you end the session (shutdown the PC or
-reboot). Note, the file will be named ${DISTRO_FILE_PREFIX}save.2fs and
-will be created in a place that you nominate.
-If you have installed Puppy to hard drive, or installed
-such that personal storage is an entire partition, then
-you will not have a ${DISTRO_FILE_PREFIX}save.2fs file either.
-Press OK to exit..."
+  xmessage -center -bg "#ffc0c0" -title "$(gettext 'Resize personal storage file: ERROR')" "$(gettext 'Sorry, Puppy is not currently using a personal persistent')
+$(gettext 'storage file. If this is the first time that you booted')
+$(gettext 'Puppy, say from a live-CD, you are currently running')
+$(gettext 'totally in RAM and you will be asked to create a personal')
+$(gettext 'storage file when you end the session (shutdown the PC or')
+`eval_gettext \"reboot). Note, the file will be named \\\${DISTRO_FILE_PREFIX}save.2fs and\"`
+$(gettext 'will be created in a place that you nominate.')
+$(gettext 'If you have installed Puppy to hard drive, or installed')
+$(gettext 'such that personal storage is an entire partition, then')
+`eval_gettext \"you will not have a \\\${DISTRO_FILE_PREFIX}save.2fs file either.\"`
+$(gettext 'Press OK to exit...')"
   exit
  fi
 
 [ ! "$PUPSAVE" ] && exit #precaution
 [ ! "$PUP_HOME" ] && exit #precaution.
@@ -54,38 +63,38 @@
 ACTUALSIZE=`expr $ACTUALSIZK \/ 1024`
 APATTERN="/dev/${SAVEPART} "
 PARTFREE=`df -m | grep "$APATTERN" | tr -s " " | cut -f 4 -d " "`
 
 
-REPORTACTION="Welcome to the Puppy Resize personal storage file utility!"
-
-MAINTEXT="Your personal file is $NAMEPFILE, and this contains all of your data,
-configuration files, email, newsgroup cache, history files, installed
-packages and so on.
-
-You have $SIZEFREE Mbytes free space left in $NAMEPFILE,
-out of a total size of $ACTUALSIZE Mbytes.
-
-File $NAMEPFILE is actually stored on partition $SAVEPART.
-You have $PARTFREE Mbytes space left in $SAVEPART.
-
-So, you need to make a decision. If you see that you are running
-low on space in $NAMEPFILE, you can make it bigger, but of
-course there must be enough space in $SAVEPART.
-Note, it was reported on the Forum that $NAMEPFILE should not be
-made bigger than 1.8GB, but I have yet to confirm this limitation.
-
-PLEASE NOTE THAT AFTER YOU HAVE CLICKED A BUTTON BELOW,
-NOTHING WILL HAPPEN. THE RESIZING WILL HAPPEN AT REBOOT.
-
-Press a button to make $NAMEPFILE bigger by that amount...
-(note, this is one-way, you cannot make it smaller)"
-
-BUTTONS="+16M:15,+32M:14,+64M:10,+128M:11,+256M:12,+512M:13,EXIT:19"
+REPORTACTION="$(gettext 'Welcome to the Puppy Resize personal storage file utility!')"
+
+MAINTEXT="`eval_gettext \"Your personal file is \\\$NAMEPFILE, and this contains all of your data,\"`
+$(gettext 'configuration files, email, newsgroup cache, history files, installed')
+$(gettext 'packages and so on.')
+
+`eval_gettext \"You have \\\$SIZEFREE Mbytes free space left in \\\$NAMEPFILE,\"`
+`eval_gettext \"out of a total size of \\\$ACTUALSIZE Mbytes.\"`
+
+`eval_gettext \"File \\\$NAMEPFILE is actually stored on partition \\\$SAVEPART.\"`
+`eval_gettext \"You have \\\$PARTFREE Mbytes space left in \\\$SAVEPART.\"`
+
+$(gettext 'So, you need to make a decision. If you see that you are running')
+`eval_gettext \"low on space in \\\$NAMEPFILE, you can make it bigger, but of\"`
+`eval_gettext \"course there must be enough space in \\\$SAVEPART.\"`
+`eval_gettext \"Note, it was reported on the Forum that \\\$NAMEPFILE should not be\"`
+$(gettext 'made bigger than 1.8GB, but I have yet to confirm this limitation.')
+
+$(gettext 'PLEASE NOTE THAT AFTER YOU HAVE CLICKED A BUTTON BELOW,
+NOTHING WILL HAPPEN. THE RESIZING WILL HAPPEN AT REBOOT.')
+
+`eval_gettext \"Press a button to make \\\$NAMEPFILE bigger by that amount...\"`
+$(gettext '(note, this is one-way, you cannot make it smaller)')"
+
+BUTTONS="+16M:15,+32M:14,+64M:10,+128M:11,+256M:12,+512M:13,$(gettext 'EXIT'):19"
 
 
-xmessage -center -bg "#c0ffff" -title "Resize personal storage file" -buttons "$BUTTONS" -file -<<MSG1
+xmessage -center -bg "#c0ffff" -title "$(gettext 'Resize personal storage file')" -buttons "$BUTTONS" -file -<<MSG1
 $REPORTACTION
 
 $MAINTEXT
 MSG1
 
@@ -116,24 +125,24 @@
    ;;
 esac
 
 echo -n "$KILOBIG" > /initrd${PUP_HOME}/pupsaveresize.txt
 
-xmessage -center -bg "orange" -title "Resize personal storage file" "Okay, you have chosen to increase $NAMEPFILE by $KILOBIG Kbytes,
-however as the file is currently in use, it will happen at reboot.
+xmessage -center -bg "orange" -title "$(gettext 'Resize personal storage file')" "`eval_gettext \"Okay, you have chosen to increase \\\$NAMEPFILE by \\\$KILOBIG Kbytes,\"`
+$(gettext 'however as the file is currently in use, it will happen at reboot.')
+
+$(gettext 'Technical notes:')
+$(gettext 'The required size increase has been written to file pupsaveresize.txt,')
+`eval_gettext \"in partition \\\$SAVEPART (currently mounted on /mnt/home).\"`
+$(gettext 'File pupsaveresize.txt will be read at bootup and the resize performed')
+$(gettext 'then pupsaveresize.txt will be deleted.')
 
-Technical notes:
-The required size increase has been written to file pupsaveresize.txt,
-in partition $SAVEPART (currently mounted on /mnt/home).
-File pupsaveresize.txt will be read at bootup and the resize performed
-then pupsaveresize.txt will be deleted.
+`eval_gettext \"WARNING: If you have multiple \\\${DISTRO_FILE_PREFIX}save files, be sure to select\"`
+$(gettext 'the same one when you reboot.')
 
-WARNING: If you have multiple ${DISTRO_FILE_PREFIX}save files, be sure to select
-the same one when you reboot.
-
-You can keep using Puppy. The change will only happen at reboot.
-Click OK to exit..."
+$(gettext 'You can keep using Puppy. The change will only happen at reboot.')
+$(gettext 'Click OK to exit...')"
 
 ###END###
 
 #notes:
 #  dd if=/dev/zero bs=1k count=$KILOBIG | tee -a $HOMELOCATION > /dev/null

Changes to woof-code/rootfs-skeleton/usr/sbin/set-time-for-puppy

@@ -1,35 +1,45 @@
 #!/bin/sh
 #2007 Lesser GPL licence v2 (http://www.fsf.org/licensing/licenses/lgpl.html)
 # A small script used to set the time under Linux with hwclock...
 # MU: updated for puppy 1.0.7.
 #100525 hardware clock can be utc or localtime (thanks to pizzasgood).
+#120202 rodin.s: internationalized.
+
+export TEXTDOMAIN=set-time-for-puppy
+export TEXTDOMAINDIR=/usr/share/locale
+export OUTPUT_CHARSET=UTF-8
+eval_gettext () {
+  local myMESSAGE=$(gettext "$1")
+  eval echo \"$myMESSAGE\"
+}
+export LANGORG=$LANG
 
 . /etc/clock #100525
 
 # Title to be used for all Xdialog boxes.
-TITLE="Set time tool"
+TITLE="$(gettext 'Set time tool')"
 
 ## Now check for hwclock existence...
 #if ! [ -f /usr/sbin/hwclock ] ; then
 #   Xdialog --title "$TITLE" --msgbox "/usr/sbin/hwclock not found..." 0 0
 #   exit 0
 #fi
 
 # Get the date (returned in DD/MM/YYYY format by Xdialog.
-ENTEREDDATE=`Xdialog --stdout --title "$TITLE" --calendar "Please set the date..." 0 0 0 0 0`
+ENTEREDDATE=`Xdialog --stdout --title "$TITLE" --calendar "$(gettext 'Please set the date...')" 0 0 0 0 0`
 if [ ! $? -eq 0 ]; then
    exit
 fi
 
 # Convert the date to the MM/DD/YYYY format needed by hwclock.
 NEWDATE=`echo "$ENTEREDDATE" | awk --source 'BEGIN { FS="/" }' --source '{ print $2 "/" $1 "/" $3 }'`
 
 # Get the time in HH:MM:SS format.
-NEWTIME=`Xdialog --stdout --title "$TITLE" --timebox "Please set the time..." 0 0`
+NEWTIME=`Xdialog --stdout --title "$TITLE" --timebox "$(gettext 'Please set the time...')" 0 0`
 if [ ! $? -eq 0 ]; then
-   Xdialog --title "$TITLE" --msgbox "Aborted." 0 0
+   Xdialog --title "$TITLE" --msgbox "$(gettext 'Aborted.')" 0 0
    exit
 fi
 
 
 # Set the hardware clock (RTC) and then the system clock
@@ -44,12 +54,12 @@
 DT=`echo $M$D$H$Y`
 
 date $DT
 
 
-Xdialog --title "info" --msgbox "Your screen might turn black now for some seconds, just wait..." 0 0
+Xdialog --title "$(gettext 'info')" --msgbox "$(gettext 'Your screen might turn black now for some seconds, just wait...')" 0 0
 
 #hwclock --systohc --localtime
 hwclock --systohc --${HWCLOCKTIME} #100525
 
 THEDATE=`date`
-Xdialog --title "info" --msgbox "Finished. Time was set to $THEDATE" 0 0
+Xdialog --title "$(gettext 'info')" --msgbox "$(gettext 'Finished. Time was set to') $THEDATE" 0 0

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

@@ -1,8 +1,13 @@
 #!/bin/sh
 #written by pizzasgood, 2009
 #GPL license /usr/share/doc/legal/gpl-2.0.txt
+#120202 rodin.s: internationalized.
+
+export TEXTDOMAIN=set_hwclock_type
+export OUTPUT_CHARSET=UTF-8
+
 [ -f /etc/clock ] && . /etc/clock
 
 if [ "$HWCLOCKTIME" = "utc" ]; then
     utc_flag='on'
     local_flag='off'
@@ -9,11 +14,11 @@
 else
     utc_flag='off'
     local_flag='on'
 fi
 
-HWCLOCKTIME=$(Xdialog --title "Set HW-Clock Type" --radiolist "What should the hardware clock be interpreted as?" 0 0 0 localtime "" $local_flag utc "" $utc_flag 2>&1)
+HWCLOCKTIME=$(Xdialog --title "`gettext \"Set HW-Clock Type\"`" --radiolist "`gettext \"What should the hardware clock be interpreted as?\"`" 0 0 0 localtime "" $local_flag utc "" $utc_flag 2>&1)
 if [ $? -ne 0 ]; then
     exit
 fi
 
 if [ "$HWCLOCKTIME" = "utc" ] || [ "$HWCLOCKTIME" = "localtime" ]; then
@@ -22,11 +27,11 @@
     else
         hwPATTERN="s/^HWCLOCKTIME=[^#]*/HWCLOCKTIME='$HWCLOCKTIME'/"
         sed -i "$hwPATTERN" /etc/clock
     fi
 
-    RET=$(Xdialog --title "Set HW-Clock Type" --ok-label "Yes" --cancel-label "No" --radiolist "Update the software clock or the hardware clock? \n...if you don't know or uncertain, that's ok, just click the 'No' button" 0 0 0 software "to match hardware" on hardware "to match software" off 2>&1)
+    RET=$(Xdialog --title "`gettext \"Set HW-Clock Type\"`" --ok-label "`gettext \"Yes\"`" --cancel-label "`gettext \"No\"`" --radiolist "`gettext \"Update the software clock or the hardware clock? \n...if you don't know or uncertain, that's ok, just click the 'No' button\"`" 0 0 0 software "to match hardware" on hardware "to match software" off 2>&1)
     if [ $? -ne 0 ]; then
         exit
     fi
 
     if [ "$RET" = "software" ]; then
@@ -33,8 +38,8 @@
       hwclock --hctosys --$HWCLOCKTIME
     elif [ "$RET" = "hardware" ]; then
       hwclock --systohc --$HWCLOCKTIME
     fi
 
-    Xdialog --title "Set HW-Clock Type" --infobox "Done" 0 0 4000
+    Xdialog --title "$(gettext 'Set HW-Clock Type')" --infobox "$(gettext 'Done')" 0 0 4000
 
 fi

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

@@ -4,10 +4,14 @@
 #$1 is optional name of an sfs file passed on commandline, download it. ex: devx.sfs
 #$1 optional prefix, sub-directory on the official download URL. ex: wary-5.2/devx.sfs
 #110402 first version.
 #110422 DISTRO_VERSION variable now has dotted format. note, also now using full dotted version# in puppy filenames.
 #110813 bug fix, sfs file has '_' in name.
+#120202 BK: internationalized.
+
+export TEXTDOMAIN=sfsget
+export OUTPUT_CHARSET=UTF-8
 
 SFS_FILE=''; SFS_DIR=''
 if [ $1 ];then
  [ "`echo "$1" | grep '\.sfs$'`" = "" ] && exit 1
  SFS_FILE="`basename $1`"
@@ -75,11 +79,11 @@
 #samba-3.5.5-lucid-sfs4.sfs
 #skype_static-2.1.0.81.sfs
 #xaralx_imagemagick-0.7r1785-6.3.7.sfs
 
 #probe remote site...
-yaf-splash -placement center -bg yellow -close never -fontsize large -text "Please wait, probing primary remote site..." &
+yaf-splash -placement center -bg yellow -close never -fontsize large -text "$(gettext 'Please wait, probing primary remote site...')" &
 YPID=$!
 echo -n '' > /tmp/sfsget-probe
 echo -n '' > /tmp/sfsget-probe1
 echo -n '' > /tmp/sfsget-probe2
 xSFS_FILE="$SFS_FILE"
@@ -97,11 +101,11 @@
 kill $YPID
 
 if [ ! -s /tmp/sfsget-probe ];then
  if [ ! -s /tmp/sfsget-probe1 ];then
   if [ ! -s /tmp/sfsget-probe2 ];then
-   yaf-splash -placement center -bg red -close box -fontsize large -text "Either your Internet connection is not working, or the primary repository is down. Aborting SFS Downloader"
+   yaf-splash -placement center -bg red -close box -fontsize large -text "$(gettext 'Either your Internet connection is not working, or the primary repository is down. Aborting SFS Downloader')"
    exit 1
   fi
  fi
 fi
 
@@ -110,13 +114,13 @@
  SFSBUTTONS=''
  for ONESFS in `cat /tmp/sfsget-probe /tmp/sfsget-probe1 /tmp/sfsget-probe2 | sort -u | tr '\n' ' '`
  do
   SFSBUTTONS="${SFSBUTTONS}<radiobutton><label>${ONESFS}</label><variable>RADIO_URL_${ONESFS}</variable></radiobutton>"
  done
- export SFS_DIALOG="<window title=\"SFS Downloader: choose file\" icon-name=\"gtk-about\" window_position=\"1\">
+ export SFS_DIALOG="<window title=\"$(gettext 'SFS Downloader: choose file')\" icon-name=\"gtk-about\" window_position=\"1\">
  <vbox>
-  <text><label>Please choose an SFS file that you would like to download:</label></text>
+  <text><label>$(gettext 'Please choose an SFS file that you would like to download:')</label></text>
   <frame>
    ${SFSBUTTONS}
   </frame>
   <hbox>
    <button ok></button>
@@ -145,22 +149,22 @@
  RUNBOOTMGR='yes'
  cd $DLMOUNT
 else
  DLPARTS="`probepart -m | grep -v -E 'none|iso9660|swap' | tr '\n' ' '`"
  DLBUTTONS=""
- [ "$DLPARTS" = "" ] && DLBUTTONS="<text use-markup=\"true\"><label>\"<b>NO PARTITIONS FOUND</b>\"</label></text>"
+ [ "$DLPARTS" = "" ] && DLBUTTONS="<text use-markup=\"true\"><label>\"<b>$(gettext 'NO PARTITIONS FOUND')</b>\"</label></text>"
  for ONEDLSPEC in $DLPARTS
  do
   DEVNODE="`echo -n "$ONEDLSPEC" | cut -f 1 -d '|' | cut -f 3 -d '/'`"
   DEVFS="`echo -n "$ONEDLSPEC" | cut -f 2 -d '|'`"
   DEVSIZEM="`echo -n "$ONEDLSPEC" | cut -f 3 -d '|'`"
   DLBUTTONS="${DLBUTTONS}<radiobutton><label>${DEVNODE} filesystem: ${DEVFS} size: ${DEVSIZEM}MB</label><variable>RADIO_URL_${DEVNODE}</variable></radiobutton>"
  done
  export DL_DIALOG="<window title=\"SFS Downloader: destination\" icon-name=\"gtk-about\" window_position=\"1\">
  <vbox>
-  <text><label>This is a first boot of Puppy and you have not yet saved a session. You want to download $SFS_FILE, and this needs to be downloaded to the same partition in which you will be creating the session save-file. Then, at next boot, Puppy will load the session and will also see the SFS file and be able to load that also (a 'zdrv' will load automatically, others need to be manually selected in te BootManager -- see System menu)</label></text>
-  <text><label>Here is a list of suitable partitions. Whichever one you choose, at shutdown you will be asked to save the session and be sure to choose the same partition. Well, even if you download it to the wrong place, you can move it afterward! Click the one you want:</label></text>
+  <text><label>$(gettext 'This is a first boot of Puppy and you have not yet saved a session. You want to download') ${SFS_FILE}, $(gettext "and this needs to be downloaded to the same partition in which you will be creating the session save-file. Then, at next boot, Puppy will load the session and will also see the SFS file and be able to load that also (a 'zdrv' will load automatically, others need to be manually selected in te BootManager -- see System menu)")</label></text>
+  <text><label>$(gettext 'Here is a list of suitable partitions. Whichever one you choose, at shutdown you will be asked to save the session and be sure to choose the same partition. Well, even if you download it to the wrong place, you can move it afterward! Click the one you want:')</label></text>
   <frame>
    ${DLBUTTONS}
   </frame>
   <hbox>
    <button ok></button>
@@ -177,11 +181,11 @@
   mkdir -p /mnt/${DEVNODE}
   REGEXe="/dev/${DLPART}|"
   DLFS="`echo "$DLPARTS" | grep "$REGEXe" | cut -f 2 -d '|'`"
   mount -t $DLFS /dev/$DEVNODE /mnt/$DEVNODE
   if [ $? -ne 0 ];then
-   xmessage -bg red -center "ERROR: Could not mount /dev/${DEVNODE}, aborting"
+   xmessage -bg red -center "$(gettext 'ERROR: Could not mount') /dev/${DEVNODE}, $(gettext 'aborting')"
    exit 1
   fi
   DLMOUNT="/mnt/$DEVNODE"
  fi
  cd $DLMOUNT
@@ -195,28 +199,28 @@
  REPOBUTTONS="${REPOBUTTONS}<radiobutton><label>${URL_TEST}</label><variable>RADIO_URL_${URL_TEST}</variable></radiobutton>"
 done
 
 DLRET=1
 while [ $DLRET -ne 0 ];do
- export DEPS_DIALOG="<window title=\"SFS Downloader: host site\" icon-name=\"gtk-about\" window_position=\"1\">
+ export DEPS_DIALOG="<window title=\"$(gettext 'SFS Downloader: host site')\" icon-name=\"gtk-about\" window_position=\"1\">
 <vbox>
- <text><label>You have chosen to download this SFS file:</label></text>
+ <text><label>$(gettext 'You have chosen to download this SFS file:')</label></text>
  <text use-markup=\"true\"><label>\"<b>${SFS_FILE}</b>\"</label></text>
- <text><label>It will be downloaded to the top-level (/) in partition /dev/${DLPART}.</label></text>
- <text><label>Please choose which URL you would like to download it from:</label></text>
+ <text><label>$(gettext 'It will be downloaded to the top-level (/) in partition') /dev/${DLPART}.</label></text>
+ <text><label>$(gettext 'Please choose which URL you would like to download it from:')</label></text>
 
  <frame>
   ${REPOBUTTONS}
  </frame>
 
  <hbox>
   <button>
-   <label>Test URLs</label>
+   <label>$(gettext 'Test URLs')</label>
    <action>/usr/local/petget/testurls.sh</action>
   </button>
   <button>
-   <label>Download SFS file</label>
+   <label>$(gettext 'Download SFS file')</label>
    <action type=\"exit\">BUTTON_SFS_DOWNLOAD</action>
   </button>
   <button cancel></button>
  </hbox>
 </vbox>
@@ -235,13 +239,13 @@
 
  DLRET=$?
 done #while loop
 
 if [ "$RUNBOOTMGR" = "yes" ];then
- yaf-splash -placement top -bg green -close box -fontsize large -timeout 20 -text "The SFS file has downloaded. You can now choose it in the BootManager (but not a 'zdrv' SFS, that will automatically load), then reboot for it to load" &
+ yaf-splash -placement top -bg green -close box -fontsize large -timeout 20 -text "$(gettext "The SFS file has downloaded. You can now choose it in the BootManager (but not a 'zdrv' SFS, that will automatically load), then reboot for it to load")" &
  bootmanager extrasfs
 else
- yaf-splash -placement center -bg green -close box -fontsize large -text "The SFS file has been downloaded, however you have to save the session (at shutdown) then on next bootup the BootManager will run and offer the SFS file (a 'zdrv' SFS will automatically load)." &
+ yaf-splash -placement center -bg green -close box -fontsize large -text "$(gettext "The SFS file has been downloaded, however you have to save the session (at shutdown) then on next bootup the BootManager will run and offer the SFS file (a 'zdrv' SFS will automatically load).")" &
 fi
 
 exit 0
 ###END###

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

@@ -5,10 +5,15 @@
 #101209 switch has occurred, but sometimes (my ZTE K3571-Z modem) usbserial.ko fails to attach to usb interface.
 #110914 think possible this script gets called almost simultaneously more than once.
 #110914 create /dev/gsmmodem symlink if usb-modeswitch fails to do it.
 #120109 usb_modeswitch 1.2.1 different success message.
 #120109 /usr/sbin/usb_modeswitch_special_status now just comes here (usb modems that do not need switch).
+#120202 rodin.s: internationalized.
+
+export TEXTDOMAIN=usb_modeswitch_status
+export OUTPUT_CHARSET=UTF-8
+export LANG="`cat /etc/profile|grep '^LANG='| cut -d '=' -f2`"
 
 #all of the uevent env. variables are visible here. ex (my Optus 3G modem):
 #ACTION=add
 #DEVICE=/proc/bus/usb/001/005
 #DEVPATH=/devices/pci0000:00/0000:00:1d.7/usb1/1-2/1-2:1.5
@@ -40,11 +45,11 @@
 rm -f /tmp/usb_modeswitch_status_lockregion_${$}_
 #end lock region#
 
 rm -f /tmp/usb_modeswitch_status_flag_success 2>/dev/null
 
-DISPLAY=":0" yaf-splash -placement center -close never -bg yellow -fontsize large -text "3G USB modem inserted, please wait, configuring ..." &
+DISPLAY=":0" yaf-splash -placement center -close never -bg yellow -fontsize large -text "$(gettext '3G USB modem inserted, please wait, configuring ...')" &
 yPID=$!
 
 BRKCNT=0
 while [ $BRKCNT -lt 30 ];do
  sleep 1
@@ -92,11 +97,11 @@
    #...er, but problem, not removed when modem unplugged.
   #fi
 
  fi
  kill $yPID
- DISPLAY=":0" yaf-splash -placement center -close never -timeout 12 -bg green -fontsize large -text "3G USB modem now ready for use" &
+ DISPLAY=":0" yaf-splash -placement center -close never -timeout 12 -bg green -fontsize large -text "$(gettext '3G USB modem now ready for use')" &
  touch /tmp/usb_modeswitch_status_flag_success
 else
  #do not display an error msg. in case no modeswitch was required?
  echo
 fi

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

@@ -1,22 +1,32 @@
 #!/bin/sh
 #BK video-wizard (c) Copyright 2007 Barry Kauler
-#2007 Lesser GPL licence v2 (http://www.fsf.org/licensing/licenses/lgpl.html)
+#2007 Lesser GPL licence v2 (see: /usr/share/doc/legal)
 #written for Puppy v3.00
 #bugfix v3.02
 #v404 flag to rebuild drive icons (see /sbin/clean_desk_icons).
 #w019 apr2009: updated for woof.
 #101020 no longer have /etc/modprobe.conf.
+#120202 rodin.s: internationalized.
+
+export TEXTDOMAIN=video-wizard
+export TEXTDOMAINDIR=/usr/share/locale
+export OUTPUT_CHARSET=UTF-8
+eval_gettext () {
+  local myMESSAGE=$(gettext "$1")
+  eval echo \"$myMESSAGE\"
+}
+export LANGORG=$LANG
 
 . /etc/rc.d/PUPSTATE
 
 CURRENTX="`readlink /usr/bin/X`"
 if [ "$CURRENTX" != "Xvesa" ];then
- Xdialog --title "Xvesa Video Wizard" --msgbox "The Xvesa X server is not currently running.
+ Xdialog --title "$(gettext 'Xvesa Video Wizard')" --msgbox "$(gettext 'The Xvesa X server is not currently running.
 Select the Xorg Video Wizard from the menu
 -- it has the option of switching over to the
-Xvesa server. Click OK button to exit..." 0 0
+Xvesa server. Click OK button to exit...')" 0 0
  exit
 fi
 
 ALLMODES="`Xvesa -listmodes 2>&1 | grep '^0x' | tr ':' ' ' | tr -s ' ' | cut -f 1,2 -d ' ' | sort -g -k 2 | tr ' ' '|' | tr '\n' ' '`"
 
@@ -57,41 +67,41 @@
 "
 done
 
 # icon-name=\"gtk-preferences\"
 export MAIN_DIALOG="
-<window title=\"Xvesa Video Wizard\">
+<window title=\"$(gettext 'Xvesa Video Wizard')\">
 <hbox>
  <vbox>
-  <frame Video modes>
+  <frame $(gettext 'Video modes')>
    ${RADIOSECTION}
   </frame>
  </vbox>
  <vbox>
   <text>
     <label>\" \"</label>
   </text>
   <text>
-    <label>Welcome to the Xvesa Video Wizard!</label>
+    <label>$(gettext 'Welcome to the Xvesa Video Wizard!')</label>
+  </text>
+  <text>
+    <label>`eval_gettext \"The current video mode is \\\${CURRENTVALS}. If you want something else, make a choice on the left then click the 'CHANGE' button. If you are happy with the current screen resolution, click the 'OKAY' button.\"`</label>
   </text>
   <text>
-    <label>The current video mode is ${CURRENTVALS}. If you want something else, make a choice on the left then click the 'CHANGE' button. If you are happy with the current screen resolution, click the 'OKAY' button.</label>
+    <label>$(gettext 'NOTE: x16 is 16-bit color which is 65,536 colors (HighColor), x24 is 24-bit color which is 16 million colors (TrueColor).')</label>
   </text>
   <text>
-    <label>NOTE: x16 is 16-bit color which is 65,536 colors (HighColor), x24 is 24-bit color which is 16 million colors (TrueColor).</label>
-  </text>
-  <text>
-    <label>IMPORTANT: if a mode does not work, press CTRL-ALT-BACKSPACE (hold down CTRL and ALT keys and tap BACKSPACE key). Please remember this key combination. It is the standard Linux technique for emergency shutdown of the X graphics server.</label>
+    <label>$(gettext 'IMPORTANT: if a mode does not work, press CTRL-ALT-BACKSPACE (hold down CTRL and ALT keys and tap BACKSPACE key). Please remember this key combination. It is the standard Linux technique for emergency shutdown of the X graphics server.')</label>
   </text>
   <text>
     <label>\" \"</label>
   </text>
 
   <hbox>
    <vbox>
     <text>
-     <label>For the experts, X server startup options:</label>
+     <label>$(gettext 'For the experts, X server startup options:')</label>
     </text>
     <entry>
      <default>\"${CURRENTXOPTIONS}\"</default>
      <variable>ENTRY</variable>
     </entry>
@@ -100,15 +110,15 @@
     <label>\"    \"</label>
    </text>
 
 
     <button>
-      <label>CHANGE</label>
+      <label>$(gettext 'CHANGE')</label>
       <action type=\"exit\">TESTBUTTON</action>
     </button>
     <button>
-      <label>OKAY</label>
+      <label>$(gettext 'OKAY')</label>
       <action type=\"exit\">OKAYBUTTON</action>
     </button>
 
 
   </hbox>

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

@@ -1,18 +1,28 @@
 #!/bin/sh
 #2007 Lesser GPL licence v2 (http://www.fsf.org/licensing/licenses/lgpl.html)
+#120202 rodin.s: internationalized.
+
+export TEXTDOMAIN=wakepup2
+export TEXTDOMAINDIR=/usr/share/locale
+export OUTPUT_CHARSET=UTF-8
+eval_gettext () {
+  local myMESSAGE=$(gettext "$1")
+  eval echo \"$myMESSAGE\"
+}
+export LANGORG=$LANG
 
 export DLGBOX="
 <window title=\"WakePup2\">
  <vbox>
- <text><label>Welcome! This little program will create a boot floppy disk, for booting puppy. WakePup2 is a floppy disk that will search for Puppy on USB, CD/DVD or hard drive and if found will boot puppy. A limitation is that Puppy must be installed in a FAT or NTFS partition on the USB or hard drive.</label></text>
- <text><label>Why use WakePup2? The most common reason is you have used the Puppy Universal Installer (see 'Setup' menu) to install Puppy to a USB Flash 'key' drive, but the PC refuses to boot from it. Or, you have a PC that has a CD drive but refuses to boot from it. This is a solution for such cantankerous PCs, but of course is not applicable if you have a modern sans-floppy-drive PC.</label></text>
- <text><label>Note, if you need to boot Puppy installed in a Linux partition (ext2, ext3, reiserfs, or minix), it is possible to create a GRUB boot floppy and this can be done when the 'Puppy Universal Installer' (in 'Setup' menu) is executed, or by selecting 'GRUB bootloader config' from the 'Control Panel' menu.</label></text>
+ <text><label>$(gettext 'Welcome! This little program will create a boot floppy disk, for booting puppy. WakePup2 is a floppy disk that will search for Puppy on USB, CD/DVD or hard drive and if found will boot puppy. A limitation is that Puppy must be installed in a FAT or NTFS partition on the USB or hard drive.')</label></text>
+ <text><label>`gettext \"Why use WakePup2? The most common reason is you have used the Puppy Universal Installer (see 'Setup' menu) to install Puppy to a USB Flash 'key' drive, but the PC refuses to boot from it. Or, you have a PC that has a CD drive but refuses to boot from it. This is a solution for such cantankerous PCs, but of course is not applicable if you have a modern sans-floppy-drive PC.\"`</label></text>
+ <text><label>`gettext \"Note, if you need to boot Puppy installed in a Linux partition (ext2, ext3, reiserfs, or minix), it is possible to create a GRUB boot floppy and this can be done when the 'Puppy Universal Installer' (in 'Setup' menu) is executed, or by selecting 'GRUB bootloader config' from the 'Control Panel' menu.\"`</label></text>
  <text><label>\"  \"</label></text>
- <text><label>WAKEPUP2 CURRENTLY NOT AVAILABLE</label></text>
- <text><label>You need to first install the WakePup2 PET package -- just click the 'install' button on the desktop (Internet access required). Note, the WakePup developer guys have come up with different WakePup's that may perform better on certain hardware -- see the main Puppy Forum</label></text>
- <text><label>CLICK 'Cancel' button for now, then install WakePup2...</label></text>
+ <text><label>$(gettext 'WAKEPUP2 CURRENTLY NOT AVAILABLE')</label></text>
+ <text><label>`gettext \"You need to first install the WakePup2 PET package -- just click the 'install' button on the desktop (Internet access required). Note, the WakePup developer guys have come up with different WakePup's that may perform better on certain hardware -- see the main Puppy Forum\"`</label></text>
+ <text><label>`gettext \"CLICK 'Cancel' button for now, then install WakePup2...\"`</label></text>
  <hbox>
   <button cancel></button>
  </hbox>
  </vbox>
 </window>

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

@@ -2,10 +2,14 @@
 #Barry Kauler www.puppylinux.com
 #2007 Lesser GPL licence v2 (http://www.fsf.org/licensing/licenses/lgpl.html)
 #v411 modified network-connect button.
 #100215 fix exit button.
 #101019 added video upgrade wizard.
+#120202 BK: internationalized.
+
+export TEXTDOMAIN=wizardwizard
+export OUTPUT_CHARSET=UTF-8
 
 #    <action>/usr/sbin/printerwizard.sh &</action>
 #    <action>/usr/sbin/modem-wizard &</action>
 
 #  <hbox>
@@ -15,101 +19,101 @@
 #  </hbox>
 
 #    <action>exit</action>
 
 export WizardWizard="
-<window title=\"Puppy Setup\" icon-name=\"gtk-preferences\">
+<window title=\"$(gettext 'Puppy Setup')\" icon-name=\"gtk-preferences\">
  <vbox>
 
   <hbox>
    <text>
-    <label>Configure Puppy for your country...</label>
+    <label>$(gettext 'Configure Puppy for your country:')</label>
    </text>
    <button>
     <input file>/usr/local/lib/X11/mini-icons/mini-font.xpm</input>
     <action>/usr/sbin/countrywizard &</action>
    </button>
   </hbox>
 
   <hbox>
    <text>
-    <label>Configure startup of Puppy...</label>
+    <label>$(gettext 'Configure startup of Puppy:')</label>
    </text>
    <button>
     <input file>/usr/local/lib/X11/mini-icons/module16.xpm</input>
     <action>/usr/sbin/bootmanager &</action>
    </button>
   </hbox>
 
   <hbox>
    <text>
-    <label>Change the mouse and keyboard...</label>
+    <label>$(gettext 'Change the mouse and keyboard:')</label>
    </text>
    <button>
     <input file>/usr/local/lib/X11/mini-icons/Mouse.xpm</input>
     <action>/usr/sbin/input-wizard &</action>
    </button>
   </hbox>
   <hbox>
    <text>
-    <label>Setup ALSA sound...</label>
+    <label>$(gettext 'Setup ALSA sound:')</label>
    </text>
    <button>
     <input file>/usr/local/lib/X11/mini-icons/mini-speaker.xpm</input>
     <action>/usr/sbin/alsawizard &</action>
    </button>
   </hbox>
   <hbox>
    <text>
-    <label>Setup the X video...</label>
+    <label>$(gettext 'Setup the X video:')</label>
    </text>
    <button>
     <input file>/usr/local/lib/X11/mini-icons/mini-x.xpm</input>
     <action>/usr/sbin/xserverwizard &</action>
    </button>
   </hbox>
 
   <hbox>
    <text>
-    <label>Upgrade X drivers...</label>
+    <label>$(gettext 'Upgrade X drivers:')</label>
    </text>
    <button>
     <input file>/usr/local/lib/X11/mini-icons/x16.xpm</input>
     <action>/usr/sbin/video_upgrade_wizard & </action>
    </button>
   </hbox>
 
   <hbox>
    <text>
-    <label>Connect to Internet or Intranet...</label>
+    <label>$(gettext 'Connect to Internet or Intranet:')</label>
    </text>
    <button>
     <input file>/usr/local/lib/X11/mini-icons/pc2www.xpm</input>
     <action>/usr/sbin/connectwizard yes &</action>
    </button>
   </hbox>
   <hbox>
    <text>
-    <label>Setup CUPS printing...</label>
+    <label>$(gettext 'Setup CUPS printing:')</label>
    </text>
    <button>
     <input file>/usr/local/lib/X11/mini-icons/tb_print.xpm</input>
     <action>/usr/sbin/cups_shell &</action>
    </button>
   </hbox>
   <hbox>
    <text>
-    <label>Setup CD and DVD reader and burner drives...</label>
+    <label>$(gettext 'Setup CD and DVD reader and burner drives:')</label>
    </text>
    <button>
     <input file>/usr/local/lib/X11/mini-icons/mini-cd.xpm</input>
     <action>/usr/sbin/cdburner-wizard &</action>
    </button>
   </hbox>
   <hbox>
    <text>
-    <label>Setup a firewall...</label>
+    <label>$(gettext 'Setup a firewall:')</label>
    </text>
    <button>
     <input file>/usr/local/lib/X11/mini-icons/mini-firewall.xpm</input>
     <action>rxvt -e /usr/sbin/firewallinstallshell &</action>
    </button>

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

@@ -1,9 +1,18 @@
 #!/bin/sh
 #Barry Kauler 2009
 #Called from Xorg Wizard, via xinit, testing a video mode.
 #091124 bug fixes, vert and horiz freqs did not display for vesa driver.
+#120202 rodin.s: internationalized.
+
+export TEXTDOMAIN=xinitrc_test
+export TEXTDOMAINDIR=/usr/share/locale
+export OUTPUT_CHARSET=UTF-8
+. gettext.sh
+export LANGORG=$LANG
+
+LANG=C # i18n
 
 set -- `xvidtune -show` #'-display :0' not needed.
 CLOCKHZ=`dc $2 1000000 \* p`
 CLOCKHZINT=`echo -n "$CLOCKHZ" | cut -f 1 -d '.'`
 if [ $CLOCKHZINT -ne 0 ];then
@@ -40,23 +49,23 @@
 
 echo "XTEST=$XTEST
 YTEST=$YTEST
 VRTEST=$VRTEST
 HSTEST=$HSTEST" > /tmp/xorgwizard_initrc_test_results #read by xorgwizard.
-
+LANG=$LANGORG # i18n
 xmessage -font "8x16" -center -timeout 60 -buttons "OK:10" -default OK "
-Puppy Xorg Video Wizard: testing X
+`eval_gettext \"Puppy Xorg Video Wizard: testing X
 
 
 If you can see this, then X is working!
 
-Current resolution:         ${XTEST}x${YTEST} pixels
-Horizontal sync frequency:  $HSTEST KHz
-Vertical refresh frequency: $VRTEST Hz (times per second)
+Current resolution:         \\\${XTEST}x\\\${YTEST} pixels
+Horizontal sync frequency:  \\\$HSTEST KHz
+Vertical refresh frequency: \\\$VRTEST Hz (times per second)
 
 Please click the 'OK' button, or if your mouse isn't working,
 just hit the ENTER key, or the combination CTRL-ALT-BACKSPACE.
 
-If you don't do anything, this test will timeout in 60 seconds."
+If you don't do anything, this test will timeout in 60 seconds.\"`"
 
 #when xmessage terminates, xinit should kill Xorg.
 ###END###

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

@@ -1,20 +1,25 @@
 #!/bin/sh
 #Barry Kauler 2005 www.puppylinux.com
 #2007 Lesser GPL licence v2 (http://www.fsf.org/licensing/licenses/lgpl.html)
 #w019 apr2009: updated for woof.
 #100215 fixes.
+#110807 changed to gtkdialog3.
 #111019 screen out Xdialog.
+#120203 BK: internationalized.
+
+export TEXTDOMAIN=xserverwizard
+export OUTPUT_CHARSET=UTF-8
 
 VIDEOINFO="`cat /proc/pci | grep "VGA" | cut -f 2-4 -d ':'`"
 WHATXS="`ls -1 /usr/bin/X?* | grep -v 'Xdialog' | sed -e 's/\/usr\/bin\///g' | tr "\n" " "`"
 CURRENTX="`readlink /usr/bin/X`"
 
 XVESATXT=""
 if [ -e /usr/bin/Xvesa ];then
  XVESATXT="    <hbox>
-     <text><label>Xvesa Kdrive server. This has been in most live-CDs, and works on the widest range of video hardware. The single biggest disadvantage is that the screen refresh frequency cannot be changed (which does not matter for LCD monitors, it is only a problem for CRT monitors where low frequency causes noticeable flicker). Click button to run the Xvesa video Wizard:</label></text>
+     <text><label>$(gettext 'Xvesa Kdrive server. This has been in most live-CDs, and works on the widest range of video hardware. The single biggest disadvantage is that the screen refresh frequency cannot be changed (which does not matter for LCD monitors, it is only a problem for CRT monitors where low frequency causes noticeable flicker). Click button to run the Xvesa video Wizard:')</label></text>
      <vbox><button>
       <input file>/usr/local/lib/X11/pixmaps/x24.png</input>
       <action>video-wizard & </action>
       <action type=\"exit\">exited xserver wizard</action>
      </button></vbox>
@@ -21,28 +26,28 @@
     </hbox>
 "
 fi
 
 export MAINDIALOG="
-<window title=\"Puppy X server chooser Wizard\" icon-name=\"gtk-preferences\">
+<window title=\"$(gettext 'Puppy X server chooser Wizard')\" icon-name=\"gtk-preferences\">
   <hbox>
   <vbox>
    <text><label>\"
-These X servers are currently installed:
+$(gettext 'These X servers are currently installed:')
 $WHATXS
 
-The currently running X server is:
+$(gettext 'The currently running X server is:')
 $CURRENTX\"</label></text>
   </vbox>
 
   <vbox>
-   <frame X server Wizards>
+   <frame $(gettext 'X server Wizards')>
 
     ${XVESATXT}
 
     <hbox>
-     <text><label>Xorg X server. This is the big fella, large, sophisticated, accelerated rendering, Xinerama, supports many input devices. Click button to run the Xorg Video Wizard:</label></text>
+     <text><label>$(gettext 'Xorg X server. This is the big fella, large, sophisticated, accelerated rendering, Xinerama, supports many input devices. Click button to run the Xorg Video Wizard:')</label></text>
      <vbox><button>
       <input file>/usr/local/lib/X11/pixmaps/x24.png</input>
       <action>xorgwizard & </action>
       <action type=\"exit\">exited xserver wizard</action>
      </button></vbox>
@@ -55,98 +60,6 @@
 "
 
 #echo "$MAINDIALOG" | gtkdialog2 --stdin
 gtkdialog3 --program=MAINDIALOG
 
-exit
-###early stuff below####
-
-MSGXFBDEV="Click button for info how to install Xfbdev server."
-if [ -f /usr/X11R7/bin/Xfbdev ];then
- ACTIONXFBDEV="framebufferwizard"
-else
- echo "The Xfbdev Kdrive X server is available as a PupGet package.
-You need to install two packages, \"xfbdev\" and \"modules_fb\".
-(some live-CD builds may have modules_fb already installed, in which
- case PupGet manager will not offer it as an installation choice)
-Go to the menu: Start -> Setup -> PupGet package manager
-and install them, then immediately reboot Puppy." > /tmp/servermsg.txt
- ACTIONXFBDEV="xmessage -center -title xfbdev -file /tmp/servermsg.txt"
-fi
-
-CURRENTX="`readlink /usr/X11R7/bin/X`"
-case $CURRENTX in
- Xfbdev)
-  MSGXFBDEV="Click button to run the Framebuffer Wizard:"
-  ACTIONXFBDEV="framebufferwizard"
-  ;;
- *)
-  ;;
-esac
-
-
-MAINDIALOG="
- <window title=\"Puppy X server chooser Wizard\">
-  <hbox>
-  <vbox>
-   <text><label>\"Your PC has this video hardware:
-$VIDEOINFO\"</label></text>
-
-   <text><label>Puppy has a variety of X servers to choose from. The live-CD has the Xvesa Kdrive server and/or the Xorg, and custom builds may also have the Xfbdev or Xi810 Kdrive servers. The Kdrive servers are a simplified and smaller server. If one of these is not in the live-CD, it can be downloaded and installed as a PupGet package.</label></text>
-   <text><label>There are also full X servers to choose from, both as PupGet or DotPup packages. To install many of these, it is wise to read about them on the Wiki or Forum first.</label></text>
-   <text><label>The buttons on the right tell you more about some of the servers, with instructions to install where appropriate. Note that the current running server is $CURRENTX</label></text>
-   <text><label>---o0o---</label></text>
-   <text><label>WORK IN PROGRESS: We are currently developing the /usr/sbin/framebufferwizard script. When installed, the framebuffer modules are at /lib/modules/`uname -r`/video, but they are not fully supported by the script. You are welcome to work on the script. Some framebuffer docs are at /usr/share/doc/framebuffer (when modules_fb is installed)</label></text>
-
-  </vbox>
-
-  <vbox>
-   <frame X server Wizards>
-    <hbox>
-     <text><label>Xvesa Kdrive server. This has been in all live-CDs, and works on the widest range of video hardware. The single biggest disadvantage is that the screen refresh frequency cannot be changed. Click button to run the Xvesa video Wizard:</label></text>
-     <button>
-      <input file>/usr/local/lib/X11/pixmaps/x.xpm</input>
-      <action>video-wizard</action>
-     </button>
-    </hbox>
-
-    <hbox>
-     <text><label>The Xfbdev Kdrive server uses kernel framebuffer modules. Performance may be inferior to Xvesa but some of the modules allow adjustment of refresh frequency. $MSGXFBDEV</label></text>
-     <button>
-      <input file>/usr/local/lib/X11/pixmaps/x.xpm</input>
-      <action>$ACTIONXFBDEV</action>
-     </button>
-    </hbox>
-
-    <hbox>
-     <text><label>There is a compact full X server for older video hardware, pre year 2000, named XF86_SVGA (XFree version 3.3.6). Note, it may work on recent video hardware that is backwards-compatible. Click the button for further information:</label></text>
-     <button>
-      <input file>/usr/local/lib/X11/pixmaps/x.xpm</input>
-      <action>exec xf86svga336wizard</action>
-     </button>
-    </hbox>
-
-    <hbox>
-     <text><label>Xorg full X servers are available as DotPup packages. These are large, which is why one of them is not in the live-CD. However, you can certainly install one. Click the button for further information on the Puppy Forum:</label></text>
-     <button>
-      <input file>/usr/local/lib/X11/pixmaps/x.xpm</input>
-      <action>defaultbrowser http://www.murga.org/%7Epuppy/viewtopic.php?t=672</action>
-     </button>
-    </hbox>
-
-   </frame>
-  </vbox>
-  </hbox>
- </window>
-"
-
-#  <hbox>
-#   <text><label>The currently running server is $CURRENTX. Click to change:</label></text>
-#   <button>
-#    <label>Change X</label>
-#    <action>xmessage -center -title Change_X -buttons $XBUTTONS -file /tmp/changex.txt</action>
-#   </button>
-#  </hbox>
-
-#echo "$MAINDIALOG" | gtkdialog2 --stdin
-echo "$MAINDIALOG" | gtkdialog3 --stdin #110807
-
+###END###