[Tux4kids-commits] r1012 - in tuxmath/trunk: . data/images/icons nsis po src

David Bruce dbruce-guest at alioth.debian.org
Sat Jun 6 21:14:24 UTC 2009


Author: dbruce-guest
Date: 2009-06-06 21:14:24 +0000 (Sat, 06 Jun 2009)
New Revision: 1012

Added:
   tuxmath/trunk/data/images/icons/tuxmath.hqx
   tuxmath/trunk/data/images/icons/tuxmath.png
   tuxmath/trunk/data/images/icons/tuxmath.xpm
Modified:
   tuxmath/trunk/config.guess
   tuxmath/trunk/config.sub
   tuxmath/trunk/configure.ac
   tuxmath/trunk/data/images/icons/icon.png
   tuxmath/trunk/data/images/icons/icon.xpm
   tuxmath/trunk/data/images/icons/tuxmath.ico
   tuxmath/trunk/nsis/tuxmath.nsi
   tuxmath/trunk/nsis/tuxmath_with_conf.nsi
   tuxmath/trunk/po/Makefile.in.in
   tuxmath/trunk/po/nn.gmo
   tuxmath/trunk/po/nn.po
   tuxmath/trunk/src/game.c
   tuxmath/trunk/tuxmath.desktop
Log:
updated icons, desktop file; also some generated autotools stuff that probably shouldn't be in svn



Modified: tuxmath/trunk/config.guess
===================================================================
--- tuxmath/trunk/config.guess	2009-06-06 21:05:50 UTC (rev 1011)
+++ tuxmath/trunk/config.guess	2009-06-06 21:14:24 UTC (rev 1012)
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-23'
+timestamp='2009-04-27'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -324,6 +324,9 @@
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
@@ -331,7 +334,20 @@
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -796,7 +812,7 @@
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd)
+	    EM64T | authenticamd | genuineintel)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -935,6 +951,9 @@
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -985,9 +1004,6 @@
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
@@ -1102,8 +1118,11 @@
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1141,6 +1160,16 @@
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1216,6 +1245,9 @@
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1324,6 +1356,9 @@
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2

Modified: tuxmath/trunk/config.sub
===================================================================
--- tuxmath/trunk/config.sub	2009-06-06 21:05:50 UTC (rev 1011)
+++ tuxmath/trunk/config.sub	2009-06-06 21:14:24 UTC (rev 1012)
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-16'
+timestamp='2009-04-17'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -122,6 +122,7 @@
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -249,13 +250,16 @@
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
 	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -268,6 +272,7 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
 	| mt \
 	| msp430 \
 	| nios | nios2 \
@@ -277,7 +282,7 @@
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -286,7 +291,7 @@
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -329,14 +334,17 @@
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
 	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -358,20 +366,20 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
@@ -439,6 +447,10 @@
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -459,6 +471,10 @@
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -526,6 +542,10 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -1128,6 +1148,10 @@
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1166,7 +1190,7 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1238,8 +1262,9 @@
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1248,7 +1273,7 @@
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1388,6 +1413,9 @@
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
 	-none)
 		;;
 	*)

