[Tux4kids-commits] r1486 - in tuxmath/branches/lan: . intl nsis po

David Bruce dbruce-guest at alioth.debian.org
Fri Sep 4 19:14:27 UTC 2009


Author: dbruce-guest
Date: 2009-09-04 19:14:27 +0000 (Fri, 04 Sep 2009)
New Revision: 1486

Added:
   tuxmath/branches/lan/po/ast.po
   tuxmath/branches/lan/po/ku.po
   tuxmath/branches/lan/po/sl.po
   tuxmath/branches/lan/po/vi.po
Removed:
   tuxmath/branches/lan/nsis/tuxmath.nsi
   tuxmath/branches/lan/nsis/tuxmath_with_conf.nsi
Modified:
   tuxmath/branches/lan/
   tuxmath/branches/lan/CMakeLists.txt
   tuxmath/branches/lan/configure.ac
   tuxmath/branches/lan/intl/plural.c
   tuxmath/branches/lan/po/en_GB.po
   tuxmath/branches/lan/tuxmath.desktop
Log:
resolve merge conflicts




Property changes on: tuxmath/branches/lan
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: tuxmath/branches/lan/CMakeLists.txt
===================================================================
--- tuxmath/branches/lan/CMakeLists.txt	2009-09-04 19:07:14 UTC (rev 1485)
+++ tuxmath/branches/lan/CMakeLists.txt	2009-09-04 19:14:27 UTC (rev 1486)
@@ -112,10 +112,14 @@
   include(FindPkgConfig)
   PKG_CHECK_MODULES(RSVG librsvg-2.0)
   if(RSVG_FOUND)
-    set(HAVE_RSVG 1)  # For the config.h file
+    PKG_CHECK_MODULES(CAIRO cairo)
+    if(CAIRO_FOUND)
+      set(HAVE_RSVG 1)  # For the config.h file
+    endif(CAIRO_FOUND)
   endif(RSVG_FOUND)
 endif(PKG_CONFIG_FOUND)
 
+
 ## Run configure checks
 if (TUXMATH_BUILD_INTL)
   include(ConfigureChecksIntl)

Modified: tuxmath/branches/lan/configure.ac
===================================================================
--- tuxmath/branches/lan/configure.ac	2009-09-04 19:07:14 UTC (rev 1485)
+++ tuxmath/branches/lan/configure.ac	2009-09-04 19:14:27 UTC (rev 1486)
@@ -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)
@@ -130,7 +130,7 @@
              [AC_MSG_ERROR([SDL_ttf not found! http://www.libsdl.org/projects/SDL_ttf])])
 fi
 
-dnl Check for libRSVG. SVG support is enabled by default
+dnl Check for libRSVG and cairo. SVG support is enabled by default
 
 AC_ARG_WITH([rsvg],
             [AS_HELP_STRING([--without-rsvg],[don't use libRSVG even if available])],
@@ -141,25 +141,34 @@
   RSVG_CFLAGS=""
   RSVG_LIBS=""
   PKG_CHECK_MODULES([RSVG],
-                    [librsvg-2.0 >= 2.22],
+                    [librsvg-2.0 >= 2.18],
                     ,
                     [AC_MSG_FAILURE([libRSVG test failed (--without-rsvg to disable svg support)])])
   CFLAGS="$CFLAGS $RSVG_CFLAGS"
   LIBS="$LIBS $RSVG_LIBS"
-  AC_DEFINE([HAVE_RSVG],[1],[Define to 1 if you have the `libRSVG` library])
 fi
 
 
+if test "x$with_rsvg" = xyes; then
+  CAIRO_CFLAGS=""
+  CAIRO_LIBS=""
+  PKG_CHECK_MODULES([CAIRO],
+                    [cairo >= 1.4.10],
+                    ,
+                    [AC_MSG_FAILURE([cairo test failed (--without-rsvg to disable svg support)])])
+  CFLAGS="$CFLAGS $CAIRO_CFLAGS"
+  LIBS="$LIBS $CAIRO_LIBS"
+  AC_DEFINE([HAVE_RSVG],[1],[Define to 1 if you have the `libRSVG` library])
+fi
 
 dnl Check for (somewhat) higher-level math functions - needed for SDL_extras
-AC_CHECK_LIB([m],
-             [csin],
-             ,
-             [AC_MSG_ERROR([Math library not found - functions in <math.h> may not be available.])])
+dnl AC_CHECK_LIB([m],
+dnl              [csin],
+dnl              ,
+dnl              [AC_MSG_ERROR([Math library not found - functions in <math.h> may not be available.])])
 
 
 
-
 # --------------------------------------------------------------------------------------
 # Checks for header files.
 # --------------------------------------------------------------------------------------
@@ -273,6 +282,7 @@
 data/images/title/Makefile
 data/images/tux/Makefile
 data/images/factoroids/Makefile
+data/menus/Makefile
 data/missions/Makefile
 data/missions/arcade/Makefile
 data/missions/campaign/Makefile

Modified: tuxmath/branches/lan/intl/plural.c
===================================================================
--- tuxmath/branches/lan/intl/plural.c	2009-09-04 19:07:14 UTC (rev 1485)
+++ tuxmath/branches/lan/intl/plural.c	2009-09-04 19:14:27 UTC (rev 1486)
@@ -1,23 +1,24 @@
+/* A Bison parser, made by GNU Bison 2.3a.  */
 
-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
 /* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
+
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -28,7 +29,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -46,7 +47,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.3a"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -54,30 +55,23 @@
 /* Pure parsers.  */
 #define YYPURE 1
 
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
-#define yyparse         __gettextparse
-#define yylex           __gettextlex
-#define yyerror         __gettexterror
-#define yylval          __gettextlval
-#define yychar          __gettextchar
-#define yydebug         __gettextdebug
-#define yynerrs         __gettextnerrs
+#define yyparse __gettextparse
+#define yylex   __gettextlex
+#define yyerror __gettexterror
+#define yylval  __gettextlval
+#define yychar  __gettextchar
+#define yydebug __gettextdebug
+#define yynerrs __gettextnerrs
 
 
 /* Copy the first part of user declarations.  */
+/* Line 164 of yacc.c.  */
+#line 1 "plural.y"
 
-/* Line 189 of yacc.c  */
-#line 1 "../../intl/plural.y"
-
 /* Expression parsing for plural form selection.
    Copyright (C) 2000-2001, 2003, 2005-2006 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper at cygnus.com>, 2000.
@@ -125,9 +119,6 @@
 #define YYPARSE_PARAM	arg
 
 
-/* Line 189 of yacc.c  */
-#line 130 "../../intl/plural.c"
-
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -172,31 +163,28 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-{
+{/* Line 191 of yacc.c.  */
+#line 51 "plural.y"
 
-/* Line 214 of yacc.c  */
-#line 51 "../../intl/plural.y"
-
   unsigned long int num;
   enum expression_operator op;
   struct expression *exp;
-
-
-
-/* Line 214 of yacc.c  */
-#line 188 "../../intl/plural.c"
-} YYSTYPE;
+}
+/* Line 191 of yacc.c.  */
+#line 175 "plural.c"
+	YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
-/* Copy the second part of user declarations.  */
 
-/* Line 264 of yacc.c  */
-#line 57 "../../intl/plural.y"
 
+/* Copy the second part of user declarations.  */
+/* Line 221 of yacc.c.  */
+#line 57 "plural.y"
+
 /* Prototypes for local functions.  */
 static int yylex (YYSTYPE *lval, const char **pexp);
 static void yyerror (const char *str);
@@ -272,10 +260,9 @@
 }
 
 
+/* Line 221 of yacc.c.  */
+#line 265 "plural.c"
 
-/* Line 264 of yacc.c  */
-#line 278 "../../intl/plural.c"
-
 #ifdef short
 # undef short
 #endif
@@ -437,9 +424,9 @@
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-};
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -473,12 +460,12 @@
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+# define YYSTACK_RELOCATE(Stack)					\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -896,11 +883,11 @@
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       		       );
-      YYFPRINTF (stderr, "\n");
+      fprintf (stderr, "\n");
     }
 }
 
@@ -1180,8 +1167,10 @@
 	break;
     }
 }
+
 
 /* Prevent warnings from -Wmissing-prototypes.  */
+
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
@@ -1200,10 +1189,11 @@
 
 
 
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
 
+/*----------.
+| yyparse.  |
+`----------*/
+
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
@@ -1226,46 +1216,22 @@
 #endif
 #endif
 {
-/* The lookahead symbol.  */
+  /* The lookahead symbol.  */
 int yychar;
 
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
-    /* Number of syntax errors so far.  */
-    int yynerrs;
+/* Number of syntax errors so far.  */
+int yynerrs;
 
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-
-       Refer to the stacks thru separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    YYSIZE_T yystacksize;
-
+  int yystate;
   int yyn;
   int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
+  int yytoken = 0;
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
@@ -1273,28 +1239,51 @@
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
+
   yyssp = yyss;
   yyvsp = yyvs;
 
@@ -1324,6 +1313,7 @@
 	YYSTYPE *yyvs1 = yyvs;
 	yytype_int16 *yyss1 = yyss;
 
+
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
@@ -1331,6 +1321,7 @@
 	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
+
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -1353,8 +1344,9 @@
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -1365,6 +1357,7 @@
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
+
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -1475,9 +1468,8 @@
   switch (yyn)
     {
         case 2:
-
-/* Line 1455 of yacc.c  */
-#line 155 "../../intl/plural.y"
+/* Line 1269 of yacc.c.  */
+#line 155 "plural.y"
     {
 	    if ((yyvsp[(1) - (1)].exp) == NULL)
 	      YYABORT;
@@ -1486,90 +1478,80 @@
     break;
 
   case 3:
-
-/* Line 1455 of yacc.c  */
-#line 163 "../../intl/plural.y"
+/* Line 1269 of yacc.c.  */
+#line 163 "plural.y"
     {
 	    (yyval.exp) = new_exp_3 (qmop, (yyvsp[(1) - (5)].exp), (yyvsp[(3) - (5)].exp), (yyvsp[(5) - (5)].exp));
 	  }
     break;
 
   case 4:
-
-/* Line 1455 of yacc.c  */
-#line 167 "../../intl/plural.y"
+/* Line 1269 of yacc.c.  */
+#line 167 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 (lor, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
 	  }
     break;
 
   case 5:
-
-/* Line 1455 of yacc.c  */
-#line 171 "../../intl/plural.y"
+/* Line 1269 of yacc.c.  */
+#line 171 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 (land, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
 	  }
     break;
 
   case 6:
-
-/* Line 1455 of yacc.c  */
-#line 175 "../../intl/plural.y"
+/* Line 1269 of yacc.c.  */
+#line 175 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
 	  }
     break;
 
   case 7:
-
-/* Line 1455 of yacc.c  */
-#line 179 "../../intl/plural.y"
+/* Line 1269 of yacc.c.  */
+#line 179 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
 	  }
     break;
 
   case 8:
-
-/* Line 1455 of yacc.c  */
-#line 183 "../../intl/plural.y"
+/* Line 1269 of yacc.c.  */
+#line 183 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
 	  }
     break;
 
   case 9:
-
-/* Line 1455 of yacc.c  */
-#line 187 "../../intl/plural.y"
+/* Line 1269 of yacc.c.  */
+#line 187 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
 	  }
     break;
 
   case 10:
-
-/* Line 1455 of yacc.c  */
-#line 191 "../../intl/plural.y"
+/* Line 1269 of yacc.c.  */
+#line 191 "plural.y"
     {
 	    (yyval.exp) = new_exp_1 (lnot, (yyvsp[(2) - (2)].exp));
 	  }
     break;
 
   case 11:
-
-/* Line 1455 of yacc.c  */
-#line 195 "../../intl/plural.y"
+/* Line 1269 of yacc.c.  */
+#line 195 "plural.y"
     {
 	    (yyval.exp) = new_exp_0 (var);
 	  }
     break;
 
   case 12:
