[gcompris] Improved message string for 'default'

[Bruno Coudoin <bcoudoin src gnome org>]

commit b2ff28454ae0d0cf61d213fb14b1c93948ffa380
Author: GunChleoc <fios foramnagaidhlig net>
Date:   Sat May 18 16:26:34 2013 +0100

    Improved message string for 'default'

 src/administration-activity/admin/log_list.py     |    2 ++
 src/administration-activity/admin/profile_list.py |    1 +
 src/administration-activity/admin/wordlist.py     |    6 ++++--
 src/login-activity/login.py                       |    6 ++++--
 src/pythontest-activity/pythontest.py             |    6 ++++--
 src/tuxpaint-activity/tuxpaint.py                 |    9 +++++++--
 6 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/src/administration-activity/admin/log_list.py b/src/administration-activity/admin/log_list.py
index bb56160..4f5afe3 100644
--- a/src/administration-activity/admin/log_list.py
+++ b/src/administration-activity/admin/log_list.py
@@ -105,6 +105,7 @@ class Log_list:
       for auser in user_list:
 
         if(auser[0] == -1 or not auser[0]):
+          # This is the name of the Default user profile
           self.combo_user.append_text(_("Default"))
           self.user_list.append(-1)
           continue
@@ -295,6 +296,7 @@ class Log_list:
     elif  alog[COLUMN_STATUS] == gcompris.bonus.COMPLETED:
         status = "Compl."
 
+    # This is the name of the Default user profile
     login = _("Default")
     self.cur.execute('SELECT login FROM users WHERE user_id=?', (alog[COLUMN_USER],))
     result = self.cur.fetchall()
diff --git a/src/administration-activity/admin/profile_list.py 
b/src/administration-activity/admin/profile_list.py
index cda0fdd..8dfbb69 100644
--- a/src/administration-activity/admin/profile_list.py
+++ b/src/administration-activity/admin/profile_list.py
@@ -114,6 +114,7 @@ class Profile_list:
       self.button_remove.show()
       self.button_remove.set_sensitive(False)
 
+      # This is the name of the Default user profile
       self.button_default = gtk.Button(_("Default"))
       self.button_default.connect("clicked", self.on_default_profile_clicked, treeview_profile)
       vbox_button.pack_start(self.button_default, False, False, 0)
diff --git a/src/administration-activity/admin/wordlist.py b/src/administration-activity/admin/wordlist.py
index 556b7ee..b20003c 100644
--- a/src/administration-activity/admin/wordlist.py
+++ b/src/administration-activity/admin/wordlist.py
@@ -42,8 +42,10 @@ class Words_list:
     files = glob.glob('wordlist_*.xml')
 
     self.main_vbox = gcompris.configuration_window ( \
-      _('<b>{config}</b> configuration\n for profile <b>{profile}</b>').format(config='Wordlist',
-                                                                               
profile=self.active_profile.name),
+      _('<b>{config}</b> configuration\n for profile <b>{profile}</b>').format( \
+                        config='Wordlist',
+                        # This is the name of the Default user profile
+                        profile=profile.name if profile else _("Default")),
       self.wordlist_callback
       )
 
diff --git a/src/login-activity/login.py b/src/login-activity/login.py
index 7bd673b..299454d 100644
--- a/src/login-activity/login.py
+++ b/src/login-activity/login.py
@@ -477,8 +477,10 @@ class Gcompris_login:
     #we can add what you want in it.
 
     bconf = gcompris.configuration_window ( \
-      _('<b>{0}</b> configuration\n for profile <b>{1}</b>')\
-        .format('Login', ( profile.name if profile else _("Default") ) ),
+      _('<b>{config}</b> configuration\n for profile <b>{profile}</b>').format( \
+                        config='Login',
+                        # This is the name of the Default user profile
+                        profile=profile.name if profile else _("Default")),
       self.ok_callback
       )
 
diff --git a/src/pythontest-activity/pythontest.py b/src/pythontest-activity/pythontest.py
index 783b841..a367913 100644
--- a/src/pythontest-activity/pythontest.py
+++ b/src/pythontest-activity/pythontest.py
@@ -445,8 +445,10 @@ class Gcompris_pythontest:
     #we can add what you want in it.
 
     bconf = gcompris.configuration_window ( \
-      _('<b>%s</b> configuration\n for profile <b>%s</b>')
-      % ('Pythontest', (profile.name if profile else "") ),
+      _('<b>{config}</b> configuration\n for profile <b>{profile}</b>').format( \
+                        config='Pythontest',
+                        # This is the name of the Default user profile
+                        profile=profile.name if profile else _("Default")),
       self.ok_callback
       )
 
diff --git a/src/tuxpaint-activity/tuxpaint.py b/src/tuxpaint-activity/tuxpaint.py
index 6722c2c..f06d8e7 100644
--- a/src/tuxpaint-activity/tuxpaint.py
+++ b/src/tuxpaint-activity/tuxpaint.py
@@ -182,8 +182,13 @@ class Gcompris_tuxpaint:
     #set already configured values
     self.config_dict.update(gcompris.get_conf(profile, self.gcomprisBoard))
 
-    bconfig = gcompris.configuration_window(_('<b>%s</b> configuration\n for profile <b>%s</b>') % 
('Tuxpaint', profile.name ),
-                                                   self.apply_callback)
+    bconfig = gcompris.configuration_window( \
+      _('<b>{config}</b> configuration\n for profile <b>{profile}</b>').format( \
+                        config='Tuxpaint',
+                        # This is the name of the Default user profile
+                        profile=profile.name if profile else _("Default")),
+      self.apply_callback
+      )
 
 
     gcompris.boolean_box(bconfig, _('Inherit fullscreen setting from GCompris'), 'fullscreen', 
eval(self.config_dict['fullscreen']))