More PPM internationalisation improvements

woof-code/rootfs-skeleton/usr/lib/gtkdialog/box_help

@@ -14,6 +14,7 @@
 #GPL
 
 export TEXTDOMAIN=libstardust
+export OUTPUT_CHARSET=UTF-8
 
 ICON=help.svg
 ICON_WM=gtk-help

woof-code/rootfs-skeleton/usr/lib/gtkdialog/box_ok

@@ -14,6 +14,7 @@
 #GPL
 
 export TEXTDOMAIN=libstardust
+export OUTPUT_CHARSET=UTF-8
 
 HEADING="$1"
 

woof-code/rootfs-skeleton/usr/lib/gtkdialog/box_yesno

@@ -13,6 +13,7 @@
 #GPL
 
 export TEXTDOMAIN=libstardust
+export OUTPUT_CHARSET=UTF-8
 
 HEADING="$1"
 

woof-code/rootfs-skeleton/usr/local/petget/downloadpkgs.sh

@@ -191,7 +191,7 @@ do
   yaf-splash -bg '#FFD600' -close never -fontsize large -text "$(gettext 'Please wait, testing that packages exist in repository...')" &
   testPID=$!
  else
-  echo "Testing that packages exist in repository" > /tmp/petget/install_status
+  echo "$(gettext 'Testing that packages exist in repository')" > /tmp/petget/install_status
  fi
  DL_BAD_LIST=''
  for ONEFILE in `cat $ONELIST | cut -f 7,8,13 -d '|'` #path|fullfilename|repo-id

woof-code/rootfs-skeleton/usr/local/petget/installmodes.sh

@@ -156,7 +156,7 @@ $(gettext 'These needed libraries exist but are not in the library search path (
         <eventbox name="bg_report" space-expand="true" space-fill="true">
           <vbox margin="5" hscrollbar-policy="2" vscrollbar-policy="2" space-expand="true" space-fill="true">
             '"`/usr/lib/gtkdialog/xml_pixmap building_block.svg 32`"'
-            <text angle="90" wrap="false" yalign="0" use-markup="true" space-expand="true" space-fill="true"><label>"<big><b><span color='"'#bbb'"'>Libs</span></b></big> "</label></text>
+            <text angle="90" wrap="false" yalign="0" use-markup="true" space-expand="true" space-fill="true"><label>"<big><b><span color='"'#bbb'"'>'$(gettext 'Libs')'</span></b></big> "</label></text>
           </vbox>
         </eventbox>
       </hbox>
@@ -353,15 +353,15 @@ install_package () {
      if [ "$(cat /var/local/petget/nt_category 2>/dev/null)" = "true" ]; then
      /usr/local/petget/installpreview.sh
      else
-	  rxvt -title "$VTTITLE... Do NOT close" \
+	  rxvt -title "$VTTITLE... $(gettext 'Do NOT close')" \
 	  -fn -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-* -bg black \
       -fg grey -geometry 80x5+50+50 -e /usr/local/petget/installpreview.sh
      fi
     else
      if [ "$(cat /var/local/petget/nt_category 2>/dev/null)" = "true" ]; then
      /usr/local/petget/installpreview.sh
      else
-	  rxvt -title "$VTTITLE... Do NOT close" \
+	  rxvt -title "$VTTITLE... $(gettext 'Do NOT close')" \
 	  -fn -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-* -bg black \
       -fg grey -geometry 80x5+50+50 -e /usr/local/petget/installpreview.sh
      fi

woof-code/rootfs-skeleton/usr/local/petget/installpkg.sh

@@ -201,7 +201,7 @@ elif [ $PUPMODE -eq 3 -o $PUPMODE -eq 7 -o $PUPMODE -eq 13 ];then
 fi
 
 if [ $DISPLAY -a ! -f /tmp/install_quietly ];then #131222
- /usr/lib/gtkdialog/box_splash -close never -fontsize large -text "$(gettext 'Please wait, processing...')" &
+ . /usr/lib/gtkdialog/box_splash -close never -fontsize large -text "$(gettext 'Please wait, processing...')" &
  YAFPID1=$!
  trap 'pupkill $YAFPID1' EXIT #140318
 fi

woof-code/rootfs-skeleton/usr/local/petget/petget

@@ -257,7 +257,7 @@ rm -f $PKGPATH/${PKGNAME}.tar.gz 2>/dev/null
 if [ $RETVAL -ne 0 -o ! -s /tmp/petget-installed-pkgs-log ];then
  ISTHERE="$(grep ${FULLPKGNAME} /root/.packages/user-installed-packages)"
  if [ "$DISPLAY" ]; then
-  [ "$ISTHERE" = "" ] && /usr/lib/gtkdialog/box_ok "$(gettext 'Puppy Package Manager')" error "<b>${FULLPKGNAME} $(gettext 'failed to install')</b>"
+  [ "$ISTHERE" = "" ] && . /usr/lib/gtkdialog/box_ok "$(gettext 'Puppy Package Manager')" error "<b>${FULLPKGNAME} $(gettext 'failed to install')</b>"
   exit
  else
   [ "$ISTHERE" = "" ] && dialog --msgbox "$FULLPKGNAME $(gettext ' failed to install') " 0 0
@@ -320,7 +320,7 @@ fi
 
 #installpkg.sh will have logged to /tmp/petget-installed-pkgs-log
 if [ "$DISPLAY" ]; then
- /usr/lib/gtkdialog/box_ok "$(gettext 'Puppy Package Manager')" complete "$(gettext 'The following package has been successfully installed:')" "<b>${ZINSTALLEDMSG}</b>" "${MENUMSG}"
+ . /usr/lib/gtkdialog/box_ok "$(gettext 'Puppy Package Manager')" complete "$(gettext 'The following package has been successfully installed:')" "<b>${ZINSTALLEDMSG}</b>" "${MENUMSG}"
 else
   dialog --msgbox "$(gettext 'The following package has been successfully installed:') ${ZINSTALLEDMSG} ${MENUMSG}" 0 0
 fi
@@ -334,7 +334,7 @@ if [ "`pidof jwm`" != "" ];then #120101
 fi
 [ "$INSTALLEDCAT" = "none" ] && RESTARTMSG="$(gettext 'Please wait, updating help page...')"
 if [ "$DISPLAY"  ]; then
- /usr/lib/gtkdialog/box_splash -text "${RESTARTMSG}" &
+ . /usr/lib/gtkdialog/box_splash -text "${RESTARTMSG}" &
  X3PID=$!
 else
  dialog --timeout 3 --msgbox "$(gettext 'Done. Updating menus and help pages')" 0 0

woof-code/rootfs-skeleton/usr/local/petget/removemodes.sh

@@ -96,7 +96,7 @@ EOF
          <eventbox name="bg_report" space-expand="true" space-fill="true">
            <vbox margin="5" hscrollbar-policy="2" vscrollbar-policy="2" space-expand="true" space-fill="true">
              '"`/usr/lib/gtkdialog/xml_pixmap building_block.svg 32`"'
-             <text angle="90" wrap="false" yalign="0" use-markup="true" space-expand="true" space-fill="true"><label>"<big><b><span color='"'#bbb'"'>Depends</span></b></big> "</label></text>
+             <text angle="90" wrap="false" yalign="0" use-markup="true" space-expand="true" space-fill="true"><label>"<big><b><span color='"'#bbb'"'>'$(gettext 'Depends')'</span></b></big> "</label></text>
            </vbox>
          </eventbox>
        </hbox>