Modified: tuxmath/trunk/configure.ac
===================================================================
--- tuxmath/trunk/configure.ac	2009-06-06 21:05:50 UTC (rev 1011)
+++ tuxmath/trunk/configure.ac	2009-06-06 21:14:24 UTC (rev 1012)
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([Tux Of Math Command],[1.7.2],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
+AC_INIT([Tux Of Math Command],[1.7.3],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
 AC_CONFIG_SRCDIR([src/tuxmath.c])
 
 AC_PREREQ(2.61)

Modified: tuxmath/trunk/data/images/icons/icon.png
===================================================================
(Binary files differ)

Modified: tuxmath/trunk/data/images/icons/icon.xpm
===================================================================
--- tuxmath/trunk/data/images/icons/icon.xpm	2009-06-06 21:05:50 UTC (rev 1011)
+++ tuxmath/trunk/data/images/icons/icon.xpm	2009-06-06 21:14:24 UTC (rev 1012)
@@ -1,372 +1,294 @@
 /* XPM */
-static char * icon_xpm[] = {
-"32 32 337 2",
+static char * tuxmath_xpm[] = {
+"32 32 259 2",
 "  	c None",
-". 	c #020202",
-"+ 	c #020504",
-"@ 	c #020B0A",
-"# 	c #021915",
-"$ 	c #020F0D",
-"% 	c #024C46",
-"& 	c #023632",
-"* 	c #02342D",
-"= 	c #023931",
-"- 	c #021C18",
-"; 	c #021815",
-"> 	c #022723",
-", 	c #02CBBE",
-"' 	c #028078",
-") 	c #011211",
-"! 	c #010101",
-"~ 	c #022C27",
-"{ 	c #012D26",
-"] 	c #025C4D",
-"^ 	c #025749",
-"/ 	c #022E29",
-"( 	c #02E4D4",
-"_ 	c #027F78",
-": 	c #010C0C",
-"< 	c #02544D",
-"[ 	c #02AC9C",
-"} 	c #013630",
-"| 	c #02322D",
-"1 	c #02E2D1",
-"2 	c #026B63",
-"3 	c #000909",
-"4 	c #020403",
-"5 	c #02786D",
-"6 	c #02A99B",
-"7 	c #012823",
-"8 	c #02544B",
-"9 	c #02E0D2",
-"0 	c #016358",
-"a 	c #000807",
-"b 	c #021E1A",
-"c 	c #022923",
-"d 	c #027670",
-"e 	c #02958C",
-"f 	c #011B18",
-"g 	c #000000",
-"h 	c #023D35",
-"i 	c #025449",
-"j 	c #022D28",
-"k 	c #028D87",
-"l 	c #02D3D3",
-"m 	c #01584D",
-"n 	c #000706",
-"o 	c #027163",
-"p 	c #026558",
-"q 	c #025A53",
-"r 	c #028E81",
-"s 	c #01201C",
-"t 	c #02423A",
-"u 	c #02A292",
-"v 	c #02B4B1",
-"w 	c #02CDE1",
-"x 	c #02CDD1",
-"y 	c #015349",
-"z 	c #000605",
-"A 	c #022623",
-"B 	c #02A492",
-"C 	c #026255",
-"D 	c #000B09",
-"E 	c #02211D",
-"F 	c #02544A",
-"G 	c #012621",
-"H 	c #026359",
-"I 	c #02C6CB",
-"J 	c #02CFF7",
-"K 	c #02CFE3",
-"L 	c #02736E",
-"M 	c #021613",
-"N 	c #026058",
-"O 	c #029689",
-"P 	c #01322C",
-"Q 	c #02221D",
-"R 	c #02413B",
-"S 	c #02302B",
-"T 	c #021715",
-"U 	c #02433B",
-"V 	c #02B8B6",
-"W 	c #02CDF6",
-"X 	c #02C2F9",
-"Y 	c #02B7C8",
-"Z 	c #028985",
-"` 	c #028B85",
-" .	c #02BBB5",
-"..	c #026F65",
-"+.	c #010C0A",
-"@.	c #020A09",
-"#.	c #024740",
-"$.	c #029B8E",
-"%.	c #029F97",
-"&.	c #02AAA0",
-"*.	c #02D0D9",
-"=.	c #02C4F9",
-"-.	c #02ACFE",
-";.	c #02B8F7",
-">.	c #02C1E9",
-",.	c #02CAE8",
-"'.	c #02BDBF",
-").	c #023833",
-"!.	c #022520",
-"~.	c #01120F",
-"{.	c #020D0B",
-"].	c #029788",
-"^.	c #03CBC5",
-"/.	c #06867A",
-"(.	c #039D97",
-"_.	c #02C8E2",
-":.	c #02AEFE",
-"<.	c #02A8FE",
-"[.	c #02B3FE",
-"}.	c #02CAFB",
-"|.	c #02A9A5",
-"1.	c #023732",
-"2.	c #027668",
-"3.	c #02443B",
-"4.	c #010D0B",
-"5.	c #027E72",
-"6.	c #029185",
-"7.	c #0CA89E",
-"8.	c #3A443C",
-"9.	c #1E685F",
-"0.	c #02BCC4",
-"a.	c #02BBFD",
-"b.	c #02B5FD",
-"c.	c #02C1F5",
-"d.	c #02CBF0",
-"e.	c #02C9D2",
-"f.	c #02AEAD",
-"g.	c #02D4D4",
-"h.	c #026A5F",
-"i.	c #010B0A",
-"j.	c #023C34",
-"k.	c #02A99E",
-"l.	c #02CFC5",
-"m.	c #02D1C4",
-"n.	c #03D6C9",
-"o.	c #07BDB0",
-"p.	c #04C4CD",
-"q.	c #02C6EF",
-"r.	c #02B6FE",
-"s.	c #02A5A9",
-"t.	c #028583",
-"u.	c #02C0C9",
-"v.	c #02CCEC",
-"w.	c #02D4E5",
-"x.	c #02534E",
-"y.	c #010605",
-"z.	c #029D8F",
-"A.	c #02E3D9",
-"B.	c #02E2DB",
-"C.	c #02E4D6",
-"D.	c #02E1E2",
-"E.	c #02CBF8",
-"F.	c #02B4FE",
-"G.	c #02BDFD",
-"H.	c #02C0D3",
-"I.	c #18544D",
-"J.	c #2F1D19",
-"K.	c #029593",
-"L.	c #02CDEF",
-"M.	c #02CAD4",
-"N.	c #022F2C",
-"O.	c #02867C",
-"P.	c #02C9F8",
-"Q.	c #02C8F7",
-"R.	c #02C4F8",
-"S.	c #02A9FD",
-"T.	c #029BFE",
-"U.	c #02B6FD",
-"V.	c #02C7DF",
-"W.	c #0F7A70",
-"X.	c #1F473E",
-"Y.	c #02BABC",
-"Z.	c #02DBF2",
-"`.	c #02A5A0",
-" +	c #021916",
-".+	c #024844",
-"++	c #02ACBD",
-"@+	c #02C3FA",
-"#+	c #02AFFE",
-"$+	c #02A1FE",
-"%+	c #028AFE",
-"&+	c #0284FE",
-"*+	c #029CFE",
-"=+	c #02B9FB",
-"-+	c #02C8E1",
-";+	c #02C2CA",
-">+	c #02D6F3",
-",+	c #02CCD6",
-"'+	c #02615C",
-")+	c #000908",
-"!+	c #02756E",
-"~+	c #02C7D7",
-"{+	c #02BAF5",
-"]+	c #02A5FB",
-"^+	c #0295FE",
-"/+	c #028EFE",
-"(+	c #0290FE",
-"_+	c #029FFE",
-":+	c #02C2FE",
-"<+	c #02CDF0",
-"[+	c #028F8C",
-"}+	c #011815",
-"|+	c #000101",
-"1+	c #022421",
-"2+	c #025653",
-"3+	c #02B7C3",
-"4+	c #02C9F3",
-"5+	c #02B0FD",
-"6+	c #02B9FD",
-"7+	c #02C7FC",
-"8+	c #02BAC4",
-"9+	c #02413D",
-"0+	c #000404",
-"a+	c #020908",
-"b+	c #024D47",
-"c+	c #029091",
-"d+	c #02C2CD",
-"e+	c #02DBED",
-"f+	c #02DAF6",
-"g+	c #02DBF7",
-"h+	c #02D6EA",
-"i+	c #02B2BB",
-"j+	c #025A57",
-"k+	c #010F0D",
-"l+	c #272727",
-"m+	c #4B4B4B",
-"n+	c #4A4A4A",
-"o+	c #2D2D2D",
-"p+	c #060606",
-"q+	c #020A08",
-"r+	c #02211B",
-"s+	c #023831",
-"t+	c #024E45",
-"u+	c #02453E",
-"v+	c #02302A",
-"w+	c #021713",
-"x+	c #262626",
-"y+	c #515151",
-"z+	c #656565",
-"A+	c #4C4C4C",
-"B+	c #1B1B1B",
-"C+	c #040404",
-"D+	c #686868",
-"E+	c #C7C7C7",
-"F+	c #DEDEDE",
-"G+	c #868686",
-"H+	c #131313",
-"I+	c #161717",
-"J+	c #101312",
-"K+	c #030504",
-"L+	c #373737",
-"M+	c #ABABAB",
-"N+	c #DADADA",
-"O+	c #D3D3D3",
-"P+	c #D6D6D6",
-"Q+	c #8F8F8F",
-"R+	c #1F1F1F",
-"S+	c #535353",
-"T+	c #F7F7F7",
-"U+	c #959595",
-"V+	c #151515",
-"W+	c #222222",
-"X+	c #9A9A9A",
-"Y+	c #6E6E6E",
-"Z+	c #0E0E0E",
-"`+	c #EAEAEA",
-" @	c #3C3C3C",
-".@	c #9F9F9F",
-"+@	c #E6E6E6",
-"@@	c #0C0C0C",
-"#@	c #313131",
-"$@	c #DCDCDC",
-"%@	c #9D9D9D",
-"&@	c #141414",
-"*@	c #0F0F0F",
-"=@	c #979797",
-"-@	c #B1B1B1",
-";@	c #575757",
-">@	c #E7E7E7",
-",@	c #8E8E8E",
-"'@	c #0D0D0D",
-")@	c #383838",
-"!@	c #737373",
-"~@	c #ECECEC",
-"{@	c #C9C9C9",
-"]@	c #7E7E7E",
-"^@	c #717171",
-"/@	c #181818",
-"(@	c #1A1A1A",
-"_@	c #050505",
-":@	c #858585",
-"<@	c #EDEDED",
-"[@	c #777777",
-"}@	c #080808",
-"|@	c #616161",
-"1@	c #D0D0D0",
-"2@	c #D9D9D9",
-"3@	c #F9F9F9",
-"4@	c #EFEFEF",
-"5@	c #D5D5D5",
-"6@	c #CDCDCD",
-"7@	c #282828",
-"8@	c #B5B5B5",
-"9@	c #2E2E2E",
-"0@	c #202020",
-"a@	c #444444",
-"b@	c #BABABA",
-"c@	c #545454",
-"d@	c #434343",
-"e@	c #CFCFCF",
-"f@	c #BBBBBB",
-"g@	c #3D3D3D",
-"h@	c #7B7B7B",
-"i@	c #DDDDDD",
-"j@	c #1D1D1D",
-"k@	c #848484",
-"l@	c #5E5E5E",
-"m@	c #0B0B0B",
-"n@	c #F0F0F0",
-"o@	c #939393",
-"p@	c #666666",
-"q@	c #3A3A3A",
-"r@	c #A3A3A3",
-"s@	c #E5E5E5",
-"t@	c #838383",
-"u@	c #363636",
-"v@	c #2C2C2C",
-"                              . +         @                     ",
-"                          #   $ % &     * =                     ",
-"                  - ;         > , ' ) ! ~ {                     ",
-"                  ] ^         / ( _ :                           ",
-"                < [ }         | 1 2 3     4 +                   ",
-"                5 6 7         8 9 0 a     b c                   ",
-"                d e f g h i j k l m n     o p                   ",
-"                q r s   t u v w x y z   A B C D                 ",
-"                E F G     H I J K L f M N O P z                 ",
-"                  Q R S T U V W X Y Z `  ...+.g                 ",
-"                  @.#.$.%.&.*.=.-.;.>.,.'.).!.~.                ",
-"                    {.].^./.(._.:.<.[.}.|.1.2.3.4.              ",
-"                  5.2 6.7.8.9.0.a.b.c.d.e.f.g.h.i.              ",
-"                j.k.l.m.n.o.p.q.r.q.s.t.u.v.w.x.y.              ",
-"                  z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.g               ",
-"                  O.w P.Q.R.S.T.U.V.W.X.Y.Z.`. +g               ",
-"                  .+++ at +#+$+%+&+*+=+-+;+>+,+'+)+g               ",
-"                    !+~+{+]+^+/+(+_+r.:+<+[+}+|+                ",
-"                    1+2+3+4+=+5+-.#+6+7+8+9+0+g                 ",
-"                      a+b+c+d+e+f+g+h+i+j+k+g                   ",
-"            l+m+n+o+p+    q+r+s+t+u+v+w+p+x+y+z+A+B+C+          ",
-"            D+E+F+G+H+      p+I+J+K+g g L+M+N+O+P+Q+R+g         ",
-"            l+S+T+U+V+      W+X+Y+Z+g C+G+`+G+ @. at +@D+p+        ",
-"            g @@T+U+V+      #@$@%@&@  *@=@- at o+g ;@>@,@'@        ",
-"              *@T+U+V+  )@!@,@~@{@]@^@/@/@(@_ at p+:@<@[@}@        ",
-"              *@T+U+V+  |@1 at 2@3 at 4@5 at 6@7 at g g C+S+N+8 at 9@!         ",
-"              *@T+U+V+  0 at a@D++ at b@c at d@'@! &@;@e at f@g at . g         ",
-"              *@T+U+V+    g #@$@%@&@g g V+h at i@E+)@C+g           ",
-"              *@T+U+V+      j at k@l@@@  m at k@n at n@o at p@p at q@p+        ",
-"              Z+F+G+H+      g g g g   H+r at s@s at s@s at s@t@'@        ",
-"              _ at n+o+p+                p+u at A+A+A+A+A+v@C+        ",
+". 	c #151515",
+"+ 	c #2C2C2C",
+"@ 	c #343434",
+"# 	c #383838",
+"$ 	c #313131",
+"% 	c #222222",
+"& 	c #0E0E0E",
+"* 	c #212121",
+"= 	c #7A7A7A",
+"- 	c #C1C1C1",
+"; 	c #C3C3C3",
+"> 	c #A1A1A1",
+", 	c #393939",
+"' 	c #161616",
+") 	c #090909",
+"! 	c #515151",
+"~ 	c #D0D0D0",
+"{ 	c #E7E7E7",
+"] 	c #DFDFDF",
+"^ 	c #BDBDBD",
+"/ 	c #AEAEAE",
+"( 	c #868686",
+"_ 	c #1C1C1C",
+": 	c #030303",
+"< 	c #5C5C5C",
+"[ 	c #E1E1E1",
+"} 	c #FFFFFF",
+"| 	c #F4F4F4",
+"1 	c #AFAFAF",
+"2 	c #999999",
+"3 	c #B6B6B6",
+"4 	c #CACACA",
+"5 	c #C2C2C2",
+"6 	c #A3A3A3",
+"7 	c #8B8B8B",
+"8 	c #141414",
+"9 	c #000000",
+"0 	c #262626",
+"a 	c #F7F7F7",
+"b 	c #EAEAEA",
+"c 	c #D2D2D2",
+"d 	c #888888",
+"e 	c #FDFDFD",
+"f 	c #E9E9E9",
+"g 	c #9D9D9D",
+"h 	c #686868",
+"i 	c #010101",
+"j 	c #555555",
+"k 	c #C9C9C9",
+"l 	c #8D8D8D",
+"m 	c #444444",
+"n 	c #A9A9A9",
+"o 	c #E2E2E2",
+"p 	c #EEEEEE",
+"q 	c #6F6F6F",
+"r 	c #4F4F4F",
+"s 	c #CCCCCC",
+"t 	c #DDDDDD",
+"u 	c #292929",
+"v 	c #808080",
+"w 	c #575757",
+"x 	c #636363",
+"y 	c #353535",
+"z 	c #9F9F9F",
+"A 	c #BBBBBB",
+"B 	c #A8A8A8",
+"C 	c #A4A4A4",
+"D 	c #454545",
+"E 	c #121212",
+"F 	c #3B3B3B",
+"G 	c #DADADA",
+"H 	c #D3D38C",
+"I 	c #E3E33E",
+"J 	c #E9E826",
+"K 	c #EEDA23",
+"L 	c #EDCB3D",
+"M 	c #EBBD7B",
+"N 	c #A6A6A6",
+"O 	c #484848",
+"P 	c #2A2A2A",
+"Q 	c #363636",
+"R 	c #A7A7A7",
+"S 	c #BDBDA8",
+"T 	c #F5F51A",
+"U 	c #FFF200",
+"V 	c #FFDA00",
+"W 	c #FEC205",
+"X 	c #F3D7B6",
+"Y 	c #D5D5D5",
+"Z 	c #787878",
+"` 	c #1A1A1A",
+" .	c #080808",
+"..	c #EFEFEF",
+"+.	c #FCFCFC",
+"@.	c #F6F6D2",
+"#.	c #FCE40C",
+"$.	c #FFCE00",
+"%.	c #F2C98E",
+"&.	c #E6E6E6",
+"*.	c #9C9C9C",
+"=.	c #020202",
+"-.	c #FAFAFA",
+";.	c #DEDEDE",
+">.	c #F0E6AE",
+",.	c #F0CF65",
+"'.	c #D7D7D7",
+").	c #CFCFCF",
+"!.	c #050505",
+"~.	c #0D0D0D",
+"{.	c #F8F8F8",
+"].	c #969696",
+"^.	c #F9F9F9",
+"/.	c #F5F5F5",
+"(.	c #C8C8C8",
+"_.	c #C0C0C0",
+":.	c #717171",
+"<.	c #070707",
+"[.	c #101010",
+"}.	c #ACACAC",
+"|.	c #939393",
+"1.	c #C7C7C7",
+"2.	c #EDEDED",
+"3.	c #B9B9B9",
+"4.	c #B4B4B4",
+"5.	c #232323",
+"6.	c #0F0F0F",
+"7.	c #0C0C0C",
+"8.	c #181818",
+"9.	c #282828",
+"0.	c #FEFEFE",
+"a.	c #5D5D5D",
+"b.	c #E5E5E5",
+"c.	c #848484",
+"d.	c #737373",
+"e.	c #ADADAD",
+"f.	c #8C8C8C",
+"g.	c #060606",
+"h.	c #818181",
+"i.	c #D4D4D4",
+"j.	c #CECECE",
+"k.	c #B5B5B5",
+"l.	c #9A9A9A",
+"m.	c #A5A5A5",
+"n.	c #040404",
+"o.	c #BEBEBE",
+"p.	c #919191",
+"q.	c #C6C6C6",
+"r.	c #BFBFBF",
+"s.	c #ABABAB",
+"t.	c #747474",
+"u.	c #696969",
+"v.	c #B7B7B7",
+"w.	c #B3B3B3",
+"x.	c #8F8F8F",
+"y.	c #A0A0A0",
+"z.	c #0A0A0A",
+"A.	c #2F2F2F",
+"B.	c #D8D8D8",
+"C.	c #909090",
+"D.	c #838383",
+"E.	c #AAAAAA",
+"F.	c #707070",
+"G.	c #B8B8B8",
+"H.	c #434343",
+"I.	c #858585",
+"J.	c #959595",
+"K.	c #8E8E8E",
+"L.	c #676767",
+"M.	c #BABABA",
+"N.	c #656565",
+"O.	c #B0B0B0",
+"P.	c #6B6B6B",
+"Q.	c #BCBCBC",
+"R.	c #B2B2B2",
+"S.	c #F2F2F2",
+"T.	c #D6D6D6",
+"U.	c #7D7D7D",
+"V.	c #929292",
+"W.	c #E4E4E4",
+"X.	c #D9D9D9",
+"Y.	c #757575",
+"Z.	c #9B9B9B",
+"`.	c #8A8A8A",
+" +	c #9E9E9E",
+".+	c #5A5A5A",
+"++	c #F9C66E",
+"@+	c #D5B479",
+"#+	c #D7B67E",
+"$+	c #D8B983",
+"%+	c #C2A984",
+"&+	c #B4B2B1",
+"*+	c #A19B92",
+"=+	c #C0A371",
+"-+	c #D5B67C",
+";+	c #D6B77C",
+">+	c #F5CE88",
+",+	c #FBCF80",
+"'+	c #F6BC59",
+")+	c #FFD68A",
+"!+	c #FFE6B4",
+"~+	c #FFE7B4",
+"{+	c #FFE8B4",
+"]+	c #FFE6B3",
+"^+	c #F4CC81",
+"/+	c #B5945B",
+"(+	c #B48E49",
+"_+	c #F7CC7A",
+":+	c #FFE1A2",
+"<+	c #FFE3A2",
+"[+	c #FFE4A2",
+"}+	c #FFD88B",
+"|+	c #F3A30F",
+"1+	c #FEC100",
+"2+	c #FFC814",
+"3+	c #FFCF22",
+"4+	c #FFD327",
+"5+	c #FFD527",
+"6+	c #FFD427",
+"7+	c #FFD227",
+"8+	c #FFCD21",
+"9+	c #FFC411",
+"0+	c #EFB70B",
+"a+	c #83817C",
+"b+	c #898989",
+"c+	c #757574",
+"d+	c #EDB70B",
+"e+	c #FFC607",
+"f+	c #FFCC10",
+"g+	c #FFD214",
+"h+	c #FFD416",
+"i+	c #FFD316",
+"j+	c #FFD114",
+"k+	c #FFCC11",
+"l+	c #FFC409",
+"m+	c #FFC300",
+"n+	c #FBD000",
+"o+	c #FFD700",
+"p+	c #FFDD00",
+"q+	c #FFE300",
+"r+	c #FFE600",
+"s+	c #FFE500",
+"t+	c #FFE000",
+"u+	c #FFD800",
+"v+	c #FFD300",
+"w+	c #FACA00",
+"x+	c #FEDB00",
+"y+	c #FFE900",
+"z+	c #FFE800",
+"A+	c #FFDB00",
+"B+	c #FACD00",
+"C+	c #FDE600",
+"D+	c #FEF800",
+"E+	c #FFF700",
+"F+	c #FFED00",
+"G+	c #FDE400",
+"H+	c #FFEC00",
+"I+	c #FEF400",
+"J+	c #FEEC00",
+"                                                                ",
+"                                                                ",
+"                          . + @ # $ % &                         ",
+"                      * = - ; ; ; ; ; > , '                     ",
+"                  ) ! ~ { ] ^ / / / / / / ( _                   ",
+"                : < [ } } } | 1 2 2 3 4 5 6 7 8                 ",
+"              9 0 1 } } } a b c d ] } } e f g h i               ",
+"              9 j k } } a b l m n o } e p ] k q .               ",
+"            9 9 r s } a b t < u v w e p ] ~ - x * 9             ",
+"            9 9 y z a b t ~ A B 2 | p ] ~ - C D E 9             ",
+"          9 9 9 8 F G t ~ H I J K L M ~ - N O P i 9 9           ",
+"          9 9 9 i . Q R ; S T U V W X Y Z * `  .9 9 9           ",
+"          9 9 9 9 9 Q ..+.} @.#.$.%.p &.] *.i 9 9 9 9           ",
+"        9 =.: : : 0 -.} a ;.} >.,...&.;.'.).z : : : : 9         ",
+"      9 !.) ) ) ~.p } {.].^.+./.p &.;.'.).(._.:.) ) =.<.9       ",
+"    =.) [.[.[.[.}.} } |.l 1./.2.&.;.'.).1._.3.4.5.) 9 6.7.i     ",
+"  9 =.<. .E 8.9.0.} 0.Z | a.2.b.;.'.s c.q d.6 e.f.& 7.: =.i 9   ",
+"          g.* n } } } a.2.h.b.;.i.j.2 R k.l.# m.> 0 [.          ",
+"          n.u p } } ^.o.p.q.r.s.t.u.v.3.w.x.:.y.2 x z.          ",
+"          9 A.} } B.2 C.|.z z 5 D.7 v.e.D.p.y.2 |.( !.          ",
+"            O } +.| 2.E.F.c.).G.}.k.E.H.I.x.f.|.J.K.            ",
+"            L.| | 2.b.;.M.u.1 _.3.w.}.l :.N.= p.O.P.            ",
+"            Q.R.S.&.;.T.U.O 3 3.w.}.N z 2 |.V./ y.D             ",
+"              l.q.W.X.A U.Y.Y.w.}.N z 2 |.Z./ n !               ",
+"                `.r.Y ).^ e.w.}.N z  +y.n s.6 .+                ",
+"                ++ at +#+$+%+&+G.4.O./ n *+=+-+;+>+,+'+            ",
+"            )+!+~+{+{+~+]+^+/+m.R *.(+_+:+<+[+[+<+:+}+|+        ",
+"          1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+l+m+        ",
+"          n+o+p+q+r+s+t+u+v+w+        x+p+s+y+z+q+A+o+B+        ",
+"              C+U D+E+F+G+                H+I+U J+              ",
+"                                                                ",
 "                                                                "};

Added: tuxmath/trunk/data/images/icons/tuxmath.hqx
===================================================================
--- tuxmath/trunk/data/images/icons/tuxmath.hqx	                        (rev 0)
+++ tuxmath/trunk/data/images/icons/tuxmath.hqx	2009-06-06 21:14:24 UTC (rev 1012)
@@ -0,0 +1,240 @@
+(This file must be converted with BinHex 4.0)
+:"h4eH'eKG'J!9%9B9(4dH(3%!!!!!Y!!!#Q[ijP)EhFJG'mJGA0P)(4SDA-JD at 0
+[EMS+#P0dCA!J-6SJ3fp`H5"dD'8JD at 0[EL"dEb"dD'8JBfaTF'*[BA*N#Q%T)%0
+XD at 0V)'pZ)(4SDA-JCQPXC5"QFQpY)(4SC5"'D at jNCA)+BLNJ3fK[Eh0P)#G(CA3
+J5 at jQEbFJCR*[E5"dD'8J*dCTE'8R)'ePER8Z#Q-T)%PZ)(4SC5"TEQC[)(GTEQ4
+[Gb"dD'&d)("[F(-JGA!X)'0XD at 0V)'pZ)(4SC5"TBfpZ#Q3T)%0SEfpcC5!R3fp
+`H5FJCR*[E5"dD'8J*d9NDA3R)'ePER8Z#Q8T)%0XEh0P)(4SC5"TEQC[)(GTEQ4
+[G`S+8h4PF#!b1L"3BA0dC5"dD'8JD at 0[EL"dEb"dD'8JC'9cDA*PC#"TG'9Y#Q%
+T)%G[)(4[)(4SC5"TG'9Y)'PZ)(4SC5"'D at jNCA)JG'KKG#"jEh8JGf&ZG#"K)'0
+eFh4[E5"TBfpZ#Q)T)%0XD at 0V)(4SC5"TG'9Y)#KQD at aP,#"QEfaNCA)X)'4TFfX
+X)'9dBbNJ#Q)T)%0SEfpcC5!R4f9d)%PZCQmR)'CbEfdJG'KP)#G'D at aP*b"YC at j
+e,JTM+5"*EL"dD'8JD at jQEb"hD at jNEhFJG'KKG#"`Eh"c)(9`,#"ME'PMDb"[EL"
+dD'8JD at 0[EJTN+5"$D'p[Ff8J*e"KFh4P*b"QFQpY)(4SC5!R4 at 4TG#FJE at 9ZG5i
++C5NJ3fa[Ff8JG'KP)'PZCQmJGfPZC'ph#JT6G'9`)$-k)!T&EQT[H5"jEh9b)'j
+PGfaj)'0eFh4[E at PkC@3JD at 0[EL%+#NC[FL"YEh*P)(4SEh*[G at GS)'4TFQ9MG'P
+[ER-X)(0PC5""F("XC5Gc)(GPBR0TG'8JBA3k#QKdG(!k,bphGhFZBA"`E'8ZBfp
+Y,h0eF("[FR3[E@&M-6!a,f0eFh4[E at PkC5mf,`V6V!!!!3!!!#Pp!!!SI3!!!$)
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!#KjD at 0ZF`!!+(PTFc-b!!!#b!d!!!)"'Fhrr`!Xfb`h#i3!#!*CMC4X(KS'!B%
+!#`J!%VcrcU(!T$CJ*)-!#RMrq+Lhrr50!!!"JJ!CH2rJCBl`f)S%"J-!!J!"!"+
+KbIMjjRFF!!'#!!J$!,hrqIAS[aH!!4m!"382!*lbYIcMfXkd"!F&&3!'$Llr[DA
+Id+0lP&J$!i%!6hMrVU#mLEkLPRi!!!%!CIqZrZ at 3!-1eKff*NJ$r!0f9KCVHefk
+QUk5CU9dZ4FX!re[rXYDfXDbGZT[TZ[rBlr2fr[rqrl@,k2rrr[hrrr2eqS$q![h
+cri$p!rrmrrf#!!D*MC'-riJ!JHX0!!!#!4R0rrm!,0XX0`Z%!!J#@Bf8E"iD"J'
+"!!X)!"+mrmkK`+3fB#5$!!TirrLSYrrdM3!!!B)!'AMri'@4mYL+"!B$!!)!!3!
+5SFRfcG4i(!!"JJ!)!`#prr$9l,iAJ!%I!!8&$`#HmVApjGV1Y!3("48!"JiZrlf
+Php#MHj4B!`1"!&airkkJ[)QqSTCq!!!"!'ArV[lPN!$$YBGYLC)!r`#4S)qEhpK
+ZTUZMQkPI3%5B!,arikA,XV5XRkq6bAErPkDLVXrGemqFMl2 at hY6#rmHfYmA9hpr
+9aIr2h1(IcpE2JJ!'JSQ1M2q)!)'B$3!!!J%CcIrr!#cE,$F,K!!)!PQ0P'`H'JB
+"J3!,#!!5[2r1SF#N0Q!NJ`!+H2riT,6rp)d!!!'#!"Pirq&aQI2BLJ3'!`!#!!%
+!%D#j'!brH4`!!B)!#!-![2qHErLp&i!"(`!&"3m!R[+drq[CcV3%"`89!!B1,[q
+pTGl2ShZ8@!-$J3!mH2qZS,b*[U+ at IJ!!!3"PrklqjC!!`l@(EBQ5!2m!!EDMR1$
+DEU at XSTbUB@G#)`"9Y`#4ZE#lUkHHL(GSjA'!!!aDE at G2AjNX@Q"K+[mKNJ!'H)+
+(MIq(ri%!FcKYD`!!!3J!!!!!!J%!!!!!!!)!!!!!!!!!!J"%d2rrhPd!!`!!!!!
+!!J#+rrhlqrlrV`!$!!!!!3"GrrVrrrrrqrq,!!)!!!3!lrcrrrrrrrrlraF"!!!
+!3rrmrrrrrrrrrIpb!!%$!+Arr[rrrrrrrrrra!!$!*Rrr[rrrrrrrrrrr[qi!#U
+Rarrqrrrrrrrrrrr)9"S!!%,rr2rrrrrrrrlrF`!"!3B!l[crrrrrrrrkraJ"!!!
+"!)(rr[rrrrrqrii!!J!!!!)%h2rrqr[prq3d"J!!!3"Srr[qrrrrrrrrrHm!!`!
+!)VMUkVFC!&M+i-TU!!%!!!!!!!!!!J3!!!!!!!!!D@`c-J!!#1#-!!))%!+@!!I
+r!"K3AT0B-)!!!3B%N!!!"d8!'$Br3MXNJ!!#!`36M`!-%AqPe0VCflQ3!%8!'#1
+2!!j4eqMGZUUXVUbUXSF9!!5+!"%"!!"+p2lrrrQXQ*1ed-+ML4@,!!X,!#2"rrh
+rpqhJJq+!r`6YS'B!(BN!&!J!1GArrrEZQNUQkrhllGr$G``$#SJ!&!-!3p,rpqI
+L@#9b@[rVhp#lD5%!"BJ!%J%!(U[mkGh3YjarpHlJcm+L5!L-!"%411,Pd02MhY[
+Ykmc*TNJR!!',!!B"%61F`VliJ2m&mZ4U'"F(L3!!!i!!$`%!*YcrrrRlr[,[jZ4
+Q!!'+!"J#!`-"(r,rqr,rp22ZjGr5i(m!"!-#!!!"J`!!"S!*%a$IrrfPr[hdl1A
+IeXr%ce`$#`-&K!!D#K%3%!YYrrqMIFVhl1AHeY2+a, at m(3N!$`d"J3!D"!d0&4i
+4prcrF2K0mq$Ee-L8J)'QXAm'$33#K3!9#4@,r[cr at Zq0kpc8dDU8Q)FiUC`f&BF
+!'!)Fc2rqfTGP[EQpGhbrZVU0Gk at L6Jd"!`'&!"BjlIrJYVV(YUr%LjHjXik9TCH
+6I!%6!i3!&a%!22rlp21hGCV6YUZhTdb!HS at 8QiX!2B8!'"J!8Hrdl12Pe8qh`EU
+bU)PiF(k1[Pm!23+%!"Ir!*HVqH2EhAeBYlQbV+DKR*58XT%`Bc5'!"HUrjUilGU
+fJ at Pa[+ZQRjL6R,'Z4cGE!1D$!"VQrq5qYS#[dmfmZELXTk+HT+QQNccrl[rZjZD
+#!"[Qrr,rjIA+hGZrVEDcVUbTR-(@bZllmpEdjIIVJ3!$jrr[rB2r"[HVU+bIVIZ
+$r`6qmq2dki%!!Z[Rr)(r#rlqrIr`LBYSp2hprS,r!rlMrqZ"!!2pf[cqJrm'r[f
+0R at MirS2r"2liirEVJ3!Em2(rqrhpr[lpr[[rQ(9Pr2IqrIhqr2liqZ2fki%!"2$
+rrrVpJ2i5rIlkrrq5rrMer[lpr[hqpr`!pS3!#IJ!qIcqrIcl!2Z#!!Iir2[pq[d
+!ri%!M!!##"!#PJ!(r`!B8&k6@$#!!!%'"*!!!!G&!"Jf2d)l*)!!!J-%%im!$"&
+rTG6DfGZjN!"&!"JMM`!18GIShEUUV+kXUV+(&3!%LJ!4!3!!5[6qrrrjV*L6YG$
+#SiN9L`!,#`!M`IrprrIYi)2LJ2m%lD"Q!"f*!"3)!$R9rrrflTT+TZ[pqqhI`hF
+-!`U)!"3$!%25rrIRiPJPF9Vqkpr3ZfNK!!@)!")"!"kVr1RGd,HFJ2E`hmr#SNJ
+)M!!4%6MLjG$6ipc(d-,0b+C)*`!"L`!2!4%cR-+qq2IHZ-rRD4JA"iN!!!1!!!m
+"!#EFrrriim[4mqANCJ!"LJ!B!J-$!4rbrr[brqV3mHAIdZ"r!!3$!J!!!B-!!!D
+!#4-3hrrpTIlppHlPhpE2a-pF!`X$"B3!'JS4%"!,EIrrShh+pqcNhYE6bX5e["d
+*!!m0!B%!'J30$48H%IImrh$i6I2Jfp6)P)#"TV&r"Jd%!S8!&3N9LrlmreV[MH[
+Fe0'UP*L(1+QF0K@(!"J#(-crrYUACEfj[AGm[lUkMAHPSNi0!3-"K3!@1Hhri,D
+kalD[a)ZAZE11PD at ANh`"%`1%!"F4!$crqr6cYh at DdlDVYkG-J(U&P*Z,!$f&!"J
+B!&([p1cMjG92Ym'kXUL*H("qMVjI!$d#K!!Ar`#AUrRMfpep@,HjXUbQSCb8P,+
+4-'-dKJ!AU[qDZ1hDYS&TFEbVTTqBNjb`VNB[5`#)J`!DM[q"URL(XpM6`,LiV+H
+LRD5ZUjC!rk$rR)L6JJ!EM[qArjDfVF'dT+khXkkXUjLKY,(2b,*ET)ZZli%!"T(
+rPY6UkZf!ka(+NDZVSB[0jqERjH6PeU12UZq"!"ZJRlR&aFR,bmR&aV+#LQZe`F2
+(bX[*aF,!MmDFJ3!Elh[0cpMFhYrGfFr2KiKVa0(Ci12MiGh6aBr"QS%!'fZklH6
+GhqVThYlKlBpjCXREk0rKiprRhpD2`*k"!"TVrpVTj12Yl12QjYVrLrr$iqlRjqR
+RlqA3!-'%!!R+!-MCkHI9a!$1JJ!(YFc at fFqq!+U"!)`!!JJ3!TB!"rm!'&"HNeJ
+`J!!""J53!!!(43!B0Mp#1b5!!!)$""12!!`4IkA8fYREZC!!43!B)im!$P(Ak0f
+kUUbZV+UbKa8!")S!%3%!!%Vdr[rrqDbBNlA3`U1*&BX!#`X!)m(rrIrhlH#$iS$
+r"1fJCJ!GL3!8#!!jeIrrpZkD5UEVrI[Yhm0h$!-+L!!8!`"$d[rhjq&9)@eArZ[
+Id,YT)3!&L!!5!3!HUrcThG1qTBMmmpr2`U*)#)`!%4%iiZ6 at P&!L$e+(cmLQ5#F
+!!BX!$`%4-jc"T``!"!#Tk'NB&`H*!!!$J!!2!3!Qh2rre`N!NrRNj'B!!BS!'!)
+$!`%Im[rlmIqaA2cMhp,JI`!%!`)!!!'$!!!'J!N6%0rrrDAqr2Mcj0r at cm62A!-
+,!`@%!"S+%4!3#fhrrk0pb[IViYr at dmV%YE`G#3!2$3'"!"S%$3d9(K(hr2p`q%h
+ci0[8b*5!JDDaI`B0"!+&!"8*&B[qr2pDlihVh064UT5BKcLTR$B9K`!B!Kc-rrl
+DPf at pZEehI,qkZSehTD*1$3%$!B8!&MRYrq#fZXHfVm5,PlQcMT at PPj0m!4-$K!!
+A%3!mrr[dmlGeQY1fUlHR6)"kKC5EL`!pK3!B'!"4lr6XiqA96lI"ZV+SLAK`ISk
+qA`!p!S3!&rm!Pk[jip[GI9LhZE+XTU'FP*5bN6"M0)B!&kVrQEIXfV@!DA'mUkD
+IQ*+EX+j&)6-!%B3!'2m!I3f6ZYrGaVDhV+HLRD1eXja(raMr$4''!"Dm$8TjMQp
+iXVQcVUb[P at PiK*4Y3J!2#i8!&J'&[Vbp[,fpG'1`UU40EUkUUkUUVB31K3!A"3!
+H'4dI(adD)!4hKR)#%Ji2%"!2$4!$K3!!#iF!!hNfG`'3!!!"!3'"!!8"!!"DL at D
+E!!"YV!"X1'eV!!!%#!!!!!!!!!!!!!!!!!!$"JB'"J8"!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!%!!!!!!!!!!!!!!J!!!!!!!!!!!!!!!!!!!!!!!!!$!!9)VIMrrrh
+8A5!!"3!!!!!!!!!!!!!!!!!!!!!!!J"0e[rrqrVjq[rrmBN!!J!!!!!!!!!!!!!
+!!!!!!!-!K[rrrIlrrrrrr[hrrm`0"!!!!!!!!!!!!!!!!!!%!*Irqrrrrrrrrrr
+rrrrprpi!!`!!!!!!!!!!!!!!!3"Srr[rrrrrrrrrrrrrrrrqrm-*!3!!!!!!!!!
+!!!!!)IIprrrrrrrrrrrrrrrrrrrqreJ!!3!!!!!!!!!!"!#Srrlrrrrrrrrrrrr
+rrrrrrrrlq33%!!!!!!!!!!!$$IrkrrrrrrrrrrrrrrrrrrrrrrhpF`!"!!!!!!!
+!!J#3!2lqrrrrrrrrrrrrrrrrrrrrrrrr`3)"!!!!!!!!!J#irrrrrrrrrrrrrrr
+rrrrrrrrrrrre)`!!!!!!!!!$#HIrrrrrrrrrrrrrrrrrrrrrrrrrrIma"!!!!!!
+!"!#FrrlrrrrrrrrrrrrrrrrrrrrrrrrqrVd!"!!!!!3!R2rprrrrrrrrrrrrrrr
+rrrrrrrrrrrrqrm%#"3!$!*crr2rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrm`!!`#
+5rrhrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrp1ma)F!!#3U,M[Nrrrrrrrrrrrrrrr
+rrrrrrrrrrrhr0J!!!!!!!!!!!,2rrrrrrrrrrrrrrrrrrrrrrrrrrrBM!3)"!!!
+!!!)!N[lqrrrrrrrrrrrrrrrrrrrrrrrr`J)"!!!!!!!!!!)4rr[rrrrrrrrrrrr
+rrrrrrrrrrIYc!!%!!!!!!!!!"!#Vr[lrrrrrrrrrrrrrrrrrrrrir`3&!!!!!!!
+!!!!!!$rprIrrrrrrrrrrrrrrrrrrr[pL!!%!!!!!!!!!!!!""E[rr[rrrrrrrrr
+rrrrrrrrre!`#!!!!!!!!!!!!!!%,!-Rmr[rrrrrrrrrrrrrqr-N!!!)#!!!!!!!
+!!!!!!!"IR26qrrrrrrrrrrrrrrlqZk5*&!!"!!!!!!!!!3"Er[rrrrrrrrrpq2R
+jr2rrrrrrrrrrKJ!$!!!!!!!!+2rjq[hqr[lpr[rrrrrrrrhqr[lpqrEr&3%!!!!
+!!!!!NIrrrrrrrrrrJ!!(!'MZrrrrrrrrqT3!!`!!!!!!!!)!0h+qcFbpD$)!"`3
+(!"e*LkUVPP-T!!%!!!!!!!!!!!%!!!!!!!!!!!%!!!!"!!!!!!!!!!!"!!!!!!!
+!!!!!!!!""!3%"!%!!!!!!!!!!!)$!`-"!!!!!!!!D at Jc-J!!$V(dr`%!!+IrJ!!
+%!`S3#!'!!*rr"3!!"#TZYS(0"FU85a-$!*cr!`!%-Uq)[`0q%J-!QIm(!"+9`Y6
+Cal5'X31`A!X!P[m%!!!9T1+"r`(bXiHM!R-&!*Ar!`!5NqU#r`rhl+#9PCDkeHE
+C`TL9FJ-!Nrm$!!&qZS,r"[I[jXD'PHL"r`EiiTb'5`!!NIm%!!!HH1D"r`EhlqD
+rcBEMJIm(q1lNdS&e!J#4r`3!!$PXqi$r&2I[jSYA&+#[l[rrq1lNfY#9DKi!!)r
+rJ!!"5 at H!raAhlqEG6NF2GcaYrrMZj0V3aCeF-J!!Mrq!!"Jd6ZlrpqrQhG5Q9fD
+5G-RilZ6Dd- at lK8iKJ!#0ri%!'"T!`[I[jYh8c-1jV&Eeq1lNfY$&Zl&B3!U!!)h
+rJ3!A"M*4kqEGe-c2dYM,dFEdkpc3aEZaE6)XJJ#-ri)!"aNNGGV8c-2FJrm)qGR
+&Z*4**#33JJ#,ri-!#!%4&N+I`lZrkS(r"2hcmH9hJ"B!$B-!Lrq%!!J""dRer[h
+rq[D!r`I`mZ[QiE-4"B3!Lrq&!!&`rS,r#rEkrqrbkqEKh0I01)8!LIm"!!'$"!&
+4rS$r$qRhrrr[m2$VjH(Fep,0b#H#"!)"!!#(r`%!!S-)!66mJ2m4T-RrrrVdlZ[
+PiGc at dXh(`lN4J!J%"!-$!!#&r`%!!S3-!0U!ra[5I[hrq[6[kqAJh0E5cFI$[VQ
+C$!`+!!8-"3!!Jrm"!!1%%3"*J2mGqfDF5Z,dlqVPi0c at dFh(`VkjYE)l%3-!"a%
+4#!!!JIm&!!)2%"%8J4F!fS$r'mpCrj&ElqVPi0[@dFfjS*fcYE'XR4%(#!S$!`+
+!!!(rri3!!a-F(&#"raM3 at 2VS1qMPi0[@dF&b4eT6-dqTU+4&("`"J`#&r`3!#5)
+Lfi(r'0`bk,HLjH$EdXc,V,QpZE at S*AkNS)8L)!#,r`-!!bJXJ[mBqBeSZ16Jfl"
+D5'Lj[EQeXC!!8U1JQjJS'!#-r`)!+fL!raVSPhjjH(CdFBh,c-I#[EQeXC4YRjq
+EPj03$J#-r`)!(U1!raV2dH$9fpcBeG'lE&q&YE at RJC+NRjZANj0i!J#-ram!"YE
+rrrRdlq519i,3dFUVT+ffYApLSk1IQjH6N!#TH`#1rai(i2rjp1rUjH$EPLqmam+
+pZE@`E6Jk1$G1N!#3!*ZiA`#1radZT2[dlqVPi0ZlU&'U`VfjYE#XU+5IQC+3!*!
+!NE5S2C!!rab'f[6VjH$Ee(d5Jm+pZE@`V+LNRjZANj!!PV5e at c@3!2mEaS$Sl12
+EeY(-X6PXZE@`V+LNRjZANj!!RV5cKcZ5raUUMHALfp+H@'9iBV@`V+LNRjZANjH
+PXDkI2!#6raL*S0VAe-fqSV at eX+bST*qEQ*kTVUbUQ%8jP2mAcS5+bmc+am1qZE1
+ZUkUTUUbXUDHMLd9"NrmGhqheqHcPjq,,V+ffYE1`VDZTRTc&iZ[[r[lmqI,RMIm
+"j[U'r`Vpjk1NUkQQS*!!c[Z(r`(jjSVr!HEqLIm'mTZLSTq&e)Vr!IMVLIm!mi[
+r"ECpIRGKj)[r!1Z*r`(ZrSRr"[h[L)$rrr1+r`$fLrm"q2Z(r`(lmB2r![,mrS6
+r![lmpSrr"rRmrIlqr2clLIm'q[clrIhkqrrrPIrdr`%!!+IrJ!!%!`S3#!'!!*r
+r"3!!"#TZYS(0"FU85a-$!*cr!`!%-Uq)[`0q%J-!QIm(!"+9`Y6Cal5'X31`A!X
+!P[m%!!!9T1+"r`(bXiHM!R-&!*Ar!`!5NqU#r`rhl+#9PCDkeHEC`TL9FJ-!Nrm
+$!!&qZS,r"[I[jXD'PHL"r`EiiTb'5`!!NIm%!!!HH1D"r`EhlqDrcBEMJIm(q1l
+NdS&e!J#4r`3!!$PXqi$r&2I[jSYA&+#[l[rrq1lNfY#9DKi!!)rrJ!!"5 at H!raA
+hlqEG6NF2GcaYrrMZj0V3aCeF-J!!Mrq!!"Jd6ZlrpqrQhG5Q9fD5G-RilZ6Dd-@
+lK8iKJ!#0ri%!'"T!`[I[jYh8c-1jV&Eeq1lNfY$&Zl&B3!U!!)hrJ3!A"M*4kqE
+Ge-c2dYM*a,,IeGA3aEZaE6)XJJ#-ri)!&KNNGGV8c-2Er[ldj06%QG$&Z*4**#3
+3JJ#,ri-!%3%4&N+I`lZrkIcXh-b[hr(PGi!@!!f$!)[rK!!6!3G*pIlprrVYj06
+%c[,VjZ'c%3@%!)[rK3!"F2k#r`[dfmc*mZ[QiGcAc6L&!)Rr!3!"J`3"8Ik!r`r
+Tprrrjmh`kqAKh0I5cFJRJJ3#!3!!Krm"!!+$#!%dr)$r%D6*rrrkp1lVjH(FeY,
+0am1j%B!)"!3$!`!!KIm"!!+%$!$DJ2mEdRlprrVdlq[Pi0c at dXh(`lkjQ3`-#J!
+&$!8!!)2r!3!$K"%!5B$r(IYQR%VLp1rUjH$FeY(0am+qZE at b1a%$!!F4%3J!!)(
+r"3!#$a!4&)%A!0U!ra[2 at Iq4@qrUjH$EeY(0ZD#GXl at aV*d4"`J+!`-#J!!"rrq
+%!!-6("a3JImBd&Mkk$[SjH$EeY("FNGD8c02UDLN44`F!B-!KIm%!!NL)YZ"raM
+F-ZLhSZAJfp,-bkbj[EQeU#9qT+#&)L!!Lrm$!!-S,),r'2Q0D,MNi0Z`@NKSZEf
+jYE'3!&+MS*ZB+"J!M2m#!#YSJ2mDk*GqHAKfG('0bmc(`VfjYE'8ECqIQjH68!i
+!M2m#!"kMJ2mDcp(JeG[Ff0A4ZfaIKE at eTi'5T*qEPj16H!)!M2mI!!E at rrrjp1r
+NMPH#d0(+Uk5YYV9rBU1MRjZANj!!UAX!M[mH"q$rqI6[kZAJfjB[[-I#[EQeX'd
+i1MJh6T!!N!#EZ&m!M[mG,U6lp1rUjH$EZkK4UX+pZE@`V+LNRjQ5N!#3!*'dU$f
+3!2mFKYVdkqAJfp4p%S2#[EQeX+bST*qEPj13!*DdY9XeN!$r'mD!k1cMfpE4c,%
+jE,QeX+bST*qEPj13!*kdXiFlN[mDUShPiY[5RPKPH'+eX+bST*qEPj1ATE'ZRc`
+!NrmBLD$Dep60[U+eYE#XU+5IQjLHUDkXUTK&1C6r&mk%LX[-bXI$[VQcVUZUUDU
+XV+QRSiY&3C2r(BUMXm6(`,UYRU'YYV at cX+fVUCk3!*kb`-[JfXl!Xik0r`+1aqL
+!l3(ZlS$Y$11fMk5VUDDJLTRAjqH#k!6Rjq#fNiVr'C at ddYA@epIBf0IAeYA3UiU
+LSTq&QEh3dY28J08'e065dF5XLBRr)kr#[m2'bF[-c-[*am1raBepIRGJXEr!`mE
+*bmc,bXM&`Vr(RSRr)Uh3b-h5eGMCfYM at dXl*d+@)J2rrYY(-dGACfpcFfYI8cmr
+"Lrm0[0VMj1ARkZVSjqEMekU$r`beh1AVl1hYlZhYkH($M[m*c-VBhq[UfpA(J)M
+r"m(2dpc at dFLUrrq8rr6r!3!!Trq!!!3$#K!)!B!!Rrm&!!!%+QkfJFd&bT4,%`-
+!R2m$!!3bViLr!hi5!`#Cr`F!%TA#e0R(Y)Da!l"F#`#@r`3!!"@NiS(r!I+cKk-
+#F`8!PIm$!"+6kS,r$rIXS*@9PVV9jYR#Q*9b!`#6r`-!!AkkJ[m'pqrQaSD9k)(
+r"[MLR)C,!!#4r`3!!"jijS(r"[I[jVr0KZ1"r`IilZ65JA8#!*(r"!!!1 at clJ2m
+8pqrQLeF8S+rZrrrilZ6Dd*9U(J!!Mrq!!!&*Ci$r&II[jYe14`ph2'hrq1lNfY$
+&R9`b!!#2ri!!'$41l[rhlqEGe+CACT*dbIMZj0V3aEZ&6L'!!)hrJ3!B'N$#pqr
+QhG6-`lQX9[AilZ6Dd- at lX9K!#S!!MIq"!"F'-P(VjYh8c*Yj at 5FG0SURbp$&Zl&
+Y-Lb#!)crJJ!('54efY6-`e5$!!JEaF at iP%NN*"##!)[rJ`!)!4%@3Tr$ZlipJ3!
+%#mIajAH!&J!0J`#,ri3!%`%(5IAqrIr`+J!!!U2bkqEKXa%&K!#,ri8!!A$qJ[m
+,h"B!H2,VjZ(FemdiK3#*r`%!!B-%!9(qJ2m2kIIrrljCm1[PiGcAdXh)*i)%!J%
+!!)Ir!3!#J`J"02b!ra'NbIrrq[6ZkqAKh0E5cFI$Z4'!#!3%!`-!!)Ar!3!#K!`
+!fS$r'p*qrIrkp1rVjH$FeY,0am1qZCN-$!S!"3`&!!#$r`%!!i34!%Q!rahlCTa
++i[6[kZAJh0E4cFI#[VQeXMX4!`!(%4%)!!#"r`8!!Jm3%45"&`$DJ2mEceRrN9[
+[kZAJfpE4cEQJRE1eXDbG%3F)#J-$!S!!!IrrK!!$%a`F8)(r'0"BqZJlk1AJfpE
+4`A*(@P-c6kQST%8F(!'$!)Ar"!!*)L,EJImBh$,SYk,Pi0[5c-ZXZEfjYDJPIU5
+JK5)J!)[r!`!$+#b#raMjM at Lij1$EX&T)D,QpZE at aN!"5Sk#EQ#JB!)cr!J!VD)$
+r'ZLAIRPiGR4aMF[-am+pZE at aP'fIRjZANe!1!)cr!J!HSi$r'Xr4i0AEh0M9dEY
+XAi at eYDH"NU5IQjH6NhJ#!)cr(`!'e[rrqI6[j)jAJY$4bUZNVEDeIf+MSjqEPj1
+3!+Pl!)lr(JIJrrRdlqVPi0Z@,lc(`VfjYE"Y1$Si0dk3!*!!QlKI!)lr(5kNqr6
+[kZAJflZS8DV#[EQeX+bST*qCNT!!N!#4Y+JpN!$r()EDp1[Pi0[8I4+$`VfjYE#
+XU+5IQjH6N!#@Y,9E0C!!ra['J1MXip[@dFba1 at bjYE#XU+5IQjH6N!#HY,1(1j,
+r'UU0jH,EdTjBCAKLYE#XU+5IQjH6Pk at aVTmm!*2r')QJfYI8cEkLYE@`V+LNRjZ
+BRUQZV+UB46Q8raI1K)V,c-V(`lkjXkkVUUQUV+bTTk1,48'6rai!)8*QKAeV8&5
+2VEDeXl#YUkQHIeTFFBQQPRPE44!!M2m#!'QkKFX+X&j`T+ZTTU#"2*+'Z3+N3!#
++r`)!#'U(E3KL$'bLSTq&("Q)A!)c!!#*r`8!!!-*$!k"$`S0#`J#!#YpIRGI$B`
+!LIq0!!1)J2rrM!#,riX!Jrq+!)lrK`#)ri8!rrq8rfJiE at X!!!N)!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!""`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!$1NiHheq22Uc at X-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!*bl[hrrrrrrrrrrrrja4d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!4HIqrrrrrrrrrrrrrrrrrrUK"`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!#!q[rrrrrrrrrrrrrrrrrrrrrrj48!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!E(mrrrrrrrrrrrrrrrrrrrrrrrrrr![!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!R[hrrrrrrrrrrrrrrrrrrrrrrrrrrrra'3!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!"[q[rrrrrrrrrrrrrrrrrrrrrrrrrrrrrri3J!!!!!!!!!!!!!!!!!!!!!!!!
+!!#Afrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrl8!!!!!!!!!!!!!!!!!!!!!!!!
+!!0(rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrJd!!!!!!!!!!!!!!!!!!!!!!!
+!9r[rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrD!!!!!!!!!!!!!!!!!!!!!!!
+!iIrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrl4`!!!!!!!!!!!!!!!!!!!!!
+[qIrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr``!!!!!!!!!!!!!!!!!!!!#
+drrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrp!X!!!!!!!!!!!!!!!!!!!$
+[rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrfF!!!!!!!!!!!!!!!!!!"[
+hrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrl%!!!!!!!!!!!!!!!!!!&r
+rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrq%!!!!!!!!!!!!!!!!!!-,
+rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr))!!!!!!!!!!!!!!!!TIc
+rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr9#3!!!!!!!!!!!!#Qr2r
+rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrf3X!!!!!!!!!!+Mmrrr
+rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrpd0!!!!!!!!UIcrrrr
+rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrJ$`!!!!#VrIrrrrr
+rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrlqIMlhK%!!#LQXVV!aqI
+rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr)P(aN6$3-!!!!!!!!!!&V
+rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrq!!!!!!!!!!!!!!!!!!!"(
+hrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrl%!!!!!!!!!!!!!!!!!!!$
+TrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrfS!!!!!!!!!!!!!!!!!!!#
+krrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrm`m!!!!!!!!!!!!!!!!!!!!
+eq[rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrra!!!!!!!!!!!!!!!!!!!!!!
+!frrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr43!!!!!!!!!!!!!!!!!!!!!
+!Arrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrk!!!!!!!!!!!!!!!!!!!!!!!
+!#rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmr!!!!!!!!!!!!!!!!!!!!!!!
+!!)rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmF!!!!!!!!!!!!!!!!!!!!!!!!
+!!!$Grrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr!)!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!&qrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrq2`!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!(rRrrrrrrrrrrrrrrrrrrrrrrrrrrrdV!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!$#JbY,mrrrrrrrrrrrrrrrrrrrrrrrrrr6ZjGUZ2`%!!!!!!!!!!!!!!!!!!!"
+4i2hrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrFid!!!!!!!!!!!!!!!!!&[
+arrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrH$3!!!!!!!!!!!!!!!-$
+rrrrrrrrrrrrrrrrrrrrrrrrpr[rrrrrrrrrrrrrrrrrZ-J!!!!!!!!!!!!!!!$[
+`rrrrrrrrrrrrrrrrk"m2'J!!EI,rrrrrrrrrrrrrrrbX!!!!!!!!!!!!!!!!!!!
+L`[2rrrrrrrrrrZqc%J!!!!!!!#Dhkrhrrrrrrrrbbe8!!!!!!!!!!!!!!!!!!!!
+!!!95PDDcXU at 54!)!!!!!!!!!!!!!!$&PJ)5#EN8'!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!+Ad
+!!#Kp!!!!-J!!!!!!!!!!!"`!-J!!D at 0ZF`!!!!UrZIrr!!!!!!!!!!#"BJ!!:

Modified: tuxmath/trunk/data/images/icons/tuxmath.ico
===================================================================
(Binary files differ)

Added: tuxmath/trunk/data/images/icons/tuxmath.png
===================================================================
(Binary files differ)


Property changes on: tuxmath/trunk/data/images/icons/tuxmath.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: tuxmath/trunk/data/images/icons/tuxmath.xpm
===================================================================
--- tuxmath/trunk/data/images/icons/tuxmath.xpm	                        (rev 0)
+++ tuxmath/trunk/data/images/icons/tuxmath.xpm	2009-06-06 21:14:24 UTC (rev 1012)
@@ -0,0 +1,294 @@
+/* XPM */
+static char * tuxmath_xpm[] = {
+"32 32 259 2",
+"  	c None",
+". 	c #151515",
+"+ 	c #2C2C2C",
+"@ 	c #343434",
+"# 	c #383838",
+"$ 	c #313131",
+"% 	c #222222",
+"& 	c #0E0E0E",
+"* 	c #212121",
+"= 	c #7A7A7A",
+"- 	c #C1C1C1",
+"; 	c #C3C3C3",
+"> 	c #A1A1A1",
+", 	c #393939",
+"' 	c #161616",
+") 	c #090909",
+"! 	c #515151",
+"~ 	c #D0D0D0",
+"{ 	c #E7E7E7",
+"] 	c #DFDFDF",
+"^ 	c #BDBDBD",
+"/ 	c #AEAEAE",
+"( 	c #868686",
+"_ 	c #1C1C1C",
+": 	c #030303",
+"< 	c #5C5C5C",
+"[ 	c #E1E1E1",
+"} 	c #FFFFFF",
+"| 	c #F4F4F4",
+"1 	c #AFAFAF",
+"2 	c #999999",
+"3 	c #B6B6B6",
+"4 	c #CACACA",
+"5 	c #C2C2C2",
+"6 	c #A3A3A3",
+"7 	c #8B8B8B",
+"8 	c #141414",
+"9 	c #000000",
+"0 	c #262626",
+"a 	c #F7F7F7",
+"b 	c #EAEAEA",
+"c 	c #D2D2D2",
+"d 	c #888888",
+"e 	c #FDFDFD",
+"f 	c #E9E9E9",
+"g 	c #9D9D9D",
+"h 	c #686868",
+"i 	c #010101",
+"j 	c #555555",
+"k 	c #C9C9C9",
+"l 	c #8D8D8D",
+"m 	c #444444",
+"n 	c #A9A9A9",
+"o 	c #E2E2E2",
+"p 	c #EEEEEE",
+"q 	c #6F6F6F",
+"r 	c #4F4F4F",
+"s 	c #CCCCCC",
+"t 	c #DDDDDD",
+"u 	c #292929",
+"v 	c #808080",
+"w 	c #575757",
+"x 	c #636363",
+"y 	c #353535",
+"z 	c #9F9F9F",
+"A 	c #BBBBBB",
+"B 	c #A8A8A8",
+"C 	c #A4A4A4",
+"D 	c #454545",
+"E 	c #121212",
+"F 	c #3B3B3B",
+"G 	c #DADADA",
+"H 	c #D3D38C",
+"I 	c #E3E33E",
+"J 	c #E9E826",
+"K 	c #EEDA23",
+"L 	c #EDCB3D",
+"M 	c #EBBD7B",
+"N 	c #A6A6A6",
+"O 	c #484848",
+"P 	c #2A2A2A",
+"Q 	c #363636",
+"R 	c #A7A7A7",
+"S 	c #BDBDA8",
+"T 	c #F5F51A",
+"U 	c #FFF200",
+"V 	c #FFDA00",
+"W 	c #FEC205",
+"X 	c #F3D7B6",
+"Y 	c #D5D5D5",
+"Z 	c #787878",
+"` 	c #1A1A1A",
+" .	c #080808",
+"..	c #EFEFEF",
+"+.	c #FCFCFC",
+"@.	c #F6F6D2",
+"#.	c #FCE40C",
+"$.	c #FFCE00",
+"%.	c #F2C98E",
+"&.	c #E6E6E6",
+"*.	c #9C9C9C",
+"=.	c #020202",
+"-.	c #FAFAFA",
+";.	c #DEDEDE",
+">.	c #F0E6AE",
+",.	c #F0CF65",
+"'.	c #D7D7D7",
+").	c #CFCFCF",
+"!.	c #050505",
+"~.	c #0D0D0D",
+"{.	c #F8F8F8",
+"].	c #969696",
+"^.	c #F9F9F9",
+"/.	c #F5F5F5",
+"(.	c #C8C8C8",
+"_.	c #C0C0C0",
+":.	c #717171",
+"<.	c #070707",
+"[.	c #101010",
+"}.	c #ACACAC",
+"|.	c #939393",
+"1.	c #C7C7C7",
+"2.	c #EDEDED",
+"3.	c #B9B9B9",
+"4.	c #B4B4B4",
+"5.	c #232323",
+"6.	c #0F0F0F",
+"7.	c #0C0C0C",
+"8.	c #181818",
+"9.	c #282828",
+"0.	c #FEFEFE",
+"a.	c #5D5D5D",
+"b.	c #E5E5E5",
+"c.	c #848484",
+"d.	c #737373",
+"e.	c #ADADAD",
+"f.	c #8C8C8C",
+"g.	c #060606",
+"h.	c #818181",
+"i.	c #D4D4D4",
+"j.	c #CECECE",
+"k.	c #B5B5B5",
+"l.	c #9A9A9A",
+"m.	c #A5A5A5",
+"n.	c #040404",
+"o.	c #BEBEBE",
+"p.	c #919191",
+"q.	c #C6C6C6",
+"r.	c #BFBFBF",
+"s.	c #ABABAB",
+"t.	c #747474",
+"u.	c #696969",
+"v.	c #B7B7B7",
+"w.	c #B3B3B3",
+"x.	c #8F8F8F",
+"y.	c #A0A0A0",
+"z.	c #0A0A0A",
+"A.	c #2F2F2F",
+"B.	c #D8D8D8",
+"C.	c #909090",
+"D.	c #838383",
+"E.	c #AAAAAA",
+"F.	c #707070",
+"G.	c #B8B8B8",
+"H.	c #434343",
+"I.	c #858585",
+"J.	c #959595",
+"K.	c #8E8E8E",
+"L.	c #676767",
+"M.	c #BABABA",
+"N.	c #656565",
+"O.	c #B0B0B0",
+"P.	c #6B6B6B",
+"Q.	c #BCBCBC",
+"R.	c #B2B2B2",
+"S.	c #F2F2F2",
+"T.	c #D6D6D6",
+"U.	c #7D7D7D",
+"V.	c #929292",
+"W.	c #E4E4E4",
+"X.	c #D9D9D9",
+"Y.	c #757575",
+"Z.	c #9B9B9B",
+"`.	c #8A8A8A",
+" +	c #9E9E9E",
+".+	c #5A5A5A",
+"++	c #F9C66E",
+"@+	c #D5B479",
+"#+	c #D7B67E",
+"$+	c #D8B983",
+"%+	c #C2A984",
+"&+	c #B4B2B1",
+"*+	c #A19B92",
+"=+	c #C0A371",
+"-+	c #D5B67C",
+";+	c #D6B77C",
+">+	c #F5CE88",
+",+	c #FBCF80",
+"'+	c #F6BC59",
+")+	c #FFD68A",
+"!+	c #FFE6B4",
+"~+	c #FFE7B4",
+"{+	c #FFE8B4",
+"]+	c #FFE6B3",
+"^+	c #F4CC81",
+"/+	c #B5945B",
+"(+	c #B48E49",
+"_+	c #F7CC7A",
+":+	c #FFE1A2",
+"<+	c #FFE3A2",
+"[+	c #FFE4A2",
+"}+	c #FFD88B",
+"|+	c #F3A30F",
+"1+	c #FEC100",
+"2+	c #FFC814",
+"3+	c #FFCF22",
+"4+	c #FFD327",
+"5+	c #FFD527",
+"6+	c #FFD427",
+"7+	c #FFD227",
+"8+	c #FFCD21",
+"9+	c #FFC411",
+"0+	c #EFB70B",
+"a+	c #83817C",
+"b+	c #898989",
+"c+	c #757574",
+"d+	c #EDB70B",
+"e+	c #FFC607",
+"f+	c #FFCC10",
+"g+	c #FFD214",
+"h+	c #FFD416",
+"i+	c #FFD316",
+"j+	c #FFD114",
+"k+	c #FFCC11",
+"l+	c #FFC409",
+"m+	c #FFC300",
+"n+	c #FBD000",
+"o+	c #FFD700",
+"p+	c #FFDD00",
+"q+	c #FFE300",
+"r+	c #FFE600",
+"s+	c #FFE500",
+"t+	c #FFE000",
+"u+	c #FFD800",
+"v+	c #FFD300",
+"w+	c #FACA00",
+"x+	c #FEDB00",
+"y+	c #FFE900",
+"z+	c #FFE800",
+"A+	c #FFDB00",
+"B+	c #FACD00",
+"C+	c #FDE600",
+"D+	c #FEF800",
+"E+	c #FFF700",
+"F+	c #FFED00",
+"G+	c #FDE400",
+"H+	c #FFEC00",
+"I+	c #FEF400",
+"J+	c #FEEC00",
+"                                                                ",
+"                                                                ",
+"                          . + @ # $ % &                         ",
+"                      * = - ; ; ; ; ; > , '                     ",
+"                  ) ! ~ { ] ^ / / / / / / ( _                   ",
+"                : < [ } } } | 1 2 2 3 4 5 6 7 8                 ",
+"              9 0 1 } } } a b c d ] } } e f g h i               ",
+"              9 j k } } a b l m n o } e p ] k q .               ",
+"            9 9 r s } a b t < u v w e p ] ~ - x * 9             ",
+"            9 9 y z a b t ~ A B 2 | p ] ~ - C D E 9             ",
+"          9 9 9 8 F G t ~ H I J K L M ~ - N O P i 9 9           ",
+"          9 9 9 i . Q R ; S T U V W X Y Z * `  .9 9 9           ",
+"          9 9 9 9 9 Q ..+.} @.#.$.%.p &.] *.i 9 9 9 9           ",
+"        9 =.: : : 0 -.} a ;.} >.,...&.;.'.).z : : : : 9         ",
+"      9 !.) ) ) ~.p } {.].^.+./.p &.;.'.).(._.:.) ) =.<.9       ",
+"    =.) [.[.[.[.}.} } |.l 1./.2.&.;.'.).1._.3.4.5.) 9 6.7.i     ",
+"  9 =.<. .E 8.9.0.} 0.Z | a.2.b.;.'.s c.q d.6 e.f.& 7.: =.i 9   ",
+"          g.* n } } } a.2.h.b.;.i.j.2 R k.l.# m.> 0 [.          ",
+"          n.u p } } ^.o.p.q.r.s.t.u.v.3.w.x.:.y.2 x z.          ",
+"          9 A.} } B.2 C.|.z z 5 D.7 v.e.D.p.y.2 |.( !.          ",
+"            O } +.| 2.E.F.c.).G.}.k.E.H.I.x.f.|.J.K.            ",
+"            L.| | 2.b.;.M.u.1 _.3.w.}.l :.N.= p.O.P.            ",
+"            Q.R.S.&.;.T.U.O 3 3.w.}.N z 2 |.V./ y.D             ",
+"              l.q.W.X.A U.Y.Y.w.}.N z 2 |.Z./ n !               ",
+"                `.r.Y ).^ e.w.}.N z  +y.n s.6 .+                ",
+"                ++ at +#+$+%+&+G.4.O./ n *+=+-+;+>+,+'+            ",
+"            )+!+~+{+{+~+]+^+/+m.R *.(+_+:+<+[+[+<+:+}+|+        ",
+"          1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+l+m+        ",
+"          n+o+p+q+r+s+t+u+v+w+        x+p+s+y+z+q+A+o+B+        ",
+"              C+U D+E+F+G+                H+I+U J+              ",
+"                                                                ",
+"                                                                "};

Modified: tuxmath/trunk/nsis/tuxmath.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath.nsi	2009-06-06 21:05:50 UTC (rev 1011)
+++ tuxmath/trunk/nsis/tuxmath.nsi	2009-06-06 21:14:24 UTC (rev 1012)
@@ -3,7 +3,7 @@
 # modified for tuxmath by Yves Combe (yves at ycombe.net)
 # modified more for tuxmath by David Bruce <dbruce at tampabay.rr.com>
 
-!define PKG_VERSION "1.7.2"
+!define PKG_VERSION "1.7.3"
 !define PKG_PREFIX  "tuxmath"
 
 !define APP_PREFIX  "TuxMath"

Modified: tuxmath/trunk/nsis/tuxmath_with_conf.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath_with_conf.nsi	2009-06-06 21:05:50 UTC (rev 1011)
+++ tuxmath/trunk/nsis/tuxmath_with_conf.nsi	2009-06-06 21:14:24 UTC (rev 1012)
@@ -2,7 +2,7 @@
 # with a few tiny modifications by Phil Harper(philh at theopencd.org)
 # modified for tuxmath by Yves Combe (yves at ycombe.net)
 
-!define PKG_VERSION "1.7.2"
+!define PKG_VERSION "1.7.3"
 !define PKG_PREFIX  "tuxmath"
 
 !define APP_PREFIX  "TuxMath"

Modified: tuxmath/trunk/po/Makefile.in.in
===================================================================
--- tuxmath/trunk/po/Makefile.in.in	2009-06-06 21:05:50 UTC (rev 1011)
+++ tuxmath/trunk/po/Makefile.in.in	2009-06-06 21:14:24 UTC (rev 1012)
@@ -57,7 +57,7 @@
 XGETTEXT_yes = @XGETTEXT_015@
 XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
 MSGMERGE = msgmerge
-MSGMERGE_UPDATE = @MSGMERGE@ --update --previous
+MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit
 MSGCONV = msgconv
 MSGFILTER = msgfilter
@@ -395,9 +395,9 @@
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE) --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
 	cd $(srcdir); \
-	if $(MSGMERGE) --previous $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
 	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  else \

Modified: tuxmath/trunk/po/nn.gmo
===================================================================
(Binary files differ)

Modified: tuxmath/trunk/po/nn.po
===================================================================
--- tuxmath/trunk/po/nn.po	2009-06-06 21:05:50 UTC (rev 1011)
+++ tuxmath/trunk/po/nn.po	2009-06-06 21:14:24 UTC (rev 1012)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-16 18:48+0200\n"
+"POT-Creation-Date: 2009-03-06 06:12-0600\n"
 "PO-Revision-Date: 2009-04-16 18:58+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -270,107 +270,107 @@
 "eller «Mellomrom» for å dela han. Øydelegg brøkar som ikkje kan forenklast "
 "med eit enkeltskot."
 
-#: src/game.c:715
+#: src/game.c:717
 msgid "Welcome to TuxMath!"
 msgstr "Velkommen til TuxMath!"
 
-#: src/game.c:732
+#: src/game.c:734
 msgid "Your mission is to save your"
 msgstr "Oppdraget ditt er å redda"
 
-#: src/game.c:733
+#: src/game.c:735
 msgid "penguins' igloos from the"
 msgstr "igloane til pingvinane frå"
 
-#: src/game.c:734
+#: src/game.c:736
 msgid "falling comets."
 msgstr "kometar frå verdsrommet."
 
-#: src/game.c:753
+#: src/game.c:755
 msgid "Stop a comet by typing"
 msgstr "Du kan stoppa ein komet ved"
 
-#: src/game.c:754
+#: src/game.c:756
 msgid "the answer to the math problem"
 msgstr "å skriva inn svaret, og så"
 
-#: src/game.c:755
+#: src/game.c:757
 msgid "and hitting 'space' or 'enter'."
 msgstr "«Mellomrom» eller «Enter»."
 
-#: src/game.c:756
+#: src/game.c:758
 msgid "Try it now!"
 msgstr "Prøv det no!"
 
-#: src/game.c:764
+#: src/game.c:766
 msgid "Good shot!"
 msgstr "Bra skot!"
 
-#: src/game.c:774
+#: src/game.c:776
 msgid "If an igloo gets hit by a comet,"
 msgstr "Viss ein iglo vert treft av ein"
 
-#: src/game.c:775
+#: src/game.c:777
 msgid "it melts. But don't worry: the"
 msgstr "komet, smeltar han. Men ta det"
 
-#: src/game.c:776
+#: src/game.c:778
 msgid "penguin is OK!"
 msgstr "med ro: pingvinen klarer seg!"
 
-#: src/game.c:777
+#: src/game.c:779
 msgid "Just watch what happens:"
 msgstr "Berre sjå kva som skjer."
 
-#: src/game.c:778
+#: src/game.c:780
 msgid "(Press a key to start)"
 msgstr "(Trykk ein tast for å sjå.)"
 
-#: src/game.c:791
+#: src/game.c:793
 msgid "Notice the answer"
 msgstr "Legg merke til rett svar."
 
-#: src/game.c:801
+#: src/game.c:803
 msgid "If it gets hit again, the"
 msgstr "Viss igloen vert treft på nytt,"
 
-#: src/game.c:802
+#: src/game.c:804
 msgid "penguin leaves."
 msgstr "vandrar pingvinen vekk."
 
-#: src/game.c:803
+#: src/game.c:805
 msgid "(Press a key when ready)"
 msgstr "(Trykk ein tast når du er klar.)"
 
-#: src/game.c:822
+#: src/game.c:824
 msgid "You can fix the igloos"
 msgstr "Du kan byggja opp att igloane"
 
-#: src/game.c:823
+#: src/game.c:825
 msgid "by stopping bonus comets."
 msgstr "ved å stoppa bonuskometar."
 
-#: src/game.c:832
+#: src/game.c:834
 msgid "Zap it now!"
 msgstr "Skyt kometen no!"
 
-#: src/game.c:836
+#: src/game.c:838
 msgid "Great job!"
 msgstr "Kjempebra!"
 
-#: src/game.c:850
+#: src/game.c:852
 msgid "Quit at any time by pressing"
 msgstr "Du kan når som helst gje deg,"
 
-#: src/game.c:851
+#: src/game.c:853
 msgid "'Esc' or clicking the 'X'"
 msgstr "ved å trykkja «Escape» eller"
 
-#: src/game.c:852
+#: src/game.c:854
 msgid "in the upper right corner."
 msgstr "klikka på X-en oppe til høgre."
 
-#: src/game.c:853
+#: src/game.c:855
 msgid "Do it now, and then play!"
 msgstr "Prøv det no, og start spelet!"
 

Modified: tuxmath/trunk/src/game.c
===================================================================
--- tuxmath/trunk/src/game.c	2009-06-06 21:05:50 UTC (rev 1011)
+++ tuxmath/trunk/src/game.c	2009-06-06 21:14:24 UTC (rev 1012)
@@ -242,7 +242,10 @@
     }
 
     /* Most code now in smaller functions: */
+
+    // 1. Check for user input
     game_handle_user_events();
+    // 2. Update state of various game elements
     game_handle_demo();
     game_handle_answer();
     game_countdown();
@@ -252,8 +255,9 @@
     game_handle_penguins();
     game_handle_steam();
     game_handle_extra_life();
+    // 3. Redraw:
     game_draw();
-    /* figure out if we should leave loop: */
+    // 4. Figure out if we should leave loop:
     game_status = check_exit_conditions();
 
 

Modified: tuxmath/trunk/tuxmath.desktop
===================================================================
--- tuxmath/trunk/tuxmath.desktop	2009-06-06 21:05:50 UTC (rev 1011)
+++ tuxmath/trunk/tuxmath.desktop	2009-06-06 21:14:24 UTC (rev 1012)
@@ -1,15 +1,18 @@
 [Desktop Entry]
-Name=Tux Math 
+Name=Tux Math
 GenericName=Educational math game
 GenericName[de]=Mathe Spiel
 GenericName[ru]=Образовательная игра
-Comment=Tux Math - Learn math with tux!
-Comment[pl]=Tux Math - Ucz siê matematyki z tuxem!
+GenericName[fr]=Jeu mathématique
+Comment=Tux Math - Learn math with Tux!
+Comment[pl]=Tux Math - Ucz siê matematyki z Tuxem!
 Comment[de]=Tux Math - Lerne Mathe mit Tux!
 Comment[ru]=Обучение арифметике с пингвином в главной роли
+Comment[fr]=Tux Math - Apprenez les mathématiques avec Tux!
 Exec=tuxmath
 Icon=tuxmath
 Type=Application
 Terminal=false
 Categories=Education;Math;
-## X-SuSE-translate=false 
+## X-SuSE-translate=false
+X-Ubuntu-Gettext-Domain=tuxmath
\ No newline at end of file




More information about the Tux4kids-commits mailing list