-
-/* Line 1455 of yacc.c  */
-#line 199 "../../intl/plural.y"
+/* Line 1269 of yacc.c.  */
+#line 199 "plural.y"
     {
 	    if (((yyval.exp) = new_exp_0 (num)) != NULL)
 	      (yyval.exp)->val.num = (yyvsp[(1) - (1)].num);
@@ -1577,18 +1559,16 @@
     break;
 
   case 13:
-
-/* Line 1455 of yacc.c  */
-#line 204 "../../intl/plural.y"
+/* Line 1269 of yacc.c.  */
+#line 204 "plural.y"
     {
 	    (yyval.exp) = (yyvsp[(2) - (3)].exp);
 	  }
     break;
 
 
-
-/* Line 1455 of yacc.c  */
-#line 1592 "../../intl/plural.c"
+/* Line 1269 of yacc.c.  */
+#line 1572 "plural.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1599,6 +1579,7 @@
 
   *++yyvsp = yyval;
 
+
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -1761,7 +1742,7 @@
   yyresult = 1;
   goto yyreturn;
 
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -1798,11 +1779,10 @@
 }
 
 
+/* Line 1486 of yacc.c.  */
+#line 209 "plural.y"
 
-/* Line 1675 of yacc.c  */
-#line 209 "../../intl/plural.y"
 
-
 void
 internal_function
 FREE_EXPRESSION (struct expression *exp)

Deleted: tuxmath/branches/lan/nsis/tuxmath.nsi
===================================================================
--- tuxmath/branches/lan/nsis/tuxmath.nsi	2009-09-04 19:07:14 UTC (rev 1485)
+++ tuxmath/branches/lan/nsis/tuxmath.nsi	2009-09-04 19:14:27 UTC (rev 1486)
@@ -1,123 +0,0 @@
-# vim: noai et ts=4 tw=0
-# with a few tiny modifications by Phil Harper(philh at theopencd.org)
-# 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_PREFIX  "tuxmath"
-
-!define APP_PREFIX  "TuxMath"
-!define APP_EXE     "${APP_PREFIX}.exe"
-!define APP_NAME    "Tux of Math Command"
-
-OutFile     "${PKG_PREFIX}-${PKG_VERSION}-win32-installer.exe"
-Name        "${APP_NAME}"
-Caption     ""
-CRCCheck    on
-WindowIcon  off
-BGGradient  off
-
-# Default to not silent
-SilentInstall   normal
-SilentUnInstall normal
-
-# Various default text options
-MiscButtonText
-InstallButtonText
-FileErrorText
-
-# Default installation dir and registry key of install directory
-InstallDir  "$PROGRAMFILES\${APP_PREFIX}"
-InstallDirRegKey HKLM SOFTWARE\${APP_PREFIX} "Install_Dir"
-
-# Licence text
-LicenseText "Please read the terms of the General Public License before installing ${APP_NAME}"
-LicenseData "mingw32\doc\COPYING.txt"
-
-# Directory browsing
-# DirShow           show
-ComponentText       "This will install ${APP_NAME} on your computer. Select which optional things you want installed."
-DirText             "Choose a directory to install ${APP_NAME} in to:"
-AllowRootDirInstall false
-
-# Install page stuff
-InstProgressFlags   smooth
-AutoCloseWindow     true
-
-Section
-  SetOutPath $INSTDIR
-  File "mingw32\${APP_EXE}"
-  File "mingw32\*.dll"
-  SetOutPath $INSTDIR\data
-  File /r "mingw32\data\*.*"
-  SetOutPath $INSTDIR\doc
-  File /r "mingw32\doc\*.*"
-  SetOutPath $INSTDIR\locale
-  File /r "mingw32\locale\*.*"
-
-  WriteRegStr HKLM SOFTWARE\${APP_PREFIX} \
-                   "Install_Dir" \ 
-                   "$INSTDIR"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}" \
-                   "DisplayName" \
-                   "${APP_NAME} (remove only)"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}" \
-                   "UninstallString"  \ 
-                   '"$INSTDIR\uninstall.exe"'
-  WriteUninstaller "uninstall.exe"
-SectionEnd
-
-
-Section "Start Menu Shortcuts"
-  SetShellVarContext all
-  SetOutPath $INSTDIR
-  CreateDirectory "$SMPROGRAMS\${APP_NAME}"
-  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Full Screen).lnk" \
-                  "$INSTDIR\${APP_EXE}" \
-                  "-f" \
-                  "$INSTDIR\data\images\icons\tuxmath.ico" \
-                  0 "" ""  \
-                  "Start TuxMath in Fullscreen mode"
-
-  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Windowed).lnk" \
-                  "$INSTDIR\${APP_EXE}" \
-                  "-w" \
-                  "$INSTDIR\data\images\icons\tuxmath.ico"  \ 
-                  0 "" "" \
-                  "Start TuxMath in a Window"
-
-  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" \
-                  "$INSTDIR\uninstall.exe" ""  \ 
-                  "$INSTDIR\uninstall.exe" 0 "" "" \
-                  "Remove Tux of Math Command"
-SectionEnd
-
-Section "Desktop Shortcut"
-  SetShellVarContext all
-  SetOutPath $INSTDIR
-  CreateShortCut "$DESKTOP\${APP_NAME}.lnk" \
-                 "$INSTDIR\${APP_EXE}"  ""  \
-                 "$INSTDIR\data\images\icons\tuxmath.ico" \
-                 0  "" ""  \ 
-                 "Run Tux of Math Command"
-SectionEnd
-
-# Uninstall stuff
-
-UninstallText "This will uninstall ${APP_NAME}. Hit 'Uninstall' to continue."
-
-# special uninstall section.
-Section "Uninstall"
-  SetShellVarContext all
-# remove registry keys
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}"
-  DeleteRegKey HKLM SOFTWARE\${APP_PREFIX}
-
-  RMDir  /r "$INSTDIR\data"
-  RMDir  /r "$INSTDIR\doc"
-  Delete    "$INSTDIR\*.*"
-
-  Delete "$DESKTOP\${APP_NAME}.lnk"
-  Delete "$SMPROGRAMS\${APP_NAME}\*.*"
-  RMDir  "$SMPROGRAMS\${APP_NAME}"
-SectionEnd

Deleted: tuxmath/branches/lan/nsis/tuxmath_with_conf.nsi
===================================================================
--- tuxmath/branches/lan/nsis/tuxmath_with_conf.nsi	2009-09-04 19:07:14 UTC (rev 1485)
+++ tuxmath/branches/lan/nsis/tuxmath_with_conf.nsi	2009-09-04 19:14:27 UTC (rev 1486)
@@ -1,114 +0,0 @@
-# vim: noai et ts=4 tw=0
-# 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_PREFIX  "tuxmath"
-
-!define APP_PREFIX  "TuxMath"
-!define APP_EXE     "${APP_PREFIX}.exe"
-!define APP_NAME    "Tux of Math Command"
-
-!define CONF_EXE     "tuxmath_config.exe"
-!define CONF_DIR     "TuxMathConfig"
-
-OutFile     "${PKG_PREFIX}-${PKG_VERSION}-with-config-win32-installer.exe"
-Name        "${APP_NAME}"
-Caption     ""
-CRCCheck    on
-WindowIcon  off
-BGGradient  off
-
-# Default to not silent
-SilentInstall   normal
-SilentUnInstall normal
-
-# Various default text options
-MiscButtonText
-InstallButtonText
-FileErrorText
-
-# Default installation dir and registry key of install directory
-InstallDir  "$PROGRAMFILES\${APP_PREFIX}"
-InstallDirRegKey HKLM SOFTWARE\${APP_PREFIX} "Install_Dir"
-
-# Licence text
-LicenseText "You must agree to this license before installing ${APP_NAME}"
-LicenseData "docs\COPYING.txt"
-
-# Directory browsing
-# DirShow           show
-ComponentText       "This will install ${APP_NAME} on your computer. Select which optional things you want installed."
-DirText             "Choose a directory to install ${APP_NAME} in to:"
-AllowRootDirInstall false
-
-# Install page stuff
-InstProgressFlags   smooth
-AutoCloseWindow     true
-
-Section
-  SetOutPath $INSTDIR
-  File "mingw32\${APP_EXE}"
-  File "mingw32\*.dll"
-  SetOutPath $INSTDIR\data
-  File /r "data\*.*"
-  SetOutPath $INSTDIR\docs
-  File "docs\COPYING.txt"
-  SetOutPath $INSTDIR\${CONF_DIR}
-  File "mingw32\TuxMathConfig\*.*"
-
-  WriteRegStr HKLM SOFTWARE\${APP_PREFIX} "Install_Dir" "$INSTDIR"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}" "DisplayName" "${APP_NAME} (remove only)"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}" "UninstallString" '"$INSTDIR\uninstall.exe"'
-  WriteUninstaller "uninstall.exe"
-SectionEnd
-
-
-Section "Start Menu Shortcuts"
-  SetShellVarContext all
-  SetOutPath $INSTDIR
-  CreateDirectory "$SMPROGRAMS\${APP_NAME}"
-  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Full Screen).lnk" "$INSTDIR\${APP_EXE}" "-f" "$INSTDIR\${APP_EXE}" 0 "" "" "Start TuxMath in Fullscreen mode"
-  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Windowed).lnk" "$INSTDIR\${APP_EXE}" "-w" "$INSTDIR\${APP_EXE}" 0 "" "" "Start TuxMath in a Window"
-  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\Configure TuxMath.lnk" "$INSTDIR\${CONF_DIR}\${CONF_EXE}" "-w" "$INSTDIR\${CONF_DIR}\${CONF_EXE}" 0 "" "" "Configure TuxMath"
-  CreateShortCut  "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 "" "" "Remove Tux of Math Command"
-SectionEnd
-
-
-Section "Desktop Shortcut"
-  SetShellVarContext all
-  SetOutPath $INSTDIR
-  CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${APP_EXE}" "" "$INSTDIR\${APP_EXE}" 0  "" "" "Run Tux of Math Command"
-SectionEnd
-
-;Function .onInstSuccess
-;  BringToFront
-;  MessageBox MB_YESNO|MB_ICONQUESTION \
-;             "${APP_NAME} was installed. Would you like to run ${APP_NAME} now ?" \
-;             IDNO NoExec
-;    Exec '$INSTDIR\${APP_EXE}'
-;  NoExec:
-;FunctionEnd
-
-; uninstall stuff
-
-UninstallText "This will uninstall ${APP_NAME}. Hit 'Uninstall' to continue."
-
-; special uninstall section.
-Section "Uninstall"
-  SetShellVarContext all
-  ; remove registry keys
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}"
-  DeleteRegKey HKLM SOFTWARE\${APP_PREFIX}
-
-  RMDir  /r "$INSTDIR\data"
-  RMDir  /r "$INSTDIR\docs"
-  RMDir  /r "$INSTDIR\${CONF_DIR}"
-  Delete    "$INSTDIR\*.*"
-
-  Delete "$DESKTOP\${APP_NAME}.lnk"
-  Delete "$SMPROGRAMS\${APP_NAME}\*.*"
-  RMDir  "$SMPROGRAMS\${APP_NAME}"
-SectionEnd
-
-

