Commit e4afbaa9 authored by Bruno Coudoin's avatar Bruno Coudoin

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.
parent b0b82628
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> 2006-11-06 Yves Combe <yves@ycombe.net>
New sound policy to halt previous sound before play. New sound policy to halt previous sound before play.
......
...@@ -146,4 +146,3 @@ educational software that rivals many proprietary ones. ...@@ -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 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. 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
...@@ -98,8 +98,8 @@ ...@@ -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"> <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> <_tooltip>Somalia</_tooltip>
</Shape> </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"> <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>Soudan</_tooltip> <_tooltip>Sudan</_tooltip>
</Shape> </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"> <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> <_tooltip>Tanzania</_tooltip>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<Board <Board
name="wordprocessor" name="wordprocessor"
type="wordprocessor" type="wordprocessor"
section="/experimental" section="/fun"
icon="boardicons/wordprocessor.png" icon="boardicons/wordprocessor.png"
difficulty="2" difficulty="2"
mode="normal" mode="normal"
......
...@@ -111,7 +111,7 @@ fi ...@@ -111,7 +111,7 @@ fi
LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}"
dnl Add the languages which your application supports here. 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 dnl GCompris needs to know which locale are supported
AC_SUBST(ALL_LINGUAS) AC_SUBST(ALL_LINGUAS)
......
...@@ -216,6 +216,7 @@ AnimCanvas_free(py_GcomprisAnimCanvas *self) ...@@ -216,6 +216,7 @@ AnimCanvas_free(py_GcomprisAnimCanvas *self)
g_warning("You should really call destroy() on an AnimCanvas " g_warning("You should really call destroy() on an AnimCanvas "
"instead of relying on the refcounter\n"); "instead of relying on the refcounter\n");
gc_anim_deactivate(self->item); gc_anim_deactivate(self->item);
self->item = NULL;
Py_DECREF(self->anim); Py_DECREF(self->anim);
} }
PyObject_DEL(self); PyObject_DEL(self);
......
...@@ -147,13 +147,16 @@ class FactorLevelset: ...@@ -147,13 +147,16 @@ class FactorLevelset:
self.nonfactors = [] self.nonfactors = []
def getError(self, num): 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) n = int(num.text)
mults = [] mults = []
for i in range(2, 5): for i in range(2, 5):
mults.append(n*i) mults.append(n*i)
s = makeNumList(mults) % tuple(mults) return fmt % { 'd1': n,
return fmt % (n, s, self.level_multiple[self.cur_sublevel-1], n) 's': makeNumList(mults) % tuple(mults),
'd2': self.level_multiple[self.cur_sublevel-1],
'd3': n }
def getTitle(self): def getTitle(self):
return _('Factors of %d') % ( self.level_multiple[self.cur_sublevel-1] ) return _('Factors of %d') % ( self.level_multiple[self.cur_sublevel-1] )
......
...@@ -75,6 +75,7 @@ static gchar *linguas[] = { ...@@ -75,6 +75,7 @@ static gchar *linguas[] = {
"ga_IE.UTF-8", N_("Irish (Gaelic)"), "ga_IE.UTF-8", N_("Irish (Gaelic)"),
"he_IL.UTF-8", N_("Hebrew"), "he_IL.UTF-8", N_("Hebrew"),
"hi_IN.UTF-8", N_("Hindi"), "hi_IN.UTF-8", N_("Hindi"),
"ja_JP.UTF-8", N_("Japanese"),
"gu_IN.UTF-8", N_("Gujarati"), "gu_IN.UTF-8", N_("Gujarati"),
"pa_IN.UTF-8", N_("Punjabi"), "pa_IN.UTF-8", N_("Punjabi"),
"hu_HU.UTF-8", N_("Hungarian"), "hu_HU.UTF-8", N_("Hungarian"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment