[gcompris/gcomprixogoo] A set of changes to ease or fix translation issues.

[Bruno Coudoin <bcoudoin src gnome org>]

commit 82d30b8b3d6dc3543a9431ecf886c21abcd91d1f
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Fri Apr 9 00:45:55 2010 +0200

    A set of changes to ease or fix translation issues.

 src/gcompris/config.c                   |   14 ++++++--------
 src/gcompris/gcompris_db.c              |    2 +-
 src/gcompris/menu.c                     |    2 +-
 src/gcompris/sugar.c                    |    6 ++++--
 src/lightsoff-activity/lightsoff.xml.in |    2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/src/gcompris/config.c b/src/gcompris/config.c
index afc1528..9cbde2c 100644
--- a/src/gcompris/config.c
+++ b/src/gcompris/config.c
@@ -132,9 +132,8 @@ static gchar *timername[] = {
   N_("Fast timer")
 };
 
-static gchar *filtername[] = {
-  N_("<i>Use Gcompris administration module\nto filter boards</i>")
-};
+static gchar *filtername =
+  N_("Use Gcompris administration module to filter boards");
 
 static void set_locale_flag(gchar *locale);
 static gchar *get_next_locale(gchar *locale);
@@ -423,21 +422,20 @@ gc_config_start ()
   // Difficulty Filter
   y_start += Y_GAP;
 
-  //  display_previous_next(x_start, y_start, "filter_style_previous", "filter_style_next");
-
   stars_group_x = x_start + 45;
   stars_group_y = y_start - 25;
-
+  gchar *text = g_strdup_printf("<i>%s</i>", gettext(filtername));
   item_filter_text = goo_canvas_text_new (rootitem,
-					  gettext(filtername[0]),
+					  text,
 					  x_text_start,
 					  y_start,
-					  -1,
+					  400,
 					  GTK_ANCHOR_WEST,
 					  "use-markup", TRUE,
 					  "font", gc_skin_font_subtitle,
 					  "fill-color-rgba", gc_skin_color_content,
 					  NULL);
+  g_free(text);
 
 
   // OK
diff --git a/src/gcompris/gcompris_db.c b/src/gcompris/gcompris_db.c
index d2f2387..2b4e99c 100644
--- a/src/gcompris/gcompris_db.c
+++ b/src/gcompris/gcompris_db.c
@@ -890,7 +890,7 @@ GList *gc_menu_load_db(GList *boards_list)
     gcomprisBoard->demo = atoi(result[i++]);
 
     boards = g_list_append(boards, gcomprisBoard);
-    gchar *msg = g_strdup_printf("Loading activity from database:\n%s",
+    gchar *msg = g_strdup_printf(_("Loading activity from database:\n%s"),
 				 gettext(gcomprisBoard->title));
     gc_status_set_msg(msg);
     g_free(msg);
diff --git a/src/gcompris/menu.c b/src/gcompris/menu.c
index 5d96905..c4e2bbc 100644
--- a/src/gcompris/menu.c
+++ b/src/gcompris/menu.c
@@ -580,7 +580,7 @@ void gc_menu_load_dir(char *dirname, gboolean db){
 	      }
 	  }
 	  if (board_read) {
-	    gchar *msg = g_strdup_printf("Loading activity from file:\n%s",
+	    gchar *msg = g_strdup_printf(_("Loading activity from file:\n%s"),
 					 gettext(board_read->title));
 	    gc_status_set_msg(msg);
 	    g_free(msg);
diff --git a/src/gcompris/sugar.c b/src/gcompris/sugar.c
index c568773..72b2fda 100644
--- a/src/gcompris/sugar.c
+++ b/src/gcompris/sugar.c
@@ -81,7 +81,9 @@ static Button buttons[] = {
   { NULL, NULL, expander_new, NULL },
   { "view-fullscreen", N_("Zoom"), zoom_clicked_cb, NULL },
   { NULL, NULL, separator_new, NULL },
-  { "go-previous", N_("Back"), back_clicked_cb, NULL },
+  { "go-previous",
+    /* TRANSLATORS: Back as in previous */
+    N_("Back"), back_clicked_cb, NULL },
   { "activity-stop", N_("Stop"), stop_clicked_cb, NULL }
 };
 
@@ -240,7 +242,7 @@ level_clicked_cb(GtkToolButton *button, gpointer user_data)
   GcomprisBoard *board = gc_board_get_current();
   if (board == NULL)
       return;
-          
+
   gint delta = GPOINTER_TO_INT(user_data);
   current_level += delta;
 
diff --git a/src/lightsoff-activity/lightsoff.xml.in b/src/lightsoff-activity/lightsoff.xml.in
index 7a91388..d7da441 100644
--- a/src/lightsoff-activity/lightsoff.xml.in
+++ b/src/lightsoff-activity/lightsoff.xml.in
@@ -9,7 +9,7 @@
         author="Bruno and Clément coudoin"
         boarddir="">
         <_title>Lights Off</_title>
-        <_description>The aim is to switch off all the lights</_description>
+        <_description>The aim is to switch off all the lights.</_description>
         <_prerequisite></_prerequisite>
         <_goal>The aim is to switch off all the lights.</_goal>
 	<_manual>The effect of pressing a button is to toggle the state of that button, and of its immediate vertical and horizontal neighbours. The sun and the color of the sky depend on the number of clicks needed to solve the puzzle. If you click on Tux, the solution is shown.</_manual>