Added: tuxmath/branches/lan/po/ast.po
===================================================================
--- tuxmath/branches/lan/po/ast.po	                        (rev 0)
+++ tuxmath/branches/lan/po/ast.po	2009-09-04 19:14:27 UTC (rev 1486)
@@ -0,0 +1,458 @@
+# Asturian translation for tuxmath
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the tuxmath package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tuxmath\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
+"POT-Creation-Date: 2008-05-17 06:44-0400\n"
+"PO-Revision-Date: 2009-06-10 00:46+0000\n"
+"Last-Translator: Xuacu <xuacusk8 at gmail.com>\n"
+"Language-Team: Asturian <ast at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-06-24 22:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/game.c:663
+msgid "Welcome to TuxMath!"
+msgstr "¡Bienveníu a TuxMath!"
+
+#: src/game.c:680
+msgid "Your mission is to save your"
+msgstr "To misión ye salvar los"
+
+#: src/game.c:681
+msgid "penguins' igloos from the"
+msgstr "iglús de tos pingüinos de"
+
+#: src/game.c:682
+msgid "falling comets."
+msgstr "los cometes que caen."
+
+#: src/game.c:701
+msgid "Stop a comet by typing"
+msgstr "Para los cometes escribiendo"
+
+#: src/game.c:702
+msgid "the answer to the math problem"
+msgstr "la rempuesta al problema matemáticu"
+
+#: src/game.c:703
+msgid "and hitting 'space' or 'enter'."
+msgstr "y calcando Espaciu o Intro."
+
+#: src/game.c:704
+msgid "Try it now!"
+msgstr "¡Téntalo agora!"
+
+#: src/game.c:712
+msgid "Good shot!"
+msgstr "¡Bon tiru!"
+
+#: src/game.c:722
+msgid "If an igloo gets hit by a comet,"
+msgstr "Si un cometa golpea un iglú,"
+
+#: src/game.c:723
+msgid "it melts. But don't worry: the"
+msgstr "derrítese. Pero nun t'esmuelas:"
+
+#: src/game.c:724
+msgid "penguin is OK!"
+msgstr "¡el pingüinu tará bien!"
+
+#: src/game.c:725
+msgid "Just watch what happens:"
+msgstr "Sólo mira lo que pasa:"
+
+#: src/game.c:726
+msgid "(Press a key to start)"
+msgstr "(Calca una tecla pa entamar)"
+
+#: src/game.c:739
+msgid "Notice the answer"
+msgstr "Mira la rempuesta"
+
+#: src/game.c:749
+msgid "If it gets hit again, the"
+msgstr "Si vuelve a golpealu,"
+
+#: src/game.c:750
+msgid "penguin leaves."
+msgstr "el pingüinu marcha."
+
+#: src/game.c:751
+msgid "(Press a key when ready)"
+msgstr "(Calca una tecla cuando teas preparáu)"
+
+#: src/game.c:770
+msgid "You can fix the igloos"
+msgstr "Puedes iguar los iglús"
+
+#: src/game.c:771
+msgid "by stopping bonus comets."
+msgstr "parando los cometes de bonus."
+
+#: src/game.c:780
+msgid "Zap it now!"
+msgstr "¡Golpéalu agora!"
+
+#: src/game.c:784
+msgid "Great job!"
+msgstr "¡Bon trabayu!"
+
+#: src/game.c:798
+msgid "Quit at any time by pressing"
+msgstr "Puedes colar en cualquier momentu calcando"
+
+#: src/game.c:799
+msgid "'Esc' or clicking the 'X'"
+msgstr "«Esc» o nel iconu de la X"
+
+#: src/game.c:800
+msgid "in the upper right corner."
+msgstr "del requexu cimeru derechu."
+
+#: src/game.c:801
+msgid "Do it now, and then play!"
+msgstr "¡Failo agora, y llueu xuega!"
+
+#: src/titlescreen.c:407
+msgid "Work In Progress!"
+msgstr "¡En preparación!"
+
+#: src/titlescreen.c:408
+msgid "This feature is not ready yet"
+msgstr "Esta carauterística entá nun ta llista"
+
+#: src/titlescreen.c:409
+msgid "Discuss the future of TuxMath at"
+msgstr "Discute'l futuru de TuxMath en"
+
+#: src/titlescreen.c:410
+msgid "tuxmath-devel at lists.sourceforge.net"
+msgstr "tuxmath-devel at lists.sourceforge.net"
+
+#: src/titlescreen.c:578
+msgid "Math Command Training Academy"
+msgstr "Academia d'entrenamientu d'ordes matemátiques"
+
+#: src/titlescreen.c:579
+msgid "Play Arcade Game"
+msgstr "Xugar partida"
+
+#: src/titlescreen.c:580
+msgid "Play Custom Game"
+msgstr "Xugar partida personalizada"
+
+#: src/titlescreen.c:581
+msgid "Help"
+msgstr "Aida"
+
+#: src/titlescreen.c:582
+msgid "More Options"
+msgstr "Más opciones"
+
+#: src/titlescreen.c:583
+msgid "Quit"
+msgstr "Colar"
+
+#: src/titlescreen.c:653
+msgid "Space Cadet"
+msgstr "Cadete espacial"
+
+#: src/titlescreen.c:654
+msgid "Scout"
+msgstr "Esplorador"
+
+#: src/titlescreen.c:655
+msgid "Ranger"
+msgstr "Rastrexador"
+
+#: src/titlescreen.c:656
+msgid "Ace"
+msgstr "As"
+
+#: src/titlescreen.c:657
+msgid "Hall Of Fame"
+msgstr "Cuadru d'honor"
+
+#: src/titlescreen.c:658
+msgid "Main menu"
+msgstr "Menú principal"
+
+#: src/titlescreen.c:739
+msgid "Edit 'options' file in your home directory"
+msgstr "¡Editar el ficheru «options» del direutoriu personal"
+
+#: src/titlescreen.c:740
+msgid "to create customized game!"
+msgstr "pa crear un xuegu personalizáu!"
+
+#: src/titlescreen.c:741
+msgid "Press a key or click your mouse to start game."
+msgstr "Calca una tecla o el mur pa entamar el xuegu."
+
+#: src/titlescreen.c:742
+msgid "See README.txt for more information"
+msgstr "Llee'l ficheru «README.txt» pa más información"
+
+#: src/titlescreen.c:773
+msgid "Demo"
+msgstr "Demostración"
+
+#: src/titlescreen.c:774
+msgid "Project Info"
+msgstr "Información del proyeutu"
+
+#: src/titlescreen.c:775
+msgid "Credits"
+msgstr "Créitos"
+
+#: src/titlescreen.c:776
+msgid "Main Menu"
+msgstr "Menú principal"
+
+#: src/titlescreen.c:822
+msgid "TuxMath is free and open-source!"
+msgstr "¡TuxMath ye llibre y de códigu abiertu!"
+
+#: src/titlescreen.c:823
+msgid "You can help make it better by reporting problems,"
+msgstr "Puedes aidar a meyoralu informando de los problemes,"
+
+#: src/titlescreen.c:824
+msgid "suggesting improvements, or adding code."
+msgstr "proponiendo meyores, o añadiendo códigu."
+
+#: src/titlescreen.c:825
+msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+msgstr "Discute'l futuru en tuxmath-devel at lists.sourceforge.net"
+
+#: data/missions/lessons/descr_lessons:1
+msgid "Number Typing"
+msgstr "Escribir númberos"
+
+#: data/missions/lessons/descr_lessons:2
+msgid "Addition: 1 to 3"
+msgstr "Suma: 1 a 3"
+
+#: data/missions/lessons/descr_lessons:3
+msgid "Addition: 0 to 5"
+msgstr "Suma: 0 a 5"
+
+#: data/missions/lessons/descr_lessons:4
+msgid "Addition: Sums to 10"
+msgstr "Suma: Sumes a 10"
+
+#: data/missions/lessons/descr_lessons:5
+msgid "Addition: Sums to 15"
+msgstr "Suma: Sumes a 15"
+
+#: data/missions/lessons/descr_lessons:6
+msgid "Addition: Sums to 20"
+msgstr "Suma: Sumes a 20"
+
+#: data/missions/lessons/descr_lessons:7
+msgid "Addition: Two Digit Numbers"
+msgstr "Suma: Númberos de dos díxitos"
+
+#: data/missions/lessons/descr_lessons:8
+msgid "Addition: Missing Numbers"
+msgstr "Suma: Númberos faltantes"
+
+#: data/missions/lessons/descr_lessons:9
+msgid "Subtraction: 0 to 10"
+msgstr "Resta: 0 a 10"
+
+#: data/missions/lessons/descr_lessons:10
+msgid "Subtraction: 0 to 20"
+msgstr "Resta: 0 a 20"
+
+#: data/missions/lessons/descr_lessons:11
+msgid "Subtraction: Two Digit Numbers"
+msgstr "Resta: Númberos de dos díxitos"
+
+#: data/missions/lessons/descr_lessons:12
+msgid "Addition and Subtraction Review"
+msgstr "Revisión de Suma y Resta."
+
+#: data/missions/lessons/descr_lessons:13
+msgid "Multiplication: 0 to 3"
+msgstr "Multiplicación: 0 a 3"
+
+#: data/missions/lessons/descr_lessons:14
+msgid "Multiples of 2"
+msgstr "Múltiplos de 2"
+
+#: data/missions/lessons/descr_lessons:15
+msgid "Multiples of 3"
+msgstr "Múltiplos de 3"
+
+#: data/missions/lessons/descr_lessons:16
+msgid "Multiples of 4"
+msgstr "Múltiplos de 4"
+
+#: data/missions/lessons/descr_lessons:17
+msgid "Multiples of 5"
+msgstr "Múltiplos de 5"
+
+#: data/missions/lessons/descr_lessons:18
+msgid "Multiplication: 0 to 5"
+msgstr "Multiplicación: 0 a 5"
+
+#: data/missions/lessons/descr_lessons:19
+msgid "Multiples of 6"
+msgstr "Múltiplos de 6"
+
+#: data/missions/lessons/descr_lessons:20
+msgid "Multiples of 7"
+msgstr "Múltiplos de 7"
+
+#: data/missions/lessons/descr_lessons:21
+msgid "Multiplication: 0 to 7"
+msgstr "Multiplicación: 0 a 7"
+
+#: data/missions/lessons/descr_lessons:22
+msgid "Multiples of 8"
+msgstr "Múltiplos de 8"
+
+#: data/missions/lessons/descr_lessons:23
+msgid "Multiples of 9"
+msgstr "Múltiplos de 9"
+
+#: data/missions/lessons/descr_lessons:24
+msgid "Multiples of 10"
+msgstr "Múltiplos de 10"
+
+#: data/missions/lessons/descr_lessons:25
+msgid "Multiplication: 0 to 10"
+msgstr "Multiplicación: 0 a 10"
+
+#: data/missions/lessons/descr_lessons:26
+msgid "Multiples of 11 and 12"
+msgstr "Múltiplos de 11 y 12"
+
+#: data/missions/lessons/descr_lessons:27
+msgid "Multiplication: 0 to 12"
+msgstr "Multiplicación: 0 a 12"
+
+#: data/missions/lessons/descr_lessons:28
+msgid "Multiples of 13, 14, and 15"
+msgstr "Múltiplos de 13, 14 y 15"
+
+#: data/missions/lessons/descr_lessons:29
+msgid "Multiplication: 0 to 15"
+msgstr "Multiplicación: 0 a 15"
+
+#: data/missions/lessons/descr_lessons:30
+msgid "Multiplication: Missing Numbers"
+msgstr "Multiplicación: Númberos faltantes"
+
+#: data/missions/lessons/descr_lessons:31
+msgid "Division by 2"
+msgstr "División por 2"
+
+#: data/missions/lessons/descr_lessons:32
+msgid "Division by 3"
+msgstr "División por 3"
+
+#: data/missions/lessons/descr_lessons:33
+msgid "Division by 4"
+msgstr "División por 4"
+
+#: data/missions/lessons/descr_lessons:34
+msgid "Division by 5"
+msgstr "División por 5"
+
+#: data/missions/lessons/descr_lessons:35
+msgid "Division: 1 to 5"
+msgstr "División: 1 a 5"
+
+#: data/missions/lessons/descr_lessons:36
+msgid "Division by 6"
+msgstr "División por 6"
+
+#: data/missions/lessons/descr_lessons:37
+msgid "Division by 7"
+msgstr "División por 7"
+
+#: data/missions/lessons/descr_lessons:38
+msgid "Division by 8"
+msgstr "División por 8"
+
+#: data/missions/lessons/descr_lessons:39
+msgid "Division by 9"
+msgstr "División por 9"
+
+#: data/missions/lessons/descr_lessons:40
+msgid "Division by 10"
+msgstr "División por 10"
+
+#: data/missions/lessons/descr_lessons:41
+msgid "Division: 1 to 10"
+msgstr "División: 1 a 10"
+
+#: data/missions/lessons/descr_lessons:42
+msgid "Division by 11 and 12"
+msgstr "División por 11 y 12"
+
+#: data/missions/lessons/descr_lessons:43
+msgid "Division: 1 to 12"
+msgstr "División: 1 a 12"
+
+#: data/missions/lessons/descr_lessons:44
+msgid "Division by 13, 14, and 15"
+msgstr "División por 13, 14, y 15"
+
+#: data/missions/lessons/descr_lessons:45
+msgid "Division: 1 to 15"
+msgstr "División: 1 a 15"
+
+#: data/missions/lessons/descr_lessons:46
+msgid "Multiplication and Division Review"
+msgstr "Revisión de Multiplicación y División"
+
+#: data/missions/lessons/descr_lessons:47
+msgid "Typing Negative Numbers"
+msgstr "Escribir númberos negativos"
+
+#: data/missions/lessons/descr_lessons:48
+msgid "Subtraction: Negative Answers"
+msgstr "Resta: Rempuestes negatives"
+
+#: data/missions/lessons/descr_lessons:49
+msgid "Adding Negatives to Positives"
+msgstr "Añadiendo negativos a positivos"
+
+#: data/missions/lessons/descr_lessons:50
+msgid "Subtracting Negatives From Positives"
+msgstr "Sustrayendo negativos de positivos"
+
+#: data/missions/lessons/descr_lessons:51
+msgid "Adding Negatives to Negatives"
+msgstr "Añadiendo negativos a negativos"
+
+#: data/missions/lessons/descr_lessons:52
+msgid "Subtracting Negatives From Negatives"
+msgstr "Sustrayendo negativos de negativos"
+
+#: data/missions/lessons/descr_lessons:53
+msgid "Negative and Positive Numbers Review"
+msgstr "Revisión de númberos negativos y positivos"
+
+#: data/missions/lessons/descr_lessons:54
+msgid "Multiplication and Division of Negatives"
+msgstr "Multiplicación y división de negativos"
+
+#: data/missions/lessons/descr_lessons:55
+msgid "Multiplication of Positives and Negatives"
+msgstr "Multiplicación de positivos y negativos"
+
+#: data/missions/lessons/descr_lessons:56
+msgid "Division of Positives and Negatives"
+msgstr "División de positivos y negativos"

