gcompris r3244 - in branches/gcomprixogoo/src: administration-activity administration-activity/admin anim-activity ballcatch-activity chat-activity connect4-activity followline-activity gnumch-equality-activity login-activity redraw-activity searace-activity sudoku-activity tuxpaint-activity

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Thu Feb 14 00:52:32 2008
New Revision: 3244
URL: http://svn.gnome.org/viewvc/gcompris?rev=3244&view=rev

Log:
	Merge of trunk 3242
	Windows issue. Translation was broken in all python modules.
	Now use the gcompris gettext instead of the python one.



Modified:
   branches/gcomprixogoo/src/administration-activity/admin/board_list.py
   branches/gcomprixogoo/src/administration-activity/admin/class_edit.py
   branches/gcomprixogoo/src/administration-activity/admin/class_list.py
   branches/gcomprixogoo/src/administration-activity/admin/group_edit.py
   branches/gcomprixogoo/src/administration-activity/admin/group_list.py
   branches/gcomprixogoo/src/administration-activity/admin/group_user_list.py
   branches/gcomprixogoo/src/administration-activity/admin/log_list.py
   branches/gcomprixogoo/src/administration-activity/admin/module.py
   branches/gcomprixogoo/src/administration-activity/admin/module_boards.py
   branches/gcomprixogoo/src/administration-activity/admin/module_groups.py
   branches/gcomprixogoo/src/administration-activity/admin/module_profiles.py
   branches/gcomprixogoo/src/administration-activity/admin/module_reports.py
   branches/gcomprixogoo/src/administration-activity/admin/module_users.py
   branches/gcomprixogoo/src/administration-activity/admin/profile_edit.py
   branches/gcomprixogoo/src/administration-activity/admin/profile_group_list.py
   branches/gcomprixogoo/src/administration-activity/admin/profile_list.py
   branches/gcomprixogoo/src/administration-activity/admin/user_edit.py
   branches/gcomprixogoo/src/administration-activity/admin/user_list.py
   branches/gcomprixogoo/src/administration-activity/admin/wordlist.py
   branches/gcomprixogoo/src/administration-activity/administration.py
   branches/gcomprixogoo/src/anim-activity/anim.py
   branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py
   branches/gcomprixogoo/src/chat-activity/chat.py
   branches/gcomprixogoo/src/connect4-activity/connect4.py
   branches/gcomprixogoo/src/followline-activity/followline.py
   branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py
   branches/gcomprixogoo/src/login-activity/login.py
   branches/gcomprixogoo/src/redraw-activity/redraw.py
   branches/gcomprixogoo/src/searace-activity/searace.py
   branches/gcomprixogoo/src/sudoku-activity/sudoku.py
   branches/gcomprixogoo/src/tuxpaint-activity/tuxpaint.py

Modified: branches/gcomprixogoo/src/administration-activity/admin/board_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/board_list.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/board_list.py	Thu Feb 14 00:52:32 2008
@@ -25,7 +25,7 @@
 import gtk
 import gtk.gdk
 import gobject
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 # Database
 #from pysqlite2 import dbapi2 as sqlite

Modified: branches/gcomprixogoo/src/administration-activity/admin/class_edit.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/class_edit.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/class_edit.py	Thu Feb 14 00:52:32 2008
@@ -20,7 +20,7 @@
 
 import gtk
 import gobject
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 # Database
 from pysqlite2 import dbapi2 as sqlite

Modified: branches/gcomprixogoo/src/administration-activity/admin/class_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/class_list.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/class_list.py	Thu Feb 14 00:52:32 2008
@@ -24,7 +24,7 @@
 import gtk
 import gtk.gdk
 import gobject
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 # Database
 from pysqlite2 import dbapi2 as sqlite

Modified: branches/gcomprixogoo/src/administration-activity/admin/group_edit.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/group_edit.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/group_edit.py	Thu Feb 14 00:52:32 2008
@@ -20,7 +20,7 @@
 
 import gtk
 import gobject
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 import group_user_list
 

Modified: branches/gcomprixogoo/src/administration-activity/admin/group_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/group_list.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/group_list.py	Thu Feb 14 00:52:32 2008
@@ -24,7 +24,7 @@
 import gtk
 import gtk.gdk
 import gobject
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 # Database
 from pysqlite2 import dbapi2 as sqlite

Modified: branches/gcomprixogoo/src/administration-activity/admin/group_user_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/group_user_list.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/group_user_list.py	Thu Feb 14 00:52:32 2008
@@ -24,7 +24,7 @@
 import gtk
 import gtk.gdk
 import gobject
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 import constants
 

