[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src about.cpp actions.cpp dialogs.cpp d...
From: |
Yann Dirson |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src about.cpp actions.cpp dialogs.cpp d... |
Date: |
Wed, 09 Mar 2005 17:58:19 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <address@hidden> 05/03/09 22:58:18
Modified files:
src : about.cpp actions.cpp dialogs.cpp display.cpp
font.cpp game.cpp gettext.hpp help.cpp
hotkeys.cpp intro.cpp language.cpp language.hpp
mapgen_dialog.cpp playlevel.cpp playturn.cpp
preferences.cpp reports.cpp show_dialog.cpp
titlescreen.cpp unit.cpp unit_types.cpp
src/editor : editor.cpp editor_dialogs.cpp
editor_palettes.cpp
src/widgets : file_chooser.cpp
Log message:
include cleanup: gettext, language
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/about.cpp.diff?tr1=1.100&tr2=1.101&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.194&tr2=1.195&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.84&tr2=1.85&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.292&tr2=1.293&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.cpp.diff?tr1=1.117&tr2=1.118&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.204&tr2=1.205&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gettext.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.71&tr2=1.72&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/hotkeys.cpp.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/intro.cpp.diff?tr1=1.66&tr2=1.67&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.cpp.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.hpp.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen_dialog.cpp.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.cpp.diff?tr1=1.180&tr2=1.181&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.338&tr2=1.339&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.138&tr2=1.139&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/reports.cpp.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/show_dialog.cpp.diff?tr1=1.109&tr2=1.110&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/titlescreen.cpp.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.125&tr2=1.126&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.cpp.diff?tr1=1.85&tr2=1.86&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor.cpp.diff?tr1=1.96&tr2=1.97&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_dialogs.cpp.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_palettes.cpp.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/file_chooser.cpp.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
Patches:
Index: wesnoth/src/about.cpp
diff -u wesnoth/src/about.cpp:1.100 wesnoth/src/about.cpp:1.101
--- wesnoth/src/about.cpp:1.100 Tue Mar 8 14:18:08 2005
+++ wesnoth/src/about.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: about.cpp,v 1.100 2005/03/08 14:18:08 ettin Exp $ */
+/* $Id: about.cpp,v 1.101 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -15,9 +15,9 @@
#include "events.hpp"
#include "font.hpp"
#include "game_config.hpp"
+#include "gettext.hpp"
#include "image.hpp"
#include "key.hpp"
-#include "language.hpp"
#include "display.hpp"
#include "show_dialog.hpp"
#include "sdl_utils.hpp"
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.194 wesnoth/src/actions.cpp:1.195
--- wesnoth/src/actions.cpp:1.194 Thu Mar 3 22:43:25 2005
+++ wesnoth/src/actions.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.194 2005/03/03 22:43:25 ydirson Exp $ */
+/* $Id: actions.cpp,v 1.195 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -18,8 +18,8 @@
#include "events.hpp"
#include "game_config.hpp"
#include "game_events.hpp"
+#include "gettext.hpp"
#include "key.hpp"
-#include "language.hpp"
#include "log.hpp"
#include "map.hpp"
#include "pathfind.hpp"
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.84 wesnoth/src/dialogs.cpp:1.85
--- wesnoth/src/dialogs.cpp:1.84 Sun Feb 27 15:43:31 2005
+++ wesnoth/src/dialogs.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: dialogs.cpp,v 1.84 2005/02/27 15:43:31 ydirson Exp $ */
+/* $Id: dialogs.cpp,v 1.85 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -18,6 +18,7 @@
#include "filesystem.hpp"
#include "font.hpp"
#include "game_config.hpp"
+#include "gettext.hpp"
#include "help.hpp"
#include "language.hpp"
#include "log.hpp"
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.292 wesnoth/src/display.cpp:1.293
--- wesnoth/src/display.cpp:1.292 Tue Mar 8 02:52:45 2005
+++ wesnoth/src/display.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: display.cpp,v 1.292 2005/03/08 02:52:45 Sirp Exp $ */
+/* $Id: display.cpp,v 1.293 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -18,6 +18,7 @@
#include "events.hpp"
#include "font.hpp"
#include "game_config.hpp"
+#include "gettext.hpp"
#include "halo.hpp"
#include "hotkeys.hpp"
#include "image.hpp"
Index: wesnoth/src/editor/editor.cpp
diff -u wesnoth/src/editor/editor.cpp:1.96 wesnoth/src/editor/editor.cpp:1.97
--- wesnoth/src/editor/editor.cpp:1.96 Sat Mar 5 19:03:56 2005
+++ wesnoth/src/editor/editor.cpp Wed Mar 9 22:58:18 2005
@@ -20,9 +20,9 @@
#include "../font.hpp"
#include "../game_config.hpp"
#include "../gamestatus.hpp"
+#include "../gettext.hpp"
#include "../key.hpp"
#include "../widgets/menu.hpp"
-#include "../language.hpp"
#include "../pathfind.hpp"
#include "../playlevel.hpp"
#include "../preferences.hpp"
Index: wesnoth/src/editor/editor_dialogs.cpp
diff -u wesnoth/src/editor/editor_dialogs.cpp:1.22
wesnoth/src/editor/editor_dialogs.cpp:1.23
--- wesnoth/src/editor/editor_dialogs.cpp:1.22 Sat Mar 5 16:07:54 2005
+++ wesnoth/src/editor/editor_dialogs.cpp Wed Mar 9 22:58:18 2005
@@ -16,8 +16,8 @@
#include "../show_dialog.hpp"
#include "../config.hpp"
#include "../events.hpp"
-#include "../language.hpp"
#include "../game_config.hpp"
+#include "../gettext.hpp"
#include "../mapgen.hpp"
#include "../map_create.hpp"
#include "../filesystem.hpp"
Index: wesnoth/src/editor/editor_palettes.cpp
diff -u wesnoth/src/editor/editor_palettes.cpp:1.23
wesnoth/src/editor/editor_palettes.cpp:1.24
--- wesnoth/src/editor/editor_palettes.cpp:1.23 Fri Dec 31 21:01:38 2004
+++ wesnoth/src/editor/editor_palettes.cpp Wed Mar 9 22:58:18 2005
@@ -19,7 +19,7 @@
#include "../show_dialog.hpp"
#include "../image.hpp"
#include "../reports.hpp"
-#include "../language.hpp"
+#include "../gettext.hpp"
#include "../util.hpp"
#include "../wassert.hpp"
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.117 wesnoth/src/font.cpp:1.118
--- wesnoth/src/font.cpp:1.117 Tue Mar 8 02:16:32 2005
+++ wesnoth/src/font.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.117 2005/03/08 02:16:32 Sirp Exp $ */
+/* $Id: font.cpp,v 1.118 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -17,7 +17,7 @@
#include "font.hpp"
#include "filesystem.hpp"
#include "game_config.hpp"
-#include "language.hpp"
+#include "gettext.hpp"
#include "log.hpp"
#include "sdl_utils.hpp"
#include "team.hpp"
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.204 wesnoth/src/game.cpp:1.205
--- wesnoth/src/game.cpp:1.204 Sat Mar 5 11:14:17 2005
+++ wesnoth/src/game.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.204 2005/03/05 11:14:17 silene Exp $ */
+/* $Id: game.cpp,v 1.205 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -28,6 +28,7 @@
#include "game_config.hpp"
#include "game_events.hpp"
#include "gamestatus.hpp"
+#include "gettext.hpp"
#include "hotkeys.hpp"
#include "intro.hpp"
#include "key.hpp"
Index: wesnoth/src/gettext.hpp
diff -u wesnoth/src/gettext.hpp:1.5 wesnoth/src/gettext.hpp:1.6
--- wesnoth/src/gettext.hpp:1.5 Sun Dec 5 18:24:44 2004
+++ wesnoth/src/gettext.hpp Wed Mar 9 22:58:18 2005
@@ -1,10 +1,12 @@
#ifndef GETTEXT_HPP_INCLUDED
#define GETTEXT_HPP_INCLUDED
+// gettext-related declarations
+
#include "config.hpp"
-// gettext-related declarations
#include <libintl.h>
+#include <string>
const char* egettext (const char*);
const char* sgettext (const char*);
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.71 wesnoth/src/help.cpp:1.72
--- wesnoth/src/help.cpp:1.71 Sat Mar 5 10:54:25 2005
+++ wesnoth/src/help.cpp Wed Mar 9 22:58:18 2005
@@ -17,6 +17,7 @@
#include "events.hpp"
#include "font.hpp"
#include "game_config.hpp"
+#include "gettext.hpp"
#include "help.hpp"
#include "image.hpp"
#include "language.hpp"
Index: wesnoth/src/hotkeys.cpp
diff -u wesnoth/src/hotkeys.cpp:1.67 wesnoth/src/hotkeys.cpp:1.68
--- wesnoth/src/hotkeys.cpp:1.67 Sat Mar 5 19:03:56 2005
+++ wesnoth/src/hotkeys.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: hotkeys.cpp,v 1.67 2005/03/05 19:03:56 j_daniel Exp $ */
+/* $Id: hotkeys.cpp,v 1.68 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -18,7 +18,7 @@
#include "config.hpp"
#include "events.hpp"
#include "hotkeys.hpp"
-#include "language.hpp"
+#include "gettext.hpp"
#include "playlevel.hpp"
#include "preferences.hpp"
#include "show_dialog.hpp"
Index: wesnoth/src/intro.cpp
diff -u wesnoth/src/intro.cpp:1.66 wesnoth/src/intro.cpp:1.67
--- wesnoth/src/intro.cpp:1.66 Thu Mar 3 21:52:39 2005
+++ wesnoth/src/intro.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: intro.cpp,v 1.66 2005/03/03 21:52:39 gruikya Exp $ */
+/* $Id: intro.cpp,v 1.67 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -16,10 +16,10 @@
#include "events.hpp"
#include "font.hpp"
#include "game_config.hpp"
+#include "gettext.hpp"
#include "image.hpp"
#include "intro.hpp"
#include "key.hpp"
-#include "language.hpp"
#include "show_dialog.hpp"
#include "sound.hpp"
#include "util.hpp"
Index: wesnoth/src/language.cpp
diff -u wesnoth/src/language.cpp:1.74 wesnoth/src/language.cpp:1.75
--- wesnoth/src/language.cpp:1.74 Sat Mar 5 10:54:25 2005
+++ wesnoth/src/language.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: language.cpp,v 1.74 2005/03/05 10:54:25 silene Exp $ */
+/* $Id: language.cpp,v 1.75 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -14,6 +14,7 @@
#include "global.hpp"
#include "config.hpp"
+#include "gettext.hpp"
#include "language.hpp"
#include "preferences.hpp"
#include "util.hpp"
Index: wesnoth/src/language.hpp
diff -u wesnoth/src/language.hpp:1.32 wesnoth/src/language.hpp:1.33
--- wesnoth/src/language.hpp:1.32 Thu Mar 3 21:52:39 2005
+++ wesnoth/src/language.hpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: language.hpp,v 1.32 2005/03/03 21:52:39 gruikya Exp $ */
+/* $Id: language.hpp,v 1.33 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,9 +13,6 @@
#ifndef LANGUAGE_HPP_INCLUDED
#define LANGUAGE_HPP_INCLUDED
-#include "config.hpp"
-#include "gettext.hpp"
-
#include <map>
#include <string>
#include <vector>
Index: wesnoth/src/mapgen_dialog.cpp
diff -u wesnoth/src/mapgen_dialog.cpp:1.30 wesnoth/src/mapgen_dialog.cpp:1.31
--- wesnoth/src/mapgen_dialog.cpp:1.30 Sun Feb 27 17:15:38 2005
+++ wesnoth/src/mapgen_dialog.cpp Wed Mar 9 22:58:18 2005
@@ -4,7 +4,7 @@
#include "events.hpp"
#include "font.hpp"
-#include "language.hpp"
+#include "gettext.hpp"
#include "mapgen.hpp"
#include "show_dialog.hpp"
#include "util.hpp"
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.180 wesnoth/src/playlevel.cpp:1.181
--- wesnoth/src/playlevel.cpp:1.180 Sun Mar 6 18:12:17 2005
+++ wesnoth/src/playlevel.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.180 2005/03/06 18:12:17 ydirson Exp $ */
+/* $Id: playlevel.cpp,v 1.181 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -16,11 +16,11 @@
#include "cursor.hpp"
#include "events.hpp"
#include "filesystem.hpp"
+#include "gettext.hpp"
#include "halo.hpp"
#include "help.hpp"
#include "hotkeys.hpp"
#include "intro.hpp"
-#include "language.hpp"
#include "log.hpp"
#include "mapgen.hpp"
#include "map_create.hpp"
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.338 wesnoth/src/playturn.cpp:1.339
--- wesnoth/src/playturn.cpp:1.338 Sat Mar 5 15:39:18 2005
+++ wesnoth/src/playturn.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.338 2005/03/05 15:39:18 j_daniel Exp $ */
+/* $Id: playturn.cpp,v 1.339 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -15,10 +15,10 @@
#include "actions.hpp"
#include "events.hpp"
+#include "gettext.hpp"
#include "help.hpp"
#include "hotkeys.hpp"
#include "image.hpp"
-#include "language.hpp"
#include "log.hpp"
#include "map_label.hpp"
#include "mouse.hpp"
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.138 wesnoth/src/preferences.cpp:1.139
--- wesnoth/src/preferences.cpp:1.138 Tue Mar 8 02:52:45 2005
+++ wesnoth/src/preferences.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.138 2005/03/08 02:52:45 Sirp Exp $ */
+/* $Id: preferences.cpp,v 1.139 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -19,8 +19,8 @@
#include "events.hpp"
#include "filesystem.hpp"
#include "font.hpp"
+#include "gettext.hpp"
#include "hotkeys.hpp"
-#include "language.hpp"
#include "log.hpp"
#include "preferences.hpp"
#include "show_dialog.hpp"
Index: wesnoth/src/reports.cpp
diff -u wesnoth/src/reports.cpp:1.61 wesnoth/src/reports.cpp:1.62
--- wesnoth/src/reports.cpp:1.61 Sun Feb 27 18:10:48 2005
+++ wesnoth/src/reports.cpp Wed Mar 9 22:58:18 2005
@@ -3,6 +3,7 @@
#include "actions.hpp"
#include "font.hpp"
#include "game_config.hpp"
+#include "gettext.hpp"
#include "language.hpp"
#include "reports.hpp"
#include "wassert.hpp"
Index: wesnoth/src/show_dialog.cpp
diff -u wesnoth/src/show_dialog.cpp:1.109 wesnoth/src/show_dialog.cpp:1.110
--- wesnoth/src/show_dialog.cpp:1.109 Sat Feb 12 15:29:32 2005
+++ wesnoth/src/show_dialog.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: show_dialog.cpp,v 1.109 2005/02/12 15:29:32 ydirson Exp $ */
+/* $Id: show_dialog.cpp,v 1.110 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -19,10 +19,10 @@
#include "cursor.hpp"
#include "events.hpp"
#include "font.hpp"
+#include "gettext.hpp"
#include "help.hpp"
#include "hotkeys.hpp"
#include "image.hpp"
-#include "language.hpp"
#include "log.hpp"
#include "playlevel.hpp"
#include "show_dialog.hpp"
Index: wesnoth/src/titlescreen.cpp
diff -u wesnoth/src/titlescreen.cpp:1.33 wesnoth/src/titlescreen.cpp:1.34
--- wesnoth/src/titlescreen.cpp:1.33 Sat Mar 5 10:54:25 2005
+++ wesnoth/src/titlescreen.cpp Wed Mar 9 22:58:18 2005
@@ -8,7 +8,7 @@
#include "game_config.hpp"
#include "hotkeys.hpp"
#include "key.hpp"
-#include "language.hpp"
+#include "gettext.hpp"
#include "log.hpp"
#include "preferences.hpp"
#include "sdl_utils.hpp"
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.125 wesnoth/src/unit.cpp:1.126
--- wesnoth/src/unit.cpp:1.125 Wed Mar 9 17:01:09 2005
+++ wesnoth/src/unit.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.125 2005/03/09 17:01:09 ydirson Exp $ */
+/* $Id: unit.cpp,v 1.126 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -15,7 +15,7 @@
#include "game_config.hpp"
#include "gamestatus.hpp"
-#include "language.hpp"
+#include "gettext.hpp"
#include "log.hpp"
#include "pathfind.hpp"
#include "preferences.hpp"
Index: wesnoth/src/unit_types.cpp
diff -u wesnoth/src/unit_types.cpp:1.85 wesnoth/src/unit_types.cpp:1.86
--- wesnoth/src/unit_types.cpp:1.85 Tue Mar 1 00:07:20 2005
+++ wesnoth/src/unit_types.cpp Wed Mar 9 22:58:18 2005
@@ -1,4 +1,4 @@
-/* $Id: unit_types.cpp,v 1.85 2005/03/01 00:07:20 Sirp Exp $ */
+/* $Id: unit_types.cpp,v 1.86 2005/03/09 22:58:18 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -15,7 +15,7 @@
#include "game_config.hpp"
#include "gamestatus.hpp"
-#include "language.hpp"
+#include "gettext.hpp"
#include "log.hpp"
#include "unit_types.hpp"
#include "util.hpp"
Index: wesnoth/src/widgets/file_chooser.cpp
diff -u wesnoth/src/widgets/file_chooser.cpp:1.23
wesnoth/src/widgets/file_chooser.cpp:1.24
--- wesnoth/src/widgets/file_chooser.cpp:1.23 Fri Feb 25 01:07:20 2005
+++ wesnoth/src/widgets/file_chooser.cpp Wed Mar 9 22:58:18 2005
@@ -18,7 +18,7 @@
#include "../events.hpp"
#include "../filesystem.hpp"
#include "../font.hpp"
-#include "../language.hpp"
+#include "../gettext.hpp"
#include "../show_dialog.hpp"
#include "../wml_separators.hpp"
#include "file_chooser.hpp"
- [Wesnoth-cvs-commits] wesnoth/src about.cpp actions.cpp dialogs.cpp d...,
Yann Dirson <=