Modified: tuxmath/branches/lan/po/en_GB.po
===================================================================
--- tuxmath/branches/lan/po/en_GB.po	2009-09-04 19:07:14 UTC (rev 1485)
+++ tuxmath/branches/lan/po/en_GB.po	2009-09-04 19:14:27 UTC (rev 1486)
@@ -5,8 +5,8 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-03-06 06:12-0600\n"
-"PO-Revision-Date: 2008-05-09 21:05+0200\n"
-"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
+"PO-Revision-Date: 2009-06-24 20:33+0100\n"
+"Last-Translator: Caroline Ford <caroline.ford.work at googlemail.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,227 +18,203 @@
 
 #: src/campaign.c:30
 msgid "Congratulations! You win!"
-msgstr ""
+msgstr "Congratulations! You win!"
 
 #: src/campaign.c:48
 msgid "Round"
-msgstr ""
+msgstr "Round"
 
-#: src/campaign.c:115 src/campaign.c:127 src/campaign.c:148 src/campaign.c:159
+#: src/campaign.c:115
+#: src/campaign.c:127
+#: src/campaign.c:148
+#: src/campaign.c:159
 msgid "-[Esc] to skip"
-msgstr ""
+msgstr "-[Esc] to skip"
 
 #: src/campaign.c:116
 msgid "Mission One: Careful Cadet"
-msgstr ""
+msgstr "Mission One: Careful Cadet"
 
 #: src/campaign.c:118
 msgid "I'm so glad you've come!"
-msgstr ""
+msgstr "I'm so glad you've come!"
 
 #: src/campaign.c:120
-msgid ""
-"The penguins need your help! Comets are falling from the sky, and are "
-"melting the penguins' igloos. To save their homes, we need you to find the "
-"secret code that will zap each comet."
-msgstr ""
+msgid "The penguins need your help! Comets are falling from the sky, and are melting the penguins' igloos. To save their homes, we need you to find the secret code that will zap each comet."
+msgstr "The penguins need your help! Comets are falling from the sky, and are melting the penguins' igloos. To save their homes, we need you to find the secret code that will zap each comet."
 
 #: src/campaign.c:122
 msgid "Do your best!"
-msgstr ""
+msgstr "Do your best!"
 
 #: src/campaign.c:128
 msgid "Mission Two: Smart Scout"
-msgstr ""
+msgstr "Mission Two: Smart Scout"
 
 #: src/campaign.c:130
-msgid ""
-"Great job! Since you saved the penguins' homes, we are promoting you to "
-"Scout. Scouts are good for keeping an eye out for trouble..."
-msgstr ""
+msgid "Great job! Since you saved the penguins' homes, we are promoting you to Scout. Scouts are good for keeping an eye out for trouble..."
+msgstr "Great job! Since you saved the penguins' homes, we are promoting you to Scout. Scouts are good for keeping an eye out for trouble..."
 
 #: src/campaign.c:132
-msgid ""
-"...like what's happening right now! The TakeAways have come, and they're "
-"sending new, trickier comets against the penguins!"
-msgstr ""
+msgid "...like what's happening right now! The TakeAways have come, and they're sending new, trickier comets against the penguins!"
+msgstr "...like what's happening right now! The TakeAways have come, and they're sending new, trickier comets against the penguins!"
 
 #: src/campaign.c:133
 msgid "But you can save them!"
-msgstr ""
+msgstr "But you can save them!"
 
 #: src/campaign.c:139
 msgid "Mission Three: Royal Ranger"
-msgstr ""
+msgstr "Mission Three: Royal Ranger"
 
 #: src/campaign.c:141
-msgid ""
-"You've done it again! The Penguin Emperor has chosen you to join his team of "
-"Rangers that help protect the city.  We're sending you there now..."
-msgstr ""
+msgid "You've done it again! The Penguin Emperor has chosen you to join his team of Rangers that help protect the city.  We're sending you there now..."
+msgstr "You've done it again! The Penguin Emperor has chosen you to join his team of Rangers that help protect the city.  We're sending you there now..."
 
 #: src/campaign.c:143
-msgid ""
-"...oh no! Now the Emperor himself is under attack, from new types of comets: "
-"these problems are multiplying! To fight these, you need great skill. We "
-"think you can do it. Join the Rangers and help save the city!"
-msgstr ""
+msgid "...oh no! Now the Emperor himself is under attack, from new types of comets: these problems are multiplying! To fight these, you need great skill. We think you can do it. Join the Rangers and help save the city!"
+msgstr "...oh no! Now the Emperor himself is under attack, from new types of comets: these problems are multiplying! To fight these, you need great skill. We think you can do it. Join the Rangers and help save the city!"
 
 #: src/campaign.c:149
 msgid "Mission Four: Imperial Ace"
-msgstr ""
+msgstr "Mission Four: Imperial Ace"
 
 #: src/campaign.c:151
-msgid ""
-"You did it! The Emperor wants to thank you in person. We are taking you to "
-"his ice palace for a great honor: you will become the Imperial Ace!"
-msgstr ""
+msgid "You did it! The Emperor wants to thank you in person. We are taking you to his ice palace for a great honor: you will become the Imperial Ace!"
+msgstr "You did it! The Emperor wants to thank you in person. We are taking you to his ice palace for a great honor: you will become the Imperial Ace!"
 
 #: src/campaign.c:153
-msgid ""
-"But right in the middle of the ceremony, a new attack from the land of "
-"Division starts!"
-msgstr ""
+msgid "But right in the middle of the ceremony, a new attack from the land of Division starts!"
+msgstr "But right in the middle of the ceremony, a new attack from the land of Division starts!"
 
 #: src/campaign.c:154
 msgid "Now is no time for resting; the city needs your help!"
-msgstr ""
+msgstr "Now is no time for resting; the city needs your help!"
 
 #: src/campaign.c:160
 msgid "Final Mission: Computing Commando"
-msgstr ""
+msgstr "Final Mission: Computing Commando"
 
 #: src/campaign.c:162
-msgid ""
-"Penguin scientists have learned that all these attacks are coming from a "
-"secret base, and they need you to go fight the final battle. They also give "
-"you this clue: first do multiplication and division, and then do addition "
-"and subtraction."
-msgstr ""
+msgid "Penguin scientists have learned that all these attacks are coming from a secret base, and they need you to go fight the final battle. They also give you this clue: first do multiplication and division, and then do addition and subtraction."
+msgstr "Penguin scientists have learned that all these attacks are coming from a secret base, and they need you to go fight the final battle. They also give you this clue: first do multiplication and division, and then do addition and subtraction."
 
 #: src/campaign.c:163
 msgid "I hope that hint helps!"
-msgstr ""
+msgstr "I hope that hint helps!"
 
 #: src/campaign.c:165
 msgid "This is it! You can stop these attacks forever, Commando!"
-msgstr ""
+msgstr "This is it! You can stop these attacks forever, Commando!"
 
 #: src/campaign.c:229
 msgid "Sorry, try again!"
-msgstr ""
+msgstr "Sorry, try again!"
 
 #: src/campaign.c:236
 msgid "Mission accomplished. The galaxy is safe!"
-msgstr ""
+msgstr "Mission accomplished. The galaxy is safe!"
 
 #: src/credits.c:35
 msgid "TUX, OF MATH COMMAND"
-msgstr ""
+msgstr "TUX, OF MATH COMMAND"
 
 #: src/credits.c:36
 msgid "COPYRIGHT 2001-2009"
-msgstr ""
+msgstr "COPYRIGHT 2001-2009"
 
 #: src/credits.c:38
 msgid "PART OF THE 'TUX4KIDS' PROJECT"
-msgstr ""
+msgstr "PART OF THE 'TUX4KIDS' PROJECT"
 
 #: src/credits.c:41
 msgid "DESIGNED BY"
-msgstr ""
+msgstr "DESIGNED BY"
 
 #: src/credits.c:44
 msgid "LEAD PROGRAMMERS"
-msgstr ""
+msgstr "LEAD PROGRAMMERS"
 
 #: src/credits.c:50
 msgid "ADDITIONAL CODE"
-msgstr ""
+msgstr "ADDITIONAL CODE"
 
 #: src/credits.c:61
 msgid "LEAD ARTIST"
-msgstr ""
+msgstr "LEAD ARTIST"
 
 #: src/credits.c:64
 msgid "ADDITIONAL ART"
-msgstr ""
+msgstr "ADDITIONAL ART"
 
 #: src/credits.c:68
 msgid "SOUND EFFECTS"
-msgstr ""
+msgstr "SOUND EFFECTS"
 
 #: src/credits.c:71
 msgid "MUSIC"
-msgstr ""
+msgstr "MUSIC"
 
 #: src/credits.c:81
 msgid "PACKAGERS"
-msgstr ""
+msgstr "PACKAGERS"
 
 #: src/credits.c:86
 msgid "'TUX' THE PENGUIN CREATED BY"
-msgstr ""
+msgstr "'TUX' THE PENGUIN CREATED BY"
 
 #: src/credits.c:89
 msgid "TESTERS"
-msgstr ""
+msgstr "TESTERS"
 
 #: src/credits.c:101
 msgid "WEBSITE"
-msgstr ""
+msgstr "WEBSITE"
 
 #: src/credits.c:104
-msgid ""
-"TuxMath is Free Software licensed under the GNU General Public License "
-"(GPL). As such, you are specifically granted the rights that are usually "
-"denied to users of proprietary software."
-msgstr ""
+msgid "TuxMath is Free Software licensed under the GNU General Public License (GPL). As such, you are specifically granted the rights that are usually denied to users of proprietary software."
+msgstr "TuxMath is Free Software licensed under the GNU General Public License (GPL). As such, you are specifically granted the rights that are usually denied to users of proprietary software."
 
 #: src/credits.c:106
