add declarations of the textdomain to all files from the domains...

...-lib and -test even if they got no translateable strings the
declaration is done via this define: #define GETTEXT_DOMAIN
"wesnoth-lib" a short "how to get .cpp files translated" is left in
src/gettext.hpp

src/font.cpp

@@ -13,6 +13,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include "config.hpp"

src/gettext.hpp

@@ -15,6 +15,21 @@
 #ifndef GETTEXT_HPP_INCLUDED
 #define GETTEXT_HPP_INCLUDED
 
+/**
+ * How to use gettext for wesnoth source files:
+ * 1) include this header file in the .cpp file
+ * 2) add this include to set the correct textdomain, in this example
+ *    wesnoth-lib (not required for the domain 'wesnoth', required for all
+ *    other textdomains):
+ *    #define GETTEXT_DOMAIN "wesnoth-lib"
+ * 3) make sure, that the source file is listed in the respective POTFILES.in
+ *    for the textdomain, in the case of wesnoth-lib it is this file:
+ *    po/wesnoth-lib/POTFILES.in
+ * This should be all that is required to have your strings that are marked
+ * translateable in the po files and translated ingame. So you at least have
+ * to mark the strings translateable, too. ;)
+ */
+
 // gettext-related declarations
 
 #include <libintl.h>

src/gui/dialogs/addon_connect.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/dialogs/addon_connect.hpp"
 
 #include "gui/widgets/window.hpp"

src/gui/dialogs/dialog.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/dialogs/dialog.hpp"
 
 #include "foreach.hpp"

src/gui/dialogs/language_selection.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/dialogs/language_selection.hpp"
 
 #include "foreach.hpp"

src/gui/dialogs/message.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/dialogs/message.hpp"
 
 #include "gui/widgets/button.hpp"

src/gui/dialogs/mp_connect.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/dialogs/mp_connect.hpp"
 
 #include "foreach.hpp"

src/gui/dialogs/mp_method_selection.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/dialogs/mp_method_selection.hpp"
 
 #include "gui/widgets/listbox.hpp"

src/gui/dialogs/wml_message.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/dialogs/wml_message.hpp"
 
 #include "gui/widgets/window.hpp"

src/gui/widgets/button.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/button.hpp"
 
 #include "gui/widgets/window.hpp"

