Commit 20968e74 authored by Bruno Coudoin's avatar Bruno Coudoin

Removed translation on all g_warning().

	improved erase to try to avoid to remove 2 images in one shot
	when they are underneath. It's just a little better than before.
parent a2dad75d
2005-11-12 Bruno coudoin <bruno.coudoin@free.fr>
Removed translation on all g_warning().
improved erase to try to avoid to remove 2 images in one shot
when they are underneath. It's just a little better than before.
* src/boards/advanced_colors.c: (read_xml_file):
* src/boards/erase.c: (start_board), (end_board), (set_level),
(game_won), (item_event):
* src/boards/imageid.c: (read_xml_file):
* src/boards/missingletter.c: (read_xml_file):
* src/boards/read_colors.c: (read_xml_file):
* src/boards/shapegame.c: (read_xml_file):
* src/gcompris/config.c: (gcompris_config_start):
* src/gcompris/file_selector.c: (load_mime_type_from_file):
* src/gcompris/gameutil.c: (gcompris_load_pixmap),
(gcompris_read_xml_file):
* src/gcompris/gcompris.c: (setup_window),
(gcompris_set_fullscreen):
* src/gcompris/images_selector.c: (gcompris_images_selector_start),
(parseImage), (read_xml_file):
* src/gcompris/skin.c: (gcompris_image_to_skin),
(gcompris_skin_xml_load):
* src/gcompris/soundutil.c: (scheduler_bgnd):
* src/gcompris/wordlist.c: (gcompris_get_wordlist_from_file):
2005-11-12 Yves Combe <yves@ycombe.net>
add gtans based board
......
......@@ -530,10 +530,10 @@ static gboolean read_xml_file(char *fname)
/* if the file doesn't exist */
if(!g_file_test(fname, G_FILE_TEST_EXISTS))
{
g_warning(_("Couldn't find file %s !"), fname);
g_warning("Couldn't find file %s !", fname);
return FALSE;
}
g_warning(_("find file %s !"), fname);
g_warning("found file %s !", fname);
/* parse the new file and put the result into newdoc */
doc = xmlParseFile(fname);
......
......@@ -182,17 +182,17 @@ static void start_board (GcomprisBoard *agcomprisBoard)
GtkSettings *DefaultsGtkSettings = gtk_settings_get_default ();
if (DefaultsGtkSettings == NULL) {
g_warning(_("Couldn't get GTK settings"));
g_warning("Couldn't get GTK settings");
} else {
g_object_get(G_OBJECT(DefaultsGtkSettings),
"gtk-double-click-time", &DefaultDoubleClicDistance, NULL);
g_warning(_("Double-click default value %d."),DefaultDoubleClicDistance);
g_warning("Double-click default value %d.",DefaultDoubleClicDistance);
}
gdk_display_set_double_click_time( gdk_display_get_default(),
DoubleClicLevel[gcomprisBoard->level-1]);
g_warning(_("Double-click value is now %d."),DoubleClicLevel[gcomprisBoard->level-1]);
g_warning("Double-click value is now %d.",DoubleClicLevel[gcomprisBoard->level-1]);
}
current_image = 0;
......@@ -210,7 +210,7 @@ static void end_board ()
if (board_mode == DOUBLECLIC){
gdk_display_set_double_click_time( gdk_display_get_default(),
DefaultDoubleClicDistance);
g_warning(_("Double click value is now %d."),DefaultDoubleClicDistance);
g_warning("Double click value is now %d.",DefaultDoubleClicDistance);
}
if(gcomprisBoard!=NULL)
{
......@@ -233,7 +233,7 @@ static void set_level (guint level)
if (board_mode == DOUBLECLIC){
gdk_display_set_double_click_time( gdk_display_get_default(),
DoubleClicLevel[gcomprisBoard->level-1]);
g_warning(_("Double click value is now %d."),DoubleClicLevel[gcomprisBoard->level-1]);
g_warning("Double click value is now %d.",DoubleClicLevel[gcomprisBoard->level-1]);
}
}
......@@ -396,7 +396,7 @@ static void game_won()
if (board_mode == DOUBLECLIC){
gdk_display_set_double_click_time( gdk_display_get_default(),
DoubleClicLevel[gcomprisBoard->level-1]);
g_warning(_("Double click value is now %d."),DoubleClicLevel[gcomprisBoard->level-1]);
g_warning("Double click value is now %d.", DoubleClicLevel[gcomprisBoard->level-1]);
}
gcompris_play_ogg ("bonus", NULL);
......@@ -411,7 +411,10 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data)
if(board_paused)
return FALSE;
if (event->type == GDK_MOTION_NOTIFY)
return;
if (board_mode == NORMAL)
if (event->type != GDK_ENTER_NOTIFY)
return FALSE;
......@@ -437,8 +440,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data)
}
gtk_object_destroy(GTK_OBJECT(item));
if(--number_of_item == 0)
{
gamewon = TRUE;
......
......@@ -639,10 +639,10 @@ static gboolean read_xml_file(char *fname)
/* if the file doesn't exist */
if(!g_file_test(fname, G_FILE_TEST_EXISTS))
{
g_warning(_("Couldn't find file %s !"), fname);
g_warning("Couldn't find file %s !", fname);
return FALSE;
}
g_warning(_("find file %s !"), fname);
g_warning("found file %s !", fname);
/* parse the new file and put the result into newdoc */
doc = xmlParseFile(fname);
......
......@@ -652,10 +652,10 @@ static gboolean read_xml_file(char *fname)
/* if the file doesn't exist */
if(!g_file_test(fname, G_FILE_TEST_EXISTS))
{
g_warning(_("Couldn't find file %s !"), fname);
g_warning("Couldn't find file %s !", fname);
return FALSE;
}
g_warning(_("find file %s !"), fname);
g_warning("found file %s !", fname);
/* parse the new file and put the result into newdoc */
doc = xmlParseFile(fname);
......
......@@ -82,8 +82,8 @@ static BoardPlugin menu_bp =
{
NULL,
NULL,
N_("Read Colors"),
N_("Click on the corresponding color"),
"Read Colors",
"Click on the corresponding color",
"Pascal Georges pascal.georges1@free.fr>",
NULL,
NULL,
......@@ -488,10 +488,10 @@ static gboolean read_xml_file(char *fname)
/* if the file doesn't exist */
if(!g_file_test(fname, G_FILE_TEST_EXISTS))
{
g_warning(_("Couldn't find file %s !"), fname);
g_warning("Couldn't find file %s !", fname);
return FALSE;
}
g_warning(_("find file %s !"), fname);
g_warning("found file %s !", fname);
/* parse the new file and put the result into newdoc */
doc = xmlParseFile(fname);
......
/* gcompris - shapegame.c
*
* Time-stamp: <2005/10/12 23:25:16 bruno>
* Time-stamp: <2005/11/12 18:56:26 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -1899,10 +1899,10 @@ read_xml_file(char *fname)
/* if the file doesn't exist */
if(!g_file_test(fname, G_FILE_TEST_EXISTS))
{
g_warning(_("Couldn't find file %s !"), fname);
g_warning("Couldn't find file %s !", fname);
return FALSE;
}
g_warning(_("find file %s !"), fname);
g_warning("found file %s !", fname);
/* parse the new file and put the result into newdoc */
doc = xmlParseFile(fname);
......
/* gcompris - config.c
*
* Time-stamp: <2005/11/11 14:12:35 bruno>
* Time-stamp: <2005/11/12 19:00:36 bruno>
*
* Copyright (C) 2000-2003 Bruno Coudoin
*
......@@ -435,7 +435,7 @@ void gcompris_config_start ()
/* Should not happen. It the user found the config, there should be a skin */
if(g_list_length(skinlist) == 0) {
g_warning( _("No skin found in %s\n"), PACKAGE_DATA_DIR"/skins");
g_warning( "No skin found in %s\n", PACKAGE_DATA_DIR"/skins");
}
/* Find the current skin index */
......
/* gcompris - file_selector.c
*
* Time-stamp: <2005/10/01 00:19:33 bruno>
* Time-stamp: <2005/11/12 19:00:49 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -890,7 +890,7 @@ gboolean load_mime_type_from_file(gchar *fname)
/* if the file doesn't exist */
if(!g_file_test ((fname), G_FILE_TEST_EXISTS))
{
g_warning(_("Couldn't find file %s !"), fname);
g_warning("Couldn't find file %s !", fname);
return FALSE;
}
......
/* gcompris - gameutil.c
*
* Time-stamp: <2005/11/10 23:38:56 bruno>
* Time-stamp: <2005/11/12 19:01:33 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -183,7 +183,7 @@ GdkPixbuf *gcompris_load_pixmap(char *pixmapfile)
if (!filename) {
char *str;
g_warning (_("Couldn't find file %s !"), pixmapfile);
g_warning ("Couldn't find file %s !", pixmapfile);
str = g_strdup_printf("%s\n%s\n%s\n%s",
_("Couldn't find file"),
......@@ -580,8 +580,8 @@ GcomprisBoard *gcompris_read_xml_file(GcomprisBoard *gcomprisBoard,
if(!g_file_test ((filename), G_FILE_TEST_EXISTS))
{
g_warning(_("Couldn't find file %s !"), fname);
g_warning(_("Couldn't find file %s !"), filename);
g_warning("Couldn't find file %s !", fname);
g_warning("Couldn't find file %s !", filename);
g_free(filename);
g_free(gcomprisBoard);
return NULL;
......
......@@ -620,7 +620,7 @@ static void setup_window ()
* ------------------------
*/
if (!g_file_test ((GNOME_ICONDIR"/gcompris.png"), G_FILE_TEST_EXISTS)) {
g_warning (_("Couldn't find file %s !"), GNOME_ICONDIR"/gcompris.png" );
g_warning ("Couldn't find file %s !", GNOME_ICONDIR"/gcompris.png" );
}
gcompris_icon_pixbuf = gdk_pixbuf_new_from_file (GNOME_ICONDIR"/gcompris.png", &error);
if (!gcompris_icon_pixbuf)
......@@ -849,8 +849,8 @@ void gcompris_set_fullscreen(gboolean state)
}
xr_previous_size_set = FALSE;
#endif
gdk_window_set_decorations (window->window, 1);
gdk_window_set_functions (window->window, 1);
gdk_window_set_decorations (window->window, GDK_DECOR_ALL);
gdk_window_set_functions (window->window, GDK_FUNC_ALL);
gtk_widget_set_uposition (window, 0, 0);
gtk_window_unfullscreen (GTK_WINDOW(window));
}
......
/* gcompris - images_selector.c
*
* Time-stamp: <2005/11/11 00:17:31 bruno>
* Time-stamp: <2005/11/12 19:03:14 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -290,7 +290,7 @@ void gcompris_images_selector_start (GcomprisBoard *gcomprisBoard, gchar *datase
/* if the file doesn't exist */
if(g_file_test ((dataset), G_FILE_TEST_IS_DIR) )
{
g_warning(_("dataset %s is a directory. Trying to read xml "), dataset);
g_warning("dataset %s is a directory. Trying to read xml", dataset);
read_dataset_directory(dataset);
}
......@@ -633,7 +633,7 @@ parseImage (xmlDocPtr doc, xmlNodePtr cur) {
/* replace '~' by home dir */
pathname = g_strdup_printf("%s%s",g_get_home_dir(), pathname+1);
if (!g_file_test ((pathname), G_FILE_TEST_IS_DIR)){
g_warning(_("In ImageSet %s, the pathname for the home directory '%s' is not found. Skipping the whole ImageSet.\n"), imageSetName, pathname);
g_warning("In ImageSet %s, the pathname for the home directory '%s' is not found. Skipping the whole ImageSet.", imageSetName, pathname);
return;
}
}
......@@ -667,7 +667,7 @@ parseImage (xmlDocPtr doc, xmlNodePtr cur) {
if(!g_file_test ((absolutepath), G_FILE_TEST_EXISTS) )
{
g_warning(_("In ImageSet %s, an image is not found. Skipping ImageSet...\n"), absolutepath);
g_warning("In ImageSet %s, an image is not found. Skipping ImageSet...", absolutepath);
return;
}
......@@ -698,7 +698,7 @@ parseImage (xmlDocPtr doc, xmlNodePtr cur) {
g_free(pathname);
pathname = tmpdir;
if (!g_file_test ((pathname), G_FILE_TEST_IS_DIR)){
g_warning(_("In ImageSet %s, directory %s is not found. Skipping all the ImageSet...\n"), absolutepath, pathname);
g_warning("In ImageSet %s, directory %s is not found. Skipping all the ImageSet...", absolutepath, pathname);
return;
}
}
......@@ -768,7 +768,7 @@ read_xml_file(gchar *fname)
/* if the file doesn't exist */
if(!g_file_test ((fname), G_FILE_TEST_EXISTS))
{
g_warning(_("Couldn't find file %s !"), fname);
g_warning("Couldn't find file %s !", fname);
return FALSE;
}
......
......@@ -84,7 +84,7 @@ gchar *gcompris_image_to_skin(gchar *pixmapfile)
return(filename);
}
g_warning (_("Couldn't find file %s !"), filename);
g_warning ("Couldn't find file %s !", filename);
return(NULL);
}
......@@ -263,7 +263,7 @@ void gcompris_skin_xml_load (gchar* skin)
/* if the file doesn't exist */
if(!g_file_test(xmlfilename, G_FILE_TEST_EXISTS))
{
g_warning(_("Couldn't find file %s !"), xmlfilename);
g_warning("Couldn't find file %s !", xmlfilename);
return;
}
......
......@@ -183,7 +183,7 @@ static gpointer scheduler_bgnd (gpointer user_data)
dir = g_dir_open(filename, 0, NULL);
if (!dir) {
g_warning (_("Couldn't open music dir: %s"), filename);
g_warning ("Couldn't open music dir: %s", filename);
g_free(filename);
return NULL;
}
......@@ -229,7 +229,7 @@ static gpointer scheduler_bgnd (gpointer user_data)
exit:
g_list_free(musiclist);
g_warning( _("The background thread music is stopped now. The files in %s are not ogg vorbis OR the sound output failed"), PACKAGE_DATA_DIR "/music/background");
g_warning( "The background thread music is stopped now. The files in %s are not ogg vorbis OR the sound output failed", PACKAGE_DATA_DIR "/music/background");
return NULL;
}
/* =====================================================================
......
......@@ -46,7 +46,7 @@ GcomprisWordlist *gcompris_get_wordlist_from_file(gchar *filename)
g_free(xmlfilename);
xmlfilename = g_strdup_printf("%s/wordsgame/%s.xml", properties->package_data_dir, filename);
if(!g_file_test(xmlfilename, G_FILE_TEST_EXISTS)){
g_warning(_("Couldn't find file %s !"), xmlfilename);
g_warning("Couldn't find file %s !", xmlfilename);
g_free(xmlfilename);
return NULL;
}
......@@ -58,7 +58,7 @@ GcomprisWordlist *gcompris_get_wordlist_from_file(gchar *filename)
g_free(xmlfilename);
if(!xmldoc){
g_warning(_("Couldn't parse file %s !"), xmlfilename);
g_warning("Couldn't parse file %s !", xmlfilename);
return NULL;
}
......
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