-msgid ""
-"These rights include the freedom to study, copy, modify, and redistribute "
-"the program."
-msgstr ""
+msgid "These rights include the freedom to study, copy, modify, and redistribute the program."
+msgstr "These rights include the freedom to study, copy, modify, and redistribute the program."
 
 #: src/credits.c:108
-msgid ""
-"A full copy of the GPL is included with the documenation for this program."
-msgstr ""
+msgid "A full copy of the GPL is included with the documenation for this program."
+msgstr "A full copy of the GPL is included with the documenation for this program."
 
 #: src/credits.c:110
 msgid "For more information about Free Software and the GNU GPL, visit:"
-msgstr ""
+msgstr "For more information about Free Software and the GNU GPL, visit:"
 
 #: src/factoroids.c:558
 msgid "FACTOROIDS: to win, you need destroy all the asteroids."
-msgstr ""
+msgstr "FACTOROIDS: to win, you need destroy all the asteroids."
 
-#: src/factoroids.c:559 src/factoroids.c:570
+#: src/factoroids.c:559
+#: src/factoroids.c:570
 msgid "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
-msgstr ""
+msgstr "Use the arrow keys to turn or go forward.  Aim at an asteroid,"
 
 #: src/factoroids.c:560
 msgid "type one of its factors, and press space or return"
-msgstr ""
+msgstr "type one of its factors, and press space or return"
 
 #: src/factoroids.c:561
 msgid "to split it into its factors.  Rocks with prime numbers are destroyed!"
-msgstr ""
+msgstr "to split it into its factors.  Rocks with prime numbers are destroyed!"
 
 #: src/factoroids.c:569
 msgid "FRACTIONS: to win, you need destroy all the asteroids"
-msgstr ""
+msgstr "FRACTIONS: to win, you need destroy all the asteroids"
 
 #: src/factoroids.c:571
 msgid "type a number that can simplify the fraction, and press space or return"
-msgstr ""
+msgstr "type a number that can simplify the fraction, and press space or return"
 
 #: src/factoroids.c:572
-msgid ""
-"to split it.  Destroy fractions that can not be further simplified in a "
-"single shot!"
-msgstr ""
+msgid "to split it.  Destroy fractions that can not be further simplified in a single shot!"
+msgstr "to split it.  Destroy fractions that can not be further simplified in a single shot!"
 
 #: src/game.c:717
 msgid "Welcome to TuxMath!"
@@ -344,66 +320,80 @@
 msgid "Do it now, and then play!"
 msgstr "Do it now, and then play!"
 
-#: src/highscore.c:212 src/titlescreen.c:849
+#: src/highscore.c:212
+#: src/titlescreen.c:849
 msgid "Hall Of Fame"
 msgstr "Hall Of Fame"
 
-#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/highscore.c:232
+#: src/highscore.c:253
+#: src/titlescreen.c:785
 #: src/titlescreen.c:844
 msgid "Space Cadet"
 msgstr "Space Cadet"
 
-#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
+#: src/highscore.c:235
+#: src/titlescreen.c:786
+#: src/titlescreen.c:845
 msgid "Scout"
 msgstr "Scout"
 
-#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
+#: src/highscore.c:238
+#: src/titlescreen.c:787
+#: src/titlescreen.c:846
 msgid "Ranger"
 msgstr "Ranger"
 
-#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
+#: src/highscore.c:241
+#: src/titlescreen.c:788
+#: src/titlescreen.c:847
 msgid "Ace"
 msgstr "Ace"
 
-#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
+#: src/highscore.c:244
+#: src/titlescreen.c:789
+#: src/titlescreen.c:848
 msgid "Commando"
-msgstr ""
+msgstr "Commando"
 
-#: src/highscore.c:247 src/titlescreen.c:968
+#: src/highscore.c:247
+#: src/titlescreen.c:968
 msgid "Factors"
-msgstr ""
+msgstr "Factors"
 
-#: src/highscore.c:250 src/titlescreen.c:969
+#: src/highscore.c:250
+#: src/titlescreen.c:969
 msgid "Fractions"
-msgstr ""
+msgstr "Fractions"
 
 #: src/highscore.c:353
 msgid "You Are In The Hall of Fame!"
-msgstr ""
+msgstr "You Are In The Hall of Fame!"
 
 #: src/highscore.c:353
 msgid "Enter Your Name:"
-msgstr ""
+msgstr "Enter Your Name:"
 
 #: src/multiplayer.c:244
 msgid "Who is playing first?"
-msgstr ""
+msgstr "Who is playing first?"
 
-#: src/multiplayer.c:244 src/multiplayer.c:246
+#: src/multiplayer.c:244
+#: src/multiplayer.c:246
 msgid "Enter your name:"
-msgstr ""
+msgstr "Enter your name:"
 
 #: src/multiplayer.c:246
 msgid "Who is playing next?"
-msgstr ""
+msgstr "Who is playing next?"
 
 #: src/multiplayer.c:260
 msgid "How many rounds will you play?"
-msgstr ""
+msgstr "How many rounds will you play?"
 
 #: src/multiplayer.c:260
 msgid "Enter a number"
-msgstr ""
+msgstr "Enter a number"
 
 #: src/titlescreen.c:487
 msgid "Work In Progress!"
@@ -423,15 +413,15 @@
 
 #: src/titlescreen.c:647
 msgid "Play Alone"
-msgstr ""
+msgstr "Play Alone"
 
 #: src/titlescreen.c:648
 msgid "Play With Friends"
-msgstr ""
+msgstr "Play With Friends"
 
 #: src/titlescreen.c:649
 msgid "Factoroids!"
-msgstr ""
+msgstr "Factoroids!"
 
 #: src/titlescreen.c:650
 msgid "Help"
@@ -451,7 +441,7 @@
 
 #: src/titlescreen.c:727
 msgid "Math Command Fleet Missions"
-msgstr ""
+msgstr "Math Command Fleet Missions"
 
 #: src/titlescreen.c:728
 msgid "Play Arcade Game"
@@ -461,26 +451,29 @@
 msgid "Play Custom Game"
 msgstr "Play Custom Game"
 
-#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
-#: src/titlescreen.c:850 src/titlescreen.c:970
+#: src/titlescreen.c:730
+#: src/titlescreen.c:781
+#: src/titlescreen.c:790
+#: src/titlescreen.c:850
+#: src/titlescreen.c:970
 msgid "Main menu"
 msgstr "Main menu"
 
 #: src/titlescreen.c:779
 msgid "Score Sweep"
-msgstr ""
+msgstr "Score Sweep"
 
 #: src/titlescreen.c:780
 msgid "Elimination"
-msgstr ""
+msgstr "Elimination"
 
 #: src/titlescreen.c:824
 msgid "How many kids are playing?"
-msgstr ""
+msgstr "How many kids are playing?"
 
 #: src/titlescreen.c:825
 msgid "(Between 2 and 4 players)"
-msgstr ""
+msgstr "(Between 2 and 4 players)"
 
 #: src/titlescreen.c:944
 msgid "Edit 'options' file in your home directory"
@@ -727,18 +720,16 @@
 msgstr "Adding Negatives to Positives"
 
 #: data/missions/lessons/descr_lessons:50
-#, fuzzy
 msgid "Adding Positives to Negatives"
-msgstr "Adding Negatives to Negatives"
+msgstr "Adding Positives to Negatives"
 
 #: data/missions/lessons/descr_lessons:51
 msgid "Subtracting Negatives From Positives"
 msgstr "Subtracting Negatives From Positives"
 
 #: data/missions/lessons/descr_lessons:52
-#, fuzzy
 msgid "Subtracting Positives From Negatives"
-msgstr "Subtracting Negatives From Negatives"
+msgstr "Subtracting Positives From Negatives"
 
 #: data/missions/lessons/descr_lessons:53
 msgid "Adding Negatives to Negatives"