src/gui/widgets/container.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/container.hpp"
 
 namespace gui2 {

src/gui/widgets/control.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "control.hpp"
 
 #include "foreach.hpp"

src/gui/widgets/debug.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #define NEW_DRAW
 
 #ifdef DEBUG_WINDOW_LAYOUT_GRAPHS

src/gui/widgets/event_handler.cpp

@@ -19,6 +19,7 @@
  * More documentation at the end of the file.
  */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
 
 #include "clipboard.hpp"
 #include "gui/widgets/window.hpp"

src/gui/widgets/generator.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #define NEW_DRAW
 
 #ifdef NEW_DRAW

src/gui/widgets/grid.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/grid.hpp"
 
 #include "foreach.hpp"

src/gui/widgets/horizontal_scrollbar.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/horizontal_scrollbar.hpp"
 
 namespace gui2 {

src/gui/widgets/image.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/image.hpp"
 
 #include "../../image.hpp"

src/gui/widgets/label.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/label.hpp"
 
 

src/gui/widgets/listbox.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/listbox.hpp"
 
 #ifndef NEW_DRAW

src/gui/widgets/menubar.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/menubar.hpp"
 
 #include "gui/widgets/selectable.hpp"

src/gui/widgets/minimap.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/minimap.hpp"
 
 #include "map.hpp"

src/gui/widgets/panel.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/panel.hpp"
 
 

src/gui/widgets/scroll_label.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/scroll_label.hpp"
 
 #include "gui/widgets/label.hpp"

src/gui/widgets/scrollbar.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/scrollbar.hpp"
 
 #include "foreach.hpp"

src/gui/widgets/scrollbar_container.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #define NEW_DRAW
 
 #ifdef NEW_DRAW

src/gui/widgets/slider.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/slider.hpp"
 
 #include "foreach.hpp"

src/gui/widgets/spacer.cpp

@@ -12,7 +12,7 @@
    see the copying file for more details.
 */
 
-
+#define GETTEXT_DOMAIN "wesnoth-lib"
 
 namespace gui2 {
 

src/gui/widgets/text.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/text.hpp"
 
 #include "clipboard.hpp"

src/gui/widgets/text_box.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/text_box.hpp"
 
 #include "font.hpp"

src/gui/widgets/toggle_button.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/toggle_button.hpp"
 
 #include "foreach.hpp"

src/gui/widgets/toggle_panel.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/toggle_panel.hpp"
 
 #include "foreach.hpp"

src/gui/widgets/tooltip.cpp

@@ -12,7 +12,7 @@
    see the copying file for more details.
 */
 
-
+#define GETTEXT_DOMAIN "wesnoth-lib"
 
 namespace gui2 {
 

src/gui/widgets/vertical_scrollbar.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/vertical_scrollbar.hpp"
 
 

src/gui/widgets/vertical_scrollbar_container.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/vertical_scrollbar_container.hpp"
 
 #include "foreach.hpp"

src/gui/widgets/widget.cpp

@@ -12,6 +12,8 @@
    see the copying file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/window.hpp"
 
 namespace gui2 {

src/gui/widgets/window.cpp

@@ -17,6 +17,8 @@
  *  Implementation of window.hpp.
  */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "gui/widgets/window.hpp"
 
 #include "cursor.hpp"

src/image.cpp

@@ -17,6 +17,8 @@
  * Routines for images: load, scale, re-color, etc.
  */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include "config.hpp"

src/terrain_filter.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include "actions.hpp"

src/tests/gui/test_drop_target.cpp

@@ -12,10 +12,10 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-test"
+
 #include "tests/utils/test_support.hpp"
 
-
-
 #include <boost/bind.hpp>
 
 #include "sdl_utils.hpp"

src/tests/gui/test_save_dialog.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-test"
+
 #include "tests/utils/test_support.hpp"
 
 #include <boost/test/unit_test_suite.hpp>

src/tests/main.cpp

@@ -11,6 +11,9 @@
 
    See the COPYING file for more details.
 */
+
+#define GETTEXT_DOMAIN "wesnoth-test"
+
 #include <boost/version.hpp>
 
 #define BOOST_TEST_MODULE wesnoth unit tests master suite

src/tests/test_formula_ai.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-test"
+
 #include "utils/test_support.hpp"
 
 

src/tests/test_network_worker.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-test"
+
 #include "utils/test_support.hpp"
 
 

src/tests/test_policy.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-test"
+
 #include "utils/test_support.hpp"
 
 #include "copy_policy.hpp"

src/tests/test_team.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-test"
+
 #include "utils/test_support.hpp"
 
 

src/tests/test_util.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-test"
+
 #include "utils/test_support.hpp"
 
 #include "util.hpp"

src/tests/test_version.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-test"
+
 #include "utils/test_support.hpp"
 #include "version.hpp"
 

src/tests/utils/fake_display.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-test"
+
 #include "fake_display.hpp"
 
 #include "gamestatus.hpp"

src/tests/utils/fake_event_source.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-test"
+
 #include "tests/utils/fake_event_source.hpp"
 
 #include "mouse_handler_base.hpp"

src/tests/utils/play_scenario.cpp

@@ -12,6 +12,7 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-test"
 
 #include "tests/utils/play_scenario.hpp"
 #include "tests/utils/game_config_manager.hpp"

src/text.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "text.hpp"
 
 #include "gui/widgets/helper.hpp"

src/widgets/button.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include "widgets/button.hpp"

src/widgets/combo.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include "widgets/combo.hpp"

src/widgets/combo_drag.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include "widgets/combo_drag.hpp"

src/widgets/drop_target.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "widgets/drop_target.hpp"
 
 #include <boost/bind.hpp>

src/widgets/label.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include "widgets/label.hpp"

src/widgets/menu.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include "widgets/menu.hpp"

src/widgets/menu_style.cpp

@@ -13,6 +13,7 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
 
 #include "global.hpp"
 

src/widgets/progressbar.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include "widgets/progressbar.hpp"

src/widgets/scrollarea.cpp

@@ -14,6 +14,8 @@
 
 /** @file widgets/scrollarea.cpp */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include "widgets/scrollarea.hpp"

src/widgets/scrollbar.cpp

@@ -15,6 +15,8 @@
 
 /** @file widgets/scrollbar.cpp */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include "widgets/scrollbar.hpp"

src/widgets/scrollpane.cpp

@@ -14,6 +14,8 @@
 
 /** @file widgets/scrollpane.cpp */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include <algorithm>

src/widgets/slider.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include "widgets/slider.hpp"

src/widgets/textbox.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include "widgets/textbox.hpp"

src/widgets/widget.cpp

@@ -12,6 +12,8 @@
    See the COPYING file for more details.
 */
 
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
 #include "global.hpp"
 
 #include "widgets/widget.hpp"