Modified: branches/gcomprixogoo/src/administration-activity/admin/log_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/log_list.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/log_list.py	Thu Feb 14 00:52:32 2008
@@ -25,7 +25,7 @@
 import gtk
 import gtk.gdk
 import gobject
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 # Database
 from pysqlite2 import dbapi2 as sqlite

Modified: branches/gcomprixogoo/src/administration-activity/admin/module.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/module.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/module.py	Thu Feb 14 00:52:32 2008
@@ -25,7 +25,7 @@
 import gcompris.skin
 import gtk
 import gtk.gdk
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 class Module:
     """GCompris Administrative Module"""

Modified: branches/gcomprixogoo/src/administration-activity/admin/module_boards.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/module_boards.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/module_boards.py	Thu Feb 14 00:52:32 2008
@@ -24,7 +24,7 @@
 import gcompris.admin
 import gtk
 import gtk.gdk
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 import sys;
 
 # Database

Modified: branches/gcomprixogoo/src/administration-activity/admin/module_groups.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/module_groups.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/module_groups.py	Thu Feb 14 00:52:32 2008
@@ -23,7 +23,7 @@
 import gcompris.skin
 import gtk
 import gtk.gdk
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 # Database
 from pysqlite2 import dbapi2 as sqlite

Modified: branches/gcomprixogoo/src/administration-activity/admin/module_profiles.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/module_profiles.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/module_profiles.py	Thu Feb 14 00:52:32 2008
@@ -23,7 +23,7 @@
 import gcompris.skin
 import gtk
 import gtk.gdk
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 import module
 import profile_list

Modified: branches/gcomprixogoo/src/administration-activity/admin/module_reports.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/module_reports.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/module_reports.py	Thu Feb 14 00:52:32 2008
@@ -24,7 +24,7 @@
 import gtk
 import gtk.gdk
 import gobject
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 # Database
 from pysqlite2 import dbapi2 as sqlite

Modified: branches/gcomprixogoo/src/administration-activity/admin/module_users.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/module_users.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/module_users.py	Thu Feb 14 00:52:32 2008
@@ -24,7 +24,7 @@
 import gtk
 import gtk.gdk
 import gobject
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 # Database
 from pysqlite2 import dbapi2 as sqlite

Modified: branches/gcomprixogoo/src/administration-activity/admin/profile_edit.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/profile_edit.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/profile_edit.py	Thu Feb 14 00:52:32 2008
@@ -20,7 +20,8 @@
 
 import gtk
 import gobject
-from gettext import gettext as _
+import gcompris
+from gcompris import gcompris_gettext as _
 
 import profile_group_list
 

Modified: branches/gcomprixogoo/src/administration-activity/admin/profile_group_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/profile_group_list.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/profile_group_list.py	Thu Feb 14 00:52:32 2008
@@ -24,7 +24,7 @@
 import gtk
 import gtk.gdk
 import gobject
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 import constants
 

Modified: branches/gcomprixogoo/src/administration-activity/admin/profile_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/profile_list.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/profile_list.py	Thu Feb 14 00:52:32 2008
@@ -24,7 +24,7 @@
 import gtk
 import gtk.gdk
 import gobject
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 # Database
 from pysqlite2 import dbapi2 as sqlite

Modified: branches/gcomprixogoo/src/administration-activity/admin/user_edit.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/user_edit.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/user_edit.py	Thu Feb 14 00:52:32 2008
@@ -20,7 +20,8 @@
 
 import gtk
 import gobject
-from gettext import gettext as _
+import gcompris
+from gcompris import gcompris_gettext as _
 
 # Database
 from pysqlite2 import dbapi2 as sqlite

Modified: branches/gcomprixogoo/src/administration-activity/admin/user_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/user_list.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/user_list.py	Thu Feb 14 00:52:32 2008
@@ -23,7 +23,7 @@
 import gtk
 import gtk.gdk
 import gobject
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 # Database
 from pysqlite2 import dbapi2 as sqlite

Modified: branches/gcomprixogoo/src/administration-activity/admin/wordlist.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/wordlist.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/wordlist.py	Thu Feb 14 00:52:32 2008
@@ -25,7 +25,7 @@
 import gtk
 import gtk.gdk
 import gobject
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 import glob
 

Modified: branches/gcomprixogoo/src/administration-activity/administration.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/administration.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/administration.py	Thu Feb 14 00:52:32 2008
@@ -23,7 +23,7 @@
 import gcompris.skin
 import gtk
 import gtk.gdk
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 # To add a panel, add a python module in the admin subdir
 # This module must have a start() and end() function

