Check-in [c1dfc7bd5b]
Not logged in

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

Overview

SHA1 Hash:c1dfc7bd5b32efe8bd29893292d5ed88d384793f
Date: 2012-03-24 00:52:14
User: BarryK
Comment:syntax error in internationalization of sns (Simple Network Setup)

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/usr/local/simple_network_setup/sns

@@ -23,10 +23,11 @@
 #110505 support sudo for non-root user.
 #120107 gtkdialog3 to gtkdialog4, new 'Profile' frame in main window, new profiles help window.
 #120204 rodin.s: internationalized.
 #120222 small change to 'connect now' button.
 #120323 replace remaining 'xmessage' with 'pupmessage'.
+#120324 fix syntax error gettext.
 
 export TEXTDOMAIN=sns___sns
 export OUTPUT_CHARSET=UTF-8
 . gettext.sh
 
@@ -792,13 +793,13 @@
 
  if [ "$MODTIME2" != "$MODTIME1" ];then
   export WIN5_DLG="<window title=\"$(gettext 'Simple Network Setup')\" icon-name=\"gtk-network\">
  <vbox>
   <pixmap><input file>/usr/local/lib/X11/pixmaps/ok.xpm</input></pixmap>
-  <text><label>$(gettext 'Successful connection to wired network') '${INTERFACE}'!</label></text>
+  <text><label>$(gettext 'Successful connection to wired network'): '${INTERFACE}'!</label></text>
   <text><label>$(gettext 'Your Internet should now be working!')</label></text>
-  <text><label>`gettext \"Recommend leave this checkbox ticked, so that Puppy will use SNS to automatically connect to the Internet at bootup. Also clicking the 'connect' icon on the desktop will immediately launch SNS...\"</label></text>
+  <text><label>$(gettext "Recommend leave this checkbox ticked, so that Puppy will use SNS to automatically connect to the Internet at bootup. Also clicking the 'connect' icon on the desktop will immediately launch SNS...")</label></text>
   <checkbox><label>$(gettext 'Set SNS as default network setup tool')</label><default>true</default><variable>CHK_SNSDEF</variable></checkbox>
   <hbox><button ok></button></hbox>
  </vbox>
 </window>"
   RETSTR5="`${GTKDIALOGEXE} --program=WIN5_DLG --center`"
@@ -819,11 +820,11 @@
   ip route flush dev $INTERFACE #100703
   export WIN6_DLG="<window title=\"$(gettext 'Simple Network Setup')\" icon-name=\"gtk-network\">
  <vbox>
   <pixmap><input file>/usr/local/lib/X11/pixmaps/error.xpm</input></pixmap>
   <text><label>$(gettext 'Failed to connect to wired network') '${INTERFACE}'</label></text>
-  <text><label>`gettext \"The network does exist, however failed to negotiate with the DHCP server. Is there a wireless interface? -- maybe try that. Click 'GO BACK TO MAIN WINDOW' button to try again...\"`</label></text>
+  <text><label>$(gettext "The network does exist, however failed to negotiate with the DHCP server. Is there a wireless interface? -- maybe try that. Click 'GO BACK TO MAIN WINDOW' button to try again...")</label></text>
   <text><label>\"  \"</label></text>
   <hbox>
    <text><label>$(gettext 'View log of attempted connection:')</label></text>
    <button><label>$(gettext 'LOG')</label><action>defaulttextviewer /tmp/sns_wired_log & </action></button>
   </hbox>