Added: tuxmath/branches/lan/po/ku.po
===================================================================
--- tuxmath/branches/lan/po/ku.po	                        (rev 0)
+++ tuxmath/branches/lan/po/ku.po	2009-09-04 19:14:27 UTC (rev 1486)
@@ -0,0 +1,460 @@
+# Kurdish translation for tuxmath
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the tuxmath package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tuxmath\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
+"POT-Creation-Date: 2008-05-17 06:44-0400\n"
+"PO-Revision-Date: 2009-05-28 12:30+0000\n"
+"Last-Translator: Amed Çeko Jiyan <amedcj at gmail.com>\n"
+"Language-Team: Kurdish <ku at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-06-24 22:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/game.c:663
+msgid "Welcome to TuxMath!"
+msgstr "Bi xêr hatî TuxMathê!"
+
+#: src/game.c:680
+msgid "Your mission is to save your"
+msgstr "Peywira te ew e ku"
+
+#: src/game.c:681
+msgid "penguins' igloos from the"
+msgstr "îgoyên penguenan ji kevirên fezayî"
+
+#: src/game.c:682
+msgid "falling comets."
+msgstr "yên dikevin biparêzî."
+
+#: src/game.c:701
+msgid "Stop a comet by typing"
+msgstr "Bersivên pirsên matematîkê"
+
+#: src/game.c:702
+msgid "the answer to the math problem"
+msgstr "binivîse bişkoka 'space' an jî 'anter' bitikîne"
+
+#: src/game.c:703
+msgid "and hitting 'space' or 'enter'."
+msgstr "û kevirên fezayî bisekinîne."
+
+#: src/game.c:704
+msgid "Try it now!"
+msgstr "Niha biceribîne!"
+
+#: src/game.c:712
+msgid "Good shot!"
+msgstr "Derbekî baş bû!"
+
+#: src/game.c:722
+msgid "If an igloo gets hit by a comet,"
+msgstr "Eger kevirekî fezayî li îglooyekê bikeve,"
+
+#: src/game.c:723
+msgid "it melts. But don't worry: the"
+msgstr "îgloo dihele. Lê xeman nexwe;"
+
+#: src/game.c:724
+msgid "penguin is OK!"
+msgstr "penguen hê jî dijî!"
+
+#: src/game.c:725
+msgid "Just watch what happens:"
+msgstr "Binêre ka çi dibe:"
+
+#: src/game.c:726
+msgid "(Press a key to start)"
+msgstr "(Ji bo destpêkirinê pêlî bişkokekê bike)"
+
+#: src/game.c:739
+msgid "Notice the answer"
+msgstr "Ji bo bersivê baldar be"
+
+#: src/game.c:749
+msgid "If it gets hit again, the"
+msgstr "Eger heman îgloo dîsa derb bixwe,"
+
+#: src/game.c:750
+msgid "penguin leaves."
+msgstr "penguen diçe."
+
+#: src/game.c:751
+msgid "(Press a key when ready)"
+msgstr "(Dema amade bî pêlî bişkokekê bike)"
+
+#: src/game.c:770
+msgid "You can fix the igloos"
+msgstr "Dikarî îglooyan bi sekinandina"
+
+#: src/game.c:771
+msgid "by stopping bonus comets."
+msgstr "kevirên fezayî tamîr bikî"
+
+#: src/game.c:780
+msgid "Zap it now!"
+msgstr "Niha lê bixe!"
+
+#: src/game.c:784
+msgid "Great job!"
+msgstr "Pir çak e!"
+
+#: src/game.c:798
+msgid "Quit at any time by pressing"
+msgstr "Dema bixwazî derkevî"
+
+#: src/game.c:799
+msgid "'Esc' or clicking the 'X'"
+msgstr "'Esc' an jî 'X' bitikîne"
+
+#: src/game.c:800
+msgid "in the upper right corner."
+msgstr "û ji lîstikê derkeve."
+
+#: src/game.c:801
+msgid "Do it now, and then play!"
+msgstr "NIha 'ESC' an jî 'X' bitikîne û dest bi lîstikê bike!"
+
+#: src/titlescreen.c:407
+msgid "Work In Progress!"
+msgstr "Kiriyar Didome!"
+
+#: src/titlescreen.c:408
+msgid "This feature is not ready yet"
+msgstr "Ev taybetmendî hê ne amade ye"
+
+#: src/titlescreen.c:409
+msgid "Discuss the future of TuxMath at"
+msgstr "Sohbeta der barê dahatûya TuxMathê de"
+
+#: src/titlescreen.c:410
+msgid "tuxmath-devel at lists.sourceforge.net"
+msgstr "tuxmath-devel at lists.sourceforge.net"
+
+#: src/titlescreen.c:578
+msgid "Math Command Training Academy"
+msgstr "Akademiya Perwerdehiya Matematîkê"
+
+#: src/titlescreen.c:579
+msgid "Play Arcade Game"
+msgstr "Lîsteya Lîstikan"
+
+#: src/titlescreen.c:580
+msgid "Play Custom Game"
+msgstr "Lîstika takekes bilîze"
+
+#: src/titlescreen.c:581
+msgid "Help"
+msgstr "Alîkarî"
+
+#: src/titlescreen.c:582
+msgid "More Options"
+msgstr "Zêdetir Vebijêrk"
+
+#: src/titlescreen.c:583
+msgid "Quit"
+msgstr "Derkeve"
+
+#: src/titlescreen.c:653
+msgid "Space Cadet"
+msgstr "Leşkerê Fezayê"
+
+#: src/titlescreen.c:654
+msgid "Scout"
+msgstr "Şopger"
+
+#: src/titlescreen.c:655
+msgid "Ranger"
+msgstr "Parazvan"
+
+#: src/titlescreen.c:656
+msgid "Ace"
+msgstr "As"
+
+#: src/titlescreen.c:657
+msgid "Hall Of Fame"
+msgstr "Hola Navdaran"
+
+#: src/titlescreen.c:658
+msgid "Main menu"
+msgstr "Pêşeka Giştî"
+
+#: src/titlescreen.c:739
+msgid "Edit 'options' file in your home directory"
+msgstr "Dikarî peldanka 'options' a di pelrêça malê de"
+
+#: src/titlescreen.c:740
+msgid "to create customized game!"
+msgstr "serast bikî û lîstikeke taybet biafirînî!"
+
+#: src/titlescreen.c:741
+msgid "Press a key or click your mouse to start game."
+msgstr "Ji bo destpêkirina lîstikekê pêlî mişkî an jî bişkokekê bike."
+
+#: src/titlescreen.c:742
+msgid "See README.txt for more information"
+msgstr "Ji bo zêdetir agahî pelê README.txt bixwîne"
+
+#: src/titlescreen.c:773
+msgid "Demo"
+msgstr "Demo"
+
+#: src/titlescreen.c:774
+msgid "Project Info"
+msgstr "Agahiyên Projeyê"
+
+#: src/titlescreen.c:775
+msgid "Credits"
+msgstr "Yên ked dane"
+
+#: src/titlescreen.c:776
+msgid "Main Menu"
+msgstr "Pêşeka Giştî"
+
+#: src/titlescreen.c:822
+msgid "TuxMath is free and open-source!"
+msgstr "Tuxmath belaş e û ji çavkaniya-vekirî ye!"
+
+#: src/titlescreen.c:823
+msgid "You can help make it better by reporting problems,"
+msgstr "Ji bo pêşdebirinê dikarî çewtiyan rapor bikî,"
+
+#: src/titlescreen.c:824
+msgid "suggesting improvements, or adding code."
+msgstr "pêşniyarên xwe ragihînî an jî kodan têxiyê"
+
+#: src/titlescreen.c:825
+msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+msgstr ""
+"Dikarî ji navnîşana tuxmath-devel at lists.sourceforge.net tevli nîqaşên ji bo "
+"dahatûya bernameyê bibî."
+
+#: data/missions/lessons/descr_lessons:1
+msgid "Number Typing"
+msgstr "Nivîsandina Hejmaran"
+
+#: data/missions/lessons/descr_lessons:2
+msgid "Addition: 1 to 3"
+msgstr "Tevandin: Ji 1'ê heta 3'yan"
+
+#: data/missions/lessons/descr_lessons:3
+msgid "Addition: 0 to 5"
+msgstr "Tevandin: Ji 0'ê heta 5'an"
+
+#: data/missions/lessons/descr_lessons:4
+msgid "Addition: Sums to 10"
+msgstr "Tevandin: Tevandina heta 10'an"
+
+#: data/missions/lessons/descr_lessons:5
+msgid "Addition: Sums to 15"
+msgstr "Tevandin: Tevandina heta 15'an"
+
+#: data/missions/lessons/descr_lessons:6
+msgid "Addition: Sums to 20"
+msgstr "Tevandin: Tevandina heta 20'an"
+
+#: data/missions/lessons/descr_lessons:7
+msgid "Addition: Two Digit Numbers"
+msgstr "Tevandin: Bi reqemên dumalik"
+
+#: data/missions/lessons/descr_lessons:8
+msgid "Addition: Missing Numbers"
+msgstr "Tevandin: Reqemên Kêm"
+
+#: data/missions/lessons/descr_lessons:9
+msgid "Subtraction: 0 to 10"
+msgstr "Derandin: Ji 0'î heta 10'an"
+
+#: data/missions/lessons/descr_lessons:10
+msgid "Subtraction: 0 to 20"
+msgstr "Derandin: Ji 0'î heta 20'an"
+
+#: data/missions/lessons/descr_lessons:11
+msgid "Subtraction: Two Digit Numbers"
+msgstr "Derandin: Reqemên dumalik"
+
+#: data/missions/lessons/descr_lessons:12
+msgid "Addition and Subtraction Review"
+msgstr "Kontrolkirina tevandin û derandinan"
+
+#: data/missions/lessons/descr_lessons:13
+msgid "Multiplication: 0 to 3"
+msgstr "Carandin: Ji 0'ê heta 3'an"
+
+#: data/missions/lessons/descr_lessons:14
+msgid "Multiples of 2"
+msgstr "Carandina 2'an"
+
+#: data/missions/lessons/descr_lessons:15
+msgid "Multiples of 3"
+msgstr "Carandina 3'an"
+
+#: data/missions/lessons/descr_lessons:16
+msgid "Multiples of 4"
+msgstr "Carandina 4'an"
+
+#: data/missions/lessons/descr_lessons:17
+msgid "Multiples of 5"
+msgstr "Carandina 5'an"
+
+#: data/missions/lessons/descr_lessons:18
+msgid "Multiplication: 0 to 5"
+msgstr "Carandin: Ji 0'ê heta 5'an"
+
+#: data/missions/lessons/descr_lessons:19
+msgid "Multiples of 6"
+msgstr "Carandina 6'an"
+
+#: data/missions/lessons/descr_lessons:20
+msgid "Multiples of 7"
+msgstr "Carandina 7'an"
+
+#: data/missions/lessons/descr_lessons:21
+msgid "Multiplication: 0 to 7"
+msgstr "Car: Ji 0'ê heta 7'an"
+
+#: data/missions/lessons/descr_lessons:22
+msgid "Multiples of 8"
+msgstr "Carandina 8'an"
+
+#: data/missions/lessons/descr_lessons:23
+msgid "Multiples of 9"
+msgstr "Carandina 8'an"
+
+#: data/missions/lessons/descr_lessons:24
+msgid "Multiples of 10"
+msgstr "Carandina 10'an"
+
+#: data/missions/lessons/descr_lessons:25
+msgid "Multiplication: 0 to 10"
+msgstr "Carandin: Ji 0'ê heta 10'an"
+
+#: data/missions/lessons/descr_lessons:26
+msgid "Multiples of 11 and 12"
+msgstr "Carandina 11 û 12'an"
+
+#: data/missions/lessons/descr_lessons:27
+msgid "Multiplication: 0 to 12"
+msgstr "Carandin: Ji 0'ê heta 12'an"
+
+#: data/missions/lessons/descr_lessons:28
+msgid "Multiples of 13, 14, and 15"
+msgstr "Carandina 13, 14, 15'an"
+
+#: data/missions/lessons/descr_lessons:29
+msgid "Multiplication: 0 to 15"
+msgstr "Carandin: Ji 0'ê heta 15'an"
+
+#: data/missions/lessons/descr_lessons:30
+msgid "Multiplication: Missing Numbers"
+msgstr "Carandin: Hejmarên Kêm"
+
+#: data/missions/lessons/descr_lessons:31
+msgid "Division by 2"
+msgstr "2 Parkirin"
+
+#: data/missions/lessons/descr_lessons:32
+msgid "Division by 3"
+msgstr "3 Parkirin"
+
+#: data/missions/lessons/descr_lessons:33
+msgid "Division by 4"
+msgstr "4 Parkirin"
+
+#: data/missions/lessons/descr_lessons:34
+msgid "Division by 5"
+msgstr "5 Parkirin"
+
+#: data/missions/lessons/descr_lessons:35
+msgid "Division: 1 to 5"
+msgstr "Parandin: Ji 1'ê heta 5'an"
+
+#: data/missions/lessons/descr_lessons:36
+msgid "Division by 6"
+msgstr "6 Parkirin"
+
+#: data/missions/lessons/descr_lessons:37
+msgid "Division by 7"
+msgstr "7 Parkirin"
+
+#: data/missions/lessons/descr_lessons:38
+msgid "Division by 8"
+msgstr "8 Parkirin"
+
+#: data/missions/lessons/descr_lessons:39
+msgid "Division by 9"
+msgstr "9 Parkirin"
+
+#: data/missions/lessons/descr_lessons:40
+msgid "Division by 10"
+msgstr "10 Parkirin"
+
+#: data/missions/lessons/descr_lessons:41
+msgid "Division: 1 to 10"
+msgstr "Parandin: Ji 1'ê heta 10 'an"
+
+#: data/missions/lessons/descr_lessons:42
+msgid "Division by 11 and 12"
+msgstr "11 û 12 Parkirin"
+
+#: data/missions/lessons/descr_lessons:43
+msgid "Division: 1 to 12"
+msgstr "Parandin: Ji 1'ê heta 12'an"
+
+#: data/missions/lessons/descr_lessons:44
+msgid "Division by 13, 14, and 15"
+msgstr "13, 14, 15 Parkirin"
+
+#: data/missions/lessons/descr_lessons:45
+msgid "Division: 1 to 15"
+msgstr "Parandin: Ji 1'ê heta 15'an"
+
+#: data/missions/lessons/descr_lessons:46
+msgid "Multiplication and Division Review"
+msgstr "Kontrolkirina Carandin û Parandinan"
+
+#: data/missions/lessons/descr_lessons:47
+msgid "Typing Negative Numbers"
+msgstr "Nivîsandina Hejmarên Negatîf"
+
+#: data/missions/lessons/descr_lessons:48
+msgid "Subtraction: Negative Answers"
+msgstr "Derandin: Bersivên Negatîf"
+
+#: data/missions/lessons/descr_lessons:49
+msgid "Adding Negatives to Positives"
+msgstr "Tevandina Hejmarên Negatîf li yên Pozîtîf"
+
+#: data/missions/lessons/descr_lessons:50
+msgid "Subtracting Negatives From Positives"
+msgstr "Derandina Hejêmarên Negatîf ji yên Pozîtîf"
+
+#: data/missions/lessons/descr_lessons:51
+msgid "Adding Negatives to Negatives"
+msgstr "Tevandina Hejmarên Negatîf li yên Negatîf"
+
+#: data/missions/lessons/descr_lessons:52
+msgid "Subtracting Negatives From Negatives"
+msgstr "Derandina Hejmarên Negatîf ji yên Negatîf"
+
+#: data/missions/lessons/descr_lessons:53
+msgid "Negative and Positive Numbers Review"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:54
+msgid "Multiplication and Division of Negatives"
+msgstr "Carandin û Parandina Hejmarên Negatîf"
+
+#: data/missions/lessons/descr_lessons:55
+msgid "Multiplication of Positives and Negatives"
+msgstr "Carandina Hejmarên Pozîtîf û yên Negatîf"
+
+#: data/missions/lessons/descr_lessons:56
+msgid "Division of Positives and Negatives"
+msgstr "Parandina Hejmarên Pozîtîf û yên Negatîf"