Modified: branches/gcomprixogoo/src/anim-activity/anim.py
==============================================================================
--- branches/gcomprixogoo/src/anim-activity/anim.py	(original)
+++ branches/gcomprixogoo/src/anim-activity/anim.py	Thu Feb 14 00:52:32 2008
@@ -23,7 +23,7 @@
 # in parameters of graphicals object between shots?
 
 
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 # PythonTest Board module
 import gobject
 import goocanvas

Modified: branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py
==============================================================================
--- branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py	(original)
+++ branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py	Thu Feb 14 00:52:32 2008
@@ -9,7 +9,7 @@
 import gcompris.sound
 import gtk
 import gtk.gdk
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 # ----------------------------------------
 # Hit left shift and right shift together to send the ball straight

Modified: branches/gcomprixogoo/src/chat-activity/chat.py
==============================================================================
--- branches/gcomprixogoo/src/chat-activity/chat.py	(original)
+++ branches/gcomprixogoo/src/chat-activity/chat.py	Thu Feb 14 00:52:32 2008
@@ -16,9 +16,9 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-from gettext import gettext as _
 import goocanvas
 import gcompris
+from gcompris import gcompris_gettext as _
 import gcompris.utils
 import gcompris.bonus
 import gcompris.skin

Modified: branches/gcomprixogoo/src/connect4-activity/connect4.py
==============================================================================
--- branches/gcomprixogoo/src/connect4-activity/connect4.py	(original)
+++ branches/gcomprixogoo/src/connect4-activity/connect4.py	Thu Feb 14 00:52:32 2008
@@ -33,7 +33,7 @@
 import gtk
 import gtk.gdk
 import cairo
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 from  connect4p import rules
 from  connect4p import human

Modified: branches/gcomprixogoo/src/followline-activity/followline.py
==============================================================================
--- branches/gcomprixogoo/src/followline-activity/followline.py	(original)
+++ branches/gcomprixogoo/src/followline-activity/followline.py	Thu Feb 14 00:52:32 2008
@@ -29,7 +29,7 @@
 import gtk.gdk
 import random
 import math
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 # ----------------------------------------
 #

Modified: branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py
==============================================================================
--- branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py	(original)
+++ branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py	Thu Feb 14 00:52:32 2008
@@ -34,7 +34,7 @@
 import gtk.gdk
 import random
 import math
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 class Number:
     def __init__(self, text, good):

Modified: branches/gcomprixogoo/src/login-activity/login.py
==============================================================================
--- branches/gcomprixogoo/src/login-activity/login.py	(original)
+++ branches/gcomprixogoo/src/login-activity/login.py	Thu Feb 14 00:52:32 2008
@@ -24,7 +24,7 @@
 import gtk
 import gtk.gdk
 import pango
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 import math
 

Modified: branches/gcomprixogoo/src/redraw-activity/redraw.py
==============================================================================
--- branches/gcomprixogoo/src/redraw-activity/redraw.py	(original)
+++ branches/gcomprixogoo/src/redraw-activity/redraw.py	Thu Feb 14 00:52:32 2008
@@ -16,7 +16,7 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 # PythonTest Board module
 import goocanvas
 import gcompris

Modified: branches/gcomprixogoo/src/searace-activity/searace.py
==============================================================================
--- branches/gcomprixogoo/src/searace-activity/searace.py	(original)
+++ branches/gcomprixogoo/src/searace-activity/searace.py	Thu Feb 14 00:52:32 2008
@@ -26,7 +26,7 @@
 import random
 import math
 import time
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 class Boat:
   """The Boat Class"""

Modified: branches/gcomprixogoo/src/sudoku-activity/sudoku.py
==============================================================================
--- branches/gcomprixogoo/src/sudoku-activity/sudoku.py	(original)
+++ branches/gcomprixogoo/src/sudoku-activity/sudoku.py	Thu Feb 14 00:52:32 2008
@@ -26,7 +26,7 @@
 import gtk
 import gtk.gdk
 import random
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 class Gcompris_sudoku:
   """Sudoku game"""

Modified: branches/gcomprixogoo/src/tuxpaint-activity/tuxpaint.py
==============================================================================
--- branches/gcomprixogoo/src/tuxpaint-activity/tuxpaint.py	(original)
+++ branches/gcomprixogoo/src/tuxpaint-activity/tuxpaint.py	Thu Feb 14 00:52:32 2008
@@ -31,7 +31,7 @@
 import platform
 
 #import gobject
-from gettext import gettext as _
+from gcompris import gcompris_gettext as _
 
 pid = None