Soudan typo is now fixed created Japanese flag from wikipedia Soudan typo

	* TODO: Soudan typo is now fixed
	* boards/flags/ja.png: created Japanese flag from wikipedia
	* boards/geography/board4_2.xml.in: Soudan typo is now fixed
	* boards/wordprocessor.xml.in: moved to /fun, out of experimental
	* configure.in: added Japanese
	* src/boards/py-mod-anim.c: (AnimCanvas_free): Fixed a Major bug in anim bindings.
	  quiting the gnumch activity crash GCompris 1 times on 10 in my case.
	  This seems to fix it and we should consider patching 8.2.1 with this.
	* src/boards/python/gnumch.py: fixed a string to allow paramter swapping
	for translations.
	* src/gcompris/config.c: added japanese.

9 files changed, 26 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 14402db..58b7886 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-11-07  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	* TODO: Soudan typo is now fixed
+	* boards/flags/ja.png: created Japanese flag from wikipedia
+	* boards/geography/board4_2.xml.in: Soudan typo is now fixed
+	* boards/wordprocessor.xml.in: moved to /fun, out of experimental
+	* configure.in: added Japanese
+	* src/boards/py-mod-anim.c: (AnimCanvas_free): Fixed a Major bug in anim bindings.
+	  quiting the gnumch activity crash GCompris 1 times on 10 in my case.
+	  This seems to fix it and we should consider patching 8.2.1 with this.
+	* src/boards/python/gnumch.py: fixed a string to allow paramter swapping
+	for translations.
+	* src/gcompris/config.c: added japanese.
+
 2006-11-06  Yves Combe  <yves@ycombe.net>
 
 	New sound policy to halt previous sound before play.
diff --git a/TODO b/TODO
index ab22e52..db747c0 100644
--- a/TODO
+++ b/TODO
@@ -146,4 +146,3 @@ educational software that rivals many proprietary ones.
 If somebody want to work on the profile concept, we will be abble to
 provide these features at least 6 monthes earlier than what I can do.
 
-- Replace Soudan by Sudan in boards/geography/board4_2.xml.in
\ No newline at end of file
diff --git a/boards/flags/ja.png b/boards/flags/ja.png
new file mode 100644
index 0000000..e7d61e6
--- /dev/null
+++ b/boards/flags/ja.png
diff --git a/boards/geography/board4_2.xml.in b/boards/geography/board4_2.xml.in
index 1dffee9..8f8ed9d 100644
--- a/boards/geography/board4_2.xml.in
+++ b/boards/geography/board4_2.xml.in
@@ -98,8 +98,8 @@
 <Shape name="somalie" pixmapfile="geography/afrique/somalia.png" sound="sounds/$LOCALE/geography/somalia.ogg" x="661" y="234" zoomx="1" zoomy="1" position="0">
 <_tooltip>Somalia</_tooltip>
 </Shape>
-<Shape name="soudan" pixmapfile="geography/afrique/soudan.png" sound="sounds/$LOCALE/geography/soudan.ogg" x="561" y="179" zoomx="1" zoomy="1" position="0">
-<_tooltip>Soudan</_tooltip>
+<Shape name="sudan" pixmapfile="geography/afrique/soudan.png" sound="sounds/$LOCALE/geography/soudan.ogg" x="561" y="179" zoomx="1" zoomy="1" position="0">
+<_tooltip>Sudan</_tooltip>
 </Shape>
 <Shape name="tanzanie" pixmapfile="geography/afrique/tanzania.png" sound="sounds/$LOCALE/geography/tanzania.ogg" x="592" y="315" zoomx="1" zoomy="1" position="0">
 <_tooltip>Tanzania</_tooltip>
diff --git a/boards/wordprocessor.xml.in b/boards/wordprocessor.xml.in
index e0028b4..be2949e 100644
--- a/boards/wordprocessor.xml.in
+++ b/boards/wordprocessor.xml.in
@@ -3,7 +3,7 @@
   <Board
 	 name="wordprocessor"
 	 type="wordprocessor"
-	 section="/experimental"
+	 section="/fun"
 	 icon="boardicons/wordprocessor.png"
 	 difficulty="2"
 	 mode="normal"
diff --git a/configure.in b/configure.in
index ffd26dc..970efc8 100644
--- a/configure.in
+++ b/configure.in
@@ -111,7 +111,7 @@ fi
 LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}"
 
 dnl Add the languages which your application supports here.
-ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml mr ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl so sq sr sr@Latn sv th tr vi wa zh_CN zh_TW"
+ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ja ka lt mk ml mr ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl so sq sr sr@Latn sv th tr vi wa zh_CN zh_TW"
 
 dnl GCompris needs to know which locale are supported
 AC_SUBST(ALL_LINGUAS)
diff --git a/src/boards/py-mod-anim.c b/src/boards/py-mod-anim.c
index 02c9bfc..46cd407 100644
--- a/src/boards/py-mod-anim.c
+++ b/src/boards/py-mod-anim.c
@@ -216,6 +216,7 @@ AnimCanvas_free(py_GcomprisAnimCanvas *self)
       g_warning("You should really call destroy() on an AnimCanvas "
                 "instead of relying on the refcounter\n");
       gc_anim_deactivate(self->item);
+      self->item = NULL;
       Py_DECREF(self->anim);
     }
   PyObject_DEL(self);
diff --git a/src/boards/python/gnumch.py b/src/boards/python/gnumch.py
index 41f85c5..b446752 100644
--- a/src/boards/python/gnumch.py
+++ b/src/boards/python/gnumch.py
@@ -147,13 +147,16 @@ class FactorLevelset:
         self.nonfactors = []
 
     def getError(self, num):
-        fmt = _('Multiples of %d include %s,\nbut %d is not a multiple of %d.')
+        # Translators: You can swap %(x)y elements in the string.
+        fmt = _('Multiples of %(d1)d include %(s)s,\nbut %(d2)d is not a multiple of %(d3)d.')
         n = int(num.text)
         mults = []
         for i in range(2, 5):
             mults.append(n*i)
-        s = makeNumList(mults) % tuple(mults)
-        return fmt % (n, s, self.level_multiple[self.cur_sublevel-1], n)
+        return fmt % { 'd1': n,
+                       's': makeNumList(mults) % tuple(mults),
+                       'd2': self.level_multiple[self.cur_sublevel-1],
+                       'd3': n }
 
     def getTitle(self):
         return _('Factors of %d') % ( self.level_multiple[self.cur_sublevel-1] )
diff --git a/src/gcompris/config.c b/src/gcompris/config.c
index e5c8de8..e3e7e7e 100644
--- a/src/gcompris/config.c
+++ b/src/gcompris/config.c
@@ -75,6 +75,7 @@ static gchar *linguas[] = {
   "ga_IE.UTF-8", 	N_("Irish (Gaelic)"),
   "he_IL.UTF-8",	N_("Hebrew"),
   "hi_IN.UTF-8",	N_("Hindi"),
+  "ja_JP.UTF-8",	N_("Japanese"),
   "gu_IN.UTF-8",	N_("Gujarati"),
   "pa_IN.UTF-8",	N_("Punjabi"),
   "hu_HU.UTF-8",	N_("Hungarian"),