Added: tuxmath/branches/lan/po/sl.po
===================================================================
--- tuxmath/branches/lan/po/sl.po	                        (rev 0)
+++ tuxmath/branches/lan/po/sl.po	2009-09-04 19:14:27 UTC (rev 1486)
@@ -0,0 +1,458 @@
+# Slovenian translation for tuxmath
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tuxmath package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tuxmath\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
+"POT-Creation-Date: 2008-05-17 06:44-0400\n"
+"PO-Revision-Date: 2008-07-17 12:30+0000\n"
+"Last-Translator: Štefan Baebler <Unknown>\n"
+"Language-Team: Slovenian <sl at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-06-24 22:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/titlescreen.c:407
+msgid "Work In Progress!"
+msgstr "Delo še poteka!"
+
+#: src/titlescreen.c:408
+msgid "This feature is not ready yet"
+msgstr "Ta možnost še ni pripravljena"
+
+#: src/titlescreen.c:409
+msgid "Discuss the future of TuxMath at"
+msgstr "Pogovor o prihodnsti programa TuxMath na"
+
+#: src/titlescreen.c:410
+msgid "tuxmath-devel at lists.sourceforge.net"
+msgstr "tuxmath-devel at lists.sourceforge.net"
+
+#: src/titlescreen.c:579
+msgid "Play Arcade Game"
+msgstr "Igraj arkadno igro"
+
+#: src/titlescreen.c:580
+msgid "Play Custom Game"
+msgstr "Igraj igro po meri"
+
+#: src/titlescreen.c:581
+msgid "Help"
+msgstr "Pomoč"
+
+#: src/titlescreen.c:582
+msgid "More Options"
+msgstr "Več možnosti"
+
+#: src/titlescreen.c:583
+msgid "Quit"
+msgstr "Končaj"
+
+#: src/titlescreen.c:654
+msgid "Scout"
+msgstr "Tabornik"
+
+#: src/titlescreen.c:655
+msgid "Ranger"
+msgstr "Čuvaj"
+
+#: src/titlescreen.c:656
+msgid "Ace"
+msgstr "As"
+
+#: src/titlescreen.c:658
+msgid "Main menu"
+msgstr "Glavni meni"
+
+#: src/titlescreen.c:739
+msgid "Edit 'options' file in your home directory"
+msgstr "Za igro po meri spremenite datoteko"
+
+#: src/titlescreen.c:740
+msgid "to create customized game!"
+msgstr "'options' v vaši domači mapi."
+
+#: src/titlescreen.c:741
+msgid "Press a key or click your mouse to start game."
+msgstr "Za začetek igre pritisni tipko ali klikni z miško."
+
+#: src/titlescreen.c:742
+msgid "See README.txt for more information"
+msgstr "Za več podrobnosti preberite datoteko README.txt"
+
+#: src/titlescreen.c:774
+msgid "Project Info"
+msgstr "O projektu"
+
+#: src/titlescreen.c:775
+msgid "Credits"
+msgstr "Zasluge"
+
+#: src/titlescreen.c:776
+msgid "Main Menu"
+msgstr "Glavni meni"
+
+#: src/titlescreen.c:822
+msgid "TuxMath is free and open-source!"
+msgstr "TuxMath je prost in odprtokoden!"
+
+#: src/titlescreen.c:823
+msgid "You can help make it better by reporting problems,"
+msgstr "S sporočanjem težav, predlogov za izboljšave in"
+
+#: src/titlescreen.c:824
+msgid "suggesting improvements, or adding code."
+msgstr "dopolnitvami kode lahko program še izboljšamo."
+
+#: src/titlescreen.c:825
+msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+msgstr "Pogovor o prihodnosti na tuxmath-devel at lists.sourceforge.net"
+
+#: data/missions/lessons/descr_lessons:1
+msgid "Number Typing"
+msgstr "Tipkanje številk"
+
+#: data/missions/lessons/descr_lessons:2
+msgid "Addition: 1 to 3"
+msgstr "Seštevanje: 1 do 3"
+
+#: data/missions/lessons/descr_lessons:3
+msgid "Addition: 0 to 5"
+msgstr "Seštevanje: 0 do 5"
+
+#: data/missions/lessons/descr_lessons:4
+msgid "Addition: Sums to 10"
+msgstr "Seštevanje: vsote do 10"
+
+#: data/missions/lessons/descr_lessons:5
+msgid "Addition: Sums to 15"
+msgstr "Seštevanje: vsote do 15"
+
+#: data/missions/lessons/descr_lessons:6
+msgid "Addition: Sums to 20"
+msgstr "Seštevanje: vsote do 20"
+
+#: data/missions/lessons/descr_lessons:7
+msgid "Addition: Two Digit Numbers"
+msgstr "Seštevanje: dvomestna števila"
+
+#: data/missions/lessons/descr_lessons:8
+msgid "Addition: Missing Numbers"
+msgstr "Seštevanje: manjkajoča števila"
+
+#: data/missions/lessons/descr_lessons:9
+msgid "Subtraction: 0 to 10"
+msgstr "Odštevanje: 0 do 10"
+
+#: data/missions/lessons/descr_lessons:10
+msgid "Subtraction: 0 to 20"
+msgstr "Odštevanje: 0 do 20"
+
+#: data/missions/lessons/descr_lessons:11
+msgid "Subtraction: Two Digit Numbers"
+msgstr "Odštevanje: dvomestna števila"
+
+#: data/missions/lessons/descr_lessons:12
+msgid "Addition and Subtraction Review"
+msgstr "Pregled seštevanja in odštevanja"
+
+#: data/missions/lessons/descr_lessons:13
+msgid "Multiplication: 0 to 3"
+msgstr "Množenje: 0 do 3"
+
+#: data/missions/lessons/descr_lessons:14
+msgid "Multiples of 2"
+msgstr "Večkratniki števila 2"
+
+#: data/missions/lessons/descr_lessons:15
+msgid "Multiples of 3"
+msgstr "Večkratniki števila 3"
+
+#: data/missions/lessons/descr_lessons:16
+msgid "Multiples of 4"
+msgstr "Večkratniki števila 4"
+
+#: data/missions/lessons/descr_lessons:17
+msgid "Multiples of 5"
+msgstr "Večkratniki števila 5"
+
+#: data/missions/lessons/descr_lessons:18
+msgid "Multiplication: 0 to 5"
+msgstr "Množenje: 0 do 5"
+
+#: data/missions/lessons/descr_lessons:19
+msgid "Multiples of 6"
+msgstr "Večkratniki števila 6"
+
+#: data/missions/lessons/descr_lessons:20
+msgid "Multiples of 7"
+msgstr "Večkratniki števila 7"
+
+#: data/missions/lessons/descr_lessons:21
+msgid "Multiplication: 0 to 7"
+msgstr "Množenje: 0 do 7"
+
+#: data/missions/lessons/descr_lessons:22
+msgid "Multiples of 8"
+msgstr "Večkratniki števila 8"
+
+#: data/missions/lessons/descr_lessons:23
+msgid "Multiples of 9"
+msgstr "Večkratniki števila 9"
+
+#: data/missions/lessons/descr_lessons:24
+msgid "Multiples of 10"
+msgstr "Večkratniki števila 10"
+
+#: data/missions/lessons/descr_lessons:25
+msgid "Multiplication: 0 to 10"
+msgstr "Množenje: 0 do 10"
+
+#: data/missions/lessons/descr_lessons:26
+msgid "Multiples of 11 and 12"
+msgstr "Večkratniki števil 11 in 12"
+
+#: data/missions/lessons/descr_lessons:27
+msgid "Multiplication: 0 to 12"
+msgstr "Množenje: 0 do 12"
+
+#: data/missions/lessons/descr_lessons:28
+msgid "Multiples of 13, 14, and 15"
+msgstr "Večkratniki števil 13, 14 in 15"
+
+#: data/missions/lessons/descr_lessons:29
+msgid "Multiplication: 0 to 15"
+msgstr "Množenje: 0 do 15"
+
+#: data/missions/lessons/descr_lessons:30
+msgid "Multiplication: Missing Numbers"
+msgstr "Množenje: manjkajoča števila"
+
+#: data/missions/lessons/descr_lessons:31
+msgid "Division by 2"
+msgstr "Deljenje z 2"
+
+#: data/missions/lessons/descr_lessons:32
+msgid "Division by 3"
+msgstr "Deljenje s 3"
+
+#: data/missions/lessons/descr_lessons:33
+msgid "Division by 4"
+msgstr "Deljenje s 4"
+
+#: data/missions/lessons/descr_lessons:34
+msgid "Division by 5"
+msgstr "Deljenje s 5"
+
+#: data/missions/lessons/descr_lessons:35
+msgid "Division: 1 to 5"
+msgstr "Deljenje: 1 do 5"
+
+#: data/missions/lessons/descr_lessons:36
+msgid "Division by 6"
+msgstr "Deljenje s 6"
+
+#: data/missions/lessons/descr_lessons:37
+msgid "Division by 7"
+msgstr "Deljenje s 7"
+
+#: data/missions/lessons/descr_lessons:38
+msgid "Division by 8"
+msgstr "Deljenje z 8"
+
+#: data/missions/lessons/descr_lessons:39
+msgid "Division by 9"
+msgstr "Deljenje z 9"
+
+#: data/missions/lessons/descr_lessons:40
+msgid "Division by 10"
+msgstr "Deljenje z 10"
+
+#: data/missions/lessons/descr_lessons:41
+msgid "Division: 1 to 10"
+msgstr "Deljenje: 1 do 10"
+
+#: data/missions/lessons/descr_lessons:42
+msgid "Division by 11 and 12"
+msgstr "Deljenje z 11 in 12"
+
+#: data/missions/lessons/descr_lessons:43
+msgid "Division: 1 to 12"
+msgstr "Deljenje: 1 do 12"
+
+#: data/missions/lessons/descr_lessons:44
+msgid "Division by 13, 14, and 15"
+msgstr "Deljenje s 13, 14 in 15"
+
+#: data/missions/lessons/descr_lessons:45
+msgid "Division: 1 to 15"
+msgstr "Deljenje: 1 do 15"
+
+#: data/missions/lessons/descr_lessons:46
+msgid "Multiplication and Division Review"
+msgstr "Pregled množenja in deljenja"
+
+#: data/missions/lessons/descr_lessons:47
+msgid "Typing Negative Numbers"
+msgstr "Tipkanje negativnih števil"
+
+#: data/missions/lessons/descr_lessons:48
+msgid "Subtraction: Negative Answers"
+msgstr "Odštevanje: negativni rezultati"
+
+#: data/missions/lessons/descr_lessons:49
+msgid "Adding Negatives to Positives"
+msgstr "Seštevanje negativnih in pozitivnih števil"
+
+#: data/missions/lessons/descr_lessons:50
+msgid "Subtracting Negatives From Positives"
+msgstr "Odštevanje negativnih od pozitivnih števil"
+
+#: data/missions/lessons/descr_lessons:51
+msgid "Adding Negatives to Negatives"
+msgstr "Seštevanje negativnih števil"
+
+#: data/missions/lessons/descr_lessons:52
+msgid "Subtracting Negatives From Negatives"
+msgstr "Odštevanje negativnih števil"
+
+#: data/missions/lessons/descr_lessons:53
+msgid "Negative and Positive Numbers Review"
+msgstr "Pregled negativnih in pozitivnih števil"
+
+#: data/missions/lessons/descr_lessons:54
+msgid "Multiplication and Division of Negatives"
+msgstr "Množenje in deljenje negativnih števil"
+
+#: data/missions/lessons/descr_lessons:55
+msgid "Multiplication of Positives and Negatives"
+msgstr "Množenje pozitivnih in negativnih števil"
+
+#: data/missions/lessons/descr_lessons:56
+msgid "Division of Positives and Negatives"
+msgstr "Deljenje pozitivnih in negativnih števil"
+
+#: src/game.c:663
+msgid "Welcome to TuxMath!"
+msgstr ""
+
+#: src/game.c:680
+msgid "Your mission is to save your"
+msgstr ""
+
+#: src/game.c:681
+msgid "penguins' igloos from the"
+msgstr ""
+
+#: src/game.c:682
+msgid "falling comets."
+msgstr ""
+
+#: src/game.c:701
+msgid "Stop a comet by typing"
+msgstr ""
+
+#: src/game.c:702
+msgid "the answer to the math problem"
+msgstr ""
+
+#: src/game.c:703
+msgid "and hitting 'space' or 'enter'."
+msgstr ""
+
+#: src/game.c:704
+msgid "Try it now!"
+msgstr ""
+
+#: src/game.c:712
+msgid "Good shot!"
+msgstr ""
+
+#: src/game.c:722
+msgid "If an igloo gets hit by a comet,"
+msgstr ""
+
+#: src/game.c:723
+msgid "it melts. But don't worry: the"
+msgstr ""
+
+#: src/game.c:724
+msgid "penguin is OK!"
+msgstr ""
+
+#: src/game.c:725
+msgid "Just watch what happens:"
+msgstr ""
+
+#: src/game.c:726
+msgid "(Press a key to start)"
+msgstr ""
+
+#: src/game.c:739
+msgid "Notice the answer"
+msgstr ""
+
+#: src/game.c:749
+msgid "If it gets hit again, the"
+msgstr ""
+
+#: src/game.c:750
+msgid "penguin leaves."
+msgstr ""
+
+#: src/game.c:751
+msgid "(Press a key when ready)"
+msgstr ""
+
+#: src/game.c:770
+msgid "You can fix the igloos"
+msgstr ""
+
+#: src/game.c:771
+msgid "by stopping bonus comets."
+msgstr ""
+
+#: src/game.c:780
+msgid "Zap it now!"
+msgstr ""
+
+#: src/game.c:784
+msgid "Great job!"
+msgstr ""
+
+#: src/game.c:798
+msgid "Quit at any time by pressing"
+msgstr ""
+
+#: src/game.c:799
+msgid "'Esc' or clicking the 'X'"
+msgstr ""
+
+#: src/game.c:800
+msgid "in the upper right corner."
+msgstr ""
+
+#: src/game.c:801
+msgid "Do it now, and then play!"
+msgstr ""
+
+#: src/titlescreen.c:578
+msgid "Math Command Training Academy"
+msgstr ""
+
+#: src/titlescreen.c:653
+msgid "Space Cadet"
+msgstr ""
+
+#: src/titlescreen.c:657
+msgid "Hall Of Fame"
+msgstr ""
+
+#: src/titlescreen.c:773
+msgid "Demo"
+msgstr ""

Added: tuxmath/branches/lan/po/vi.po
===================================================================
--- tuxmath/branches/lan/po/vi.po	                        (rev 0)
+++ tuxmath/branches/lan/po/vi.po	2009-09-04 19:14:27 UTC (rev 1486)
@@ -0,0 +1,458 @@
+# Vietnamese translation for tuxmath
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tuxmath package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tuxmath\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
+"POT-Creation-Date: 2008-05-17 06:44-0400\n"
+"PO-Revision-Date: 2008-07-22 18:01+0000\n"
+"Last-Translator: lusiads <Unknown>\n"
+"Language-Team: Vietnamese <vi at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-06-24 22:20+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/titlescreen.c:407
+msgid "Work In Progress!"
+msgstr "Đang được thực hiện!"
+
+#: src/titlescreen.c:408
+msgid "This feature is not ready yet"
+msgstr "Tính năng này chưa sẵn sàng"
+
+#: src/titlescreen.c:409
+msgid "Discuss the future of TuxMath at"
+msgstr "Thảo luận tương lại của TuxMath tại"
+
+#: src/titlescreen.c:410
+msgid "tuxmath-devel at lists.sourceforge.net"
+msgstr "tuxmath-devel at lists.sourceforge.net"
+
+#: src/titlescreen.c:579
+msgid "Play Arcade Game"
+msgstr "Chơi trò chơi Arcade"
+
+#: src/titlescreen.c:580
+msgid "Play Custom Game"
+msgstr "Chơi trò chơi tự chọn"
+
+#: src/titlescreen.c:581
+msgid "Help"
+msgstr "Trợ giúp"
+
+#: src/titlescreen.c:582
+msgid "More Options"
+msgstr "Tuỳ chọn khác"
+
+#: src/titlescreen.c:583
+msgid "Quit"
+msgstr "Thoát"
+
+#: src/titlescreen.c:653
+msgid "Space Cadet"
+msgstr "Space Cadet"
+
+#: src/titlescreen.c:654
+msgid "Scout"
+msgstr "Trinh sát"
+
+#: src/titlescreen.c:655
+msgid "Ranger"
+msgstr "Ranger"
+
+#: src/titlescreen.c:656
+msgid "Ace"
+msgstr "Ace"
+
+#: src/titlescreen.c:657
+msgid "Hall Of Fame"
+msgstr "Nhà lưu niệm"
+
+#: src/titlescreen.c:658
+msgid "Main menu"
+msgstr "Trình đơn chính"
+
+#: src/titlescreen.c:774
+msgid "Project Info"
+msgstr "Thông tin dự án"
+
+#: src/titlescreen.c:775
+msgid "Credits"
+msgstr "Lời cám ơn"
+
+#: src/titlescreen.c:776
+msgid "Main Menu"
+msgstr "Trình đơn chính"
+
+#: src/titlescreen.c:822
+msgid "TuxMath is free and open-source!"
+msgstr "TuxMatch là phần mềm miễn phí và mã nguồn mở!"
+
+#: src/titlescreen.c:823
+msgid "You can help make it better by reporting problems,"
+msgstr "Bạn có thể giúp cải thiện chương trình bằng cách báo cáo lỗi."
+
+#: src/titlescreen.c:824
+msgid "suggesting improvements, or adding code."
+msgstr "gợi ý cải thiện, hoặc viết thêm mã."
+
+#: src/titlescreen.c:825
+msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
+msgstr "Thảo luận về tương lai tại tuxmath-devel at lists.sourceforge.net"
+
+#: src/game.c:663
+msgid "Welcome to TuxMath!"
+msgstr ""
+
+#: src/game.c:680
+msgid "Your mission is to save your"
+msgstr ""
+
+#: src/game.c:681
+msgid "penguins' igloos from the"
+msgstr ""
+
+#: src/game.c:682
+msgid "falling comets."
+msgstr ""
+
+#: src/game.c:701
+msgid "Stop a comet by typing"
+msgstr ""
+
+#: src/game.c:702
+msgid "the answer to the math problem"
+msgstr ""
+
+#: src/game.c:703
+msgid "and hitting 'space' or 'enter'."
+msgstr ""
+
+#: src/game.c:704
+msgid "Try it now!"
+msgstr ""
+
+#: src/game.c:712
+msgid "Good shot!"
+msgstr ""
+
+#: src/game.c:722
+msgid "If an igloo gets hit by a comet,"
+msgstr ""
+
+#: src/game.c:723
+msgid "it melts. But don't worry: the"
+msgstr ""
+
+#: src/game.c:724
+msgid "penguin is OK!"
+msgstr ""
+
+#: src/game.c:725
+msgid "Just watch what happens:"
+msgstr ""
+
+#: src/game.c:726
+msgid "(Press a key to start)"
+msgstr ""
+
+#: src/game.c:739
+msgid "Notice the answer"
+msgstr ""
+
+#: src/game.c:749
+msgid "If it gets hit again, the"
+msgstr ""
+
+#: src/game.c:750
+msgid "penguin leaves."
+msgstr ""
+
+#: src/game.c:751
+msgid "(Press a key when ready)"
+msgstr ""
+
+#: src/game.c:770
+msgid "You can fix the igloos"
+msgstr ""
+
+#: src/game.c:771
+msgid "by stopping bonus comets."
+msgstr ""
+
+#: src/game.c:780
+msgid "Zap it now!"
+msgstr ""
+
+#: src/game.c:784
+msgid "Great job!"
+msgstr ""
+
+#: src/game.c:798
+msgid "Quit at any time by pressing"
+msgstr ""
+
+#: src/game.c:799
+msgid "'Esc' or clicking the 'X'"
+msgstr ""
+
+#: src/game.c:800
+msgid "in the upper right corner."
+msgstr ""
+
+#: src/game.c:801
+msgid "Do it now, and then play!"
+msgstr ""
+
+#: src/titlescreen.c:578
+msgid "Math Command Training Academy"
+msgstr ""
+
+#: src/titlescreen.c:739
+msgid "Edit 'options' file in your home directory"
+msgstr ""
+
+#: src/titlescreen.c:740
+msgid "to create customized game!"
+msgstr ""
+
+#: src/titlescreen.c:741
+msgid "Press a key or click your mouse to start game."
+msgstr ""
+
+#: src/titlescreen.c:742
+msgid "See README.txt for more information"
+msgstr ""
+
+#: src/titlescreen.c:773
+msgid "Demo"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:1
+msgid "Number Typing"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:2
+msgid "Addition: 1 to 3"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:3
+msgid "Addition: 0 to 5"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:4
+msgid "Addition: Sums to 10"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:5
+msgid "Addition: Sums to 15"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:6
+msgid "Addition: Sums to 20"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:7
+msgid "Addition: Two Digit Numbers"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:8
+msgid "Addition: Missing Numbers"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:9
+msgid "Subtraction: 0 to 10"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:10
+msgid "Subtraction: 0 to 20"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:11
+msgid "Subtraction: Two Digit Numbers"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:12
+msgid "Addition and Subtraction Review"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:13
+msgid "Multiplication: 0 to 3"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:14
+msgid "Multiples of 2"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:15
+msgid "Multiples of 3"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:16
+msgid "Multiples of 4"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:17
+msgid "Multiples of 5"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:18
+msgid "Multiplication: 0 to 5"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:19
+msgid "Multiples of 6"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:20
+msgid "Multiples of 7"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:21
+msgid "Multiplication: 0 to 7"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:22
+msgid "Multiples of 8"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:23
+msgid "Multiples of 9"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:24
+msgid "Multiples of 10"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:25
+msgid "Multiplication: 0 to 10"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:26
+msgid "Multiples of 11 and 12"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:27
+msgid "Multiplication: 0 to 12"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:28
+msgid "Multiples of 13, 14, and 15"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:29
+msgid "Multiplication: 0 to 15"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:30
+msgid "Multiplication: Missing Numbers"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:31
+msgid "Division by 2"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:32
+msgid "Division by 3"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:33
+msgid "Division by 4"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:34
+msgid "Division by 5"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:35
+msgid "Division: 1 to 5"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:36
+msgid "Division by 6"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:37
+msgid "Division by 7"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:38
+msgid "Division by 8"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:39
+msgid "Division by 9"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:40
+msgid "Division by 10"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:41
+msgid "Division: 1 to 10"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:42
+msgid "Division by 11 and 12"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:43
+msgid "Division: 1 to 12"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:44
+msgid "Division by 13, 14, and 15"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:45
+msgid "Division: 1 to 15"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:46
+msgid "Multiplication and Division Review"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:47
+msgid "Typing Negative Numbers"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:48
+msgid "Subtraction: Negative Answers"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:49
+msgid "Adding Negatives to Positives"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:50
+msgid "Subtracting Negatives From Positives"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:51
+msgid "Adding Negatives to Negatives"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:52
+msgid "Subtracting Negatives From Negatives"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:53
+msgid "Negative and Positive Numbers Review"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:54
+msgid "Multiplication and Division of Negatives"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:55
+msgid "Multiplication of Positives and Negatives"
+msgstr ""
+
+#: data/missions/lessons/descr_lessons:56
+msgid "Division of Positives and Negatives"
+msgstr ""

Modified: tuxmath/branches/lan/tuxmath.desktop
===================================================================
--- tuxmath/branches/lan/tuxmath.desktop	2009-09-04 19:07:14 UTC (rev 1485)
+++ tuxmath/branches/lan/tuxmath.desktop	2009-09-04 19:14:27 UTC (rev 1486)
@@ -3,13 +3,16 @@
 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




More information about the Tux4kids-commits mailing list