[Wesnoth-cvs-commits] wesnoth/src builder.cpp game.cpp mapgen_dialog....

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      05/02/27 17:15:40

Modified files:
        src            : builder.cpp game.cpp mapgen_dialog.cpp 
                         multiplayer_connect.cpp multiplayer_create.cpp 
                         playturn.cpp 

Log message:
        Fixed some translatable strings
        * Included the colons in colon-terminated strings.
        * Used vgettext for some composed string.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/builder.cpp.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.199&tr2=1.200&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen_dialog.cpp.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.115&tr2=1.116&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_create.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.332&tr2=1.333&r1=text&r2=text

Patches:
Index: wesnoth/src/builder.cpp
diff -u wesnoth/src/builder.cpp:1.43 wesnoth/src/builder.cpp:1.44
--- wesnoth/src/builder.cpp:1.43        Sun Feb 27 14:09:10 2005
+++ wesnoth/src/builder.cpp     Sun Feb 27 17:15:38 2005
@@ -1,4 +1,4 @@
-/* $Id: builder.cpp,v 1.43 2005/02/27 14:09:10 gruikya Exp $ */
+/* $Id: builder.cpp,v 1.44 2005/02/27 17:15:38 gruikya Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -687,7 +687,7 @@
                                loc.y = atoi((**tc)["y"].c_str());
                        } 
                        if(!(**tc)["loc"].empty()) {
-                               std::vector<std::string> sloc = 
utils::split((**tc)["pos"]);
+                               std::vector<std::string> sloc = 
utils::split((**tc)["loc"]);
                                if(sloc.size() == 2) {
                                        loc.x = atoi(sloc[0].c_str());
                                        loc.y = atoi(sloc[1].c_str());
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.199 wesnoth/src/game.cpp:1.200
--- wesnoth/src/game.cpp:1.199  Sat Feb 26 18:52:24 2005
+++ wesnoth/src/game.cpp        Sun Feb 27 17:15:38 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.199 2005/02/26 18:52:24 gruikya Exp $ */
+/* $Id: game.cpp,v 1.200 2005/02/27 17:15:38 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1360,7 +1360,7 @@
        
std::transform(langdefs.begin(),langdefs.end(),std::back_inserter(langs),languagedef_name);
 
        const int res = gui::show_dialog(disp(),NULL,_("Language"),
-                                _("Choose your preferred language") + 
std::string(":"),
+                                _("Choose your preferred language:"),
                                 gui::OK_CANCEL,&langs);
        if(size_t(res) < langs.size()) {
                ::set_language(known_languages[res]);
Index: wesnoth/src/mapgen_dialog.cpp
diff -u wesnoth/src/mapgen_dialog.cpp:1.29 wesnoth/src/mapgen_dialog.cpp:1.30
--- wesnoth/src/mapgen_dialog.cpp:1.29  Thu Nov 18 04:08:32 2004
+++ wesnoth/src/mapgen_dialog.cpp       Sun Feb 27 17:15:38 2005
@@ -79,13 +79,13 @@
        SDL_Rect dialog_rect = {xpos,ypos,width,height};
        surface_restorer dialog_restorer(&disp.video(),dialog_rect);
 
-       const std::string& players_label = _("Players") + std::string(":");
-       const std::string& width_label = _("Width") + std::string(":");
-       const std::string& height_label = _("Height") + std::string(":");
-       const std::string& iterations_label = _("Iterations") + 
std::string(":");
-       const std::string& hillsize_label = _("Bump Size") + std::string(":");
-       const std::string& villages_label = _("Villages") + std::string(":");
-       const std::string& landform_label = _("Landform") + std::string(":");
+       const std::string& players_label = _("Players:");
+       const std::string& width_label = _("Width:");
+       const std::string& height_label = _("Height:");
+       const std::string& iterations_label = _("Iterations:");
+       const std::string& hillsize_label = _("Bump Size:");
+       const std::string& villages_label = _("Villages:");
+       const std::string& landform_label = _("Landform:");
 
        SDL_Rect players_rect = 
font::draw_text(NULL,disp.screen_area(),font::SIZE_NORMAL,font::NORMAL_COLOUR,players_label,0,0);
        SDL_Rect width_rect = 
font::draw_text(NULL,disp.screen_area(),font::SIZE_NORMAL,font::NORMAL_COLOUR,width_label,0,0);
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.115 
wesnoth/src/multiplayer_connect.cpp:1.116
--- wesnoth/src/multiplayer_connect.cpp:1.115   Sat Feb 26 18:10:01 2005
+++ wesnoth/src/multiplayer_connect.cpp Sun Feb 27 17:15:38 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.115 2005/02/26 18:10:01 gruikya Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.116 2005/02/27 17:15:38 gruikya Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -423,7 +423,9 @@
                        const int lchoice = rand() % types.size();
                        leader_ = types[lchoice];
                } else {
-                       throw config::error(_("Unable to find a leader type for 
faction ") + fact["name"]);
+                       string_map i18n_symbols;
+                       i18n_symbols["faction"] = fact["name"];
+                       throw config::error(vgettext("Unable to find a leader 
type for faction $faction", i18n_symbols));
                }
        }
 }
@@ -914,7 +916,9 @@
        // Initialize the list of sides available for the current era.
        const config* const era_cfg = game_config().find_child("era","id",era_);
        if(era_cfg == NULL) {
-               throw config::error(_("Cannot find era ") + era_);
+               string_map i18n_symbols;
+               i18n_symbols["era"] = era_;
+               throw config::error(vgettext("Cannot find era $era", 
i18n_symbols));
        }
        era_sides_ = era_cfg->get_children("multiplayer_side");
 
Index: wesnoth/src/multiplayer_create.cpp
diff -u wesnoth/src/multiplayer_create.cpp:1.6 
wesnoth/src/multiplayer_create.cpp:1.7
--- wesnoth/src/multiplayer_create.cpp:1.6      Sun Feb 27 15:43:31 2005
+++ wesnoth/src/multiplayer_create.cpp  Sun Feb 27 17:15:38 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_create.cpp,v 1.6 2005/02/27 15:43:31 ydirson Exp $ */
+/* $Id: multiplayer_create.cpp,v 1.7 2005/02/27 17:15:38 gruikya Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -36,10 +36,10 @@
        village_gold_label_(disp, "", font::SIZE_SMALL, font::GOOD_COLOUR),
        xp_modifier_slider_(disp),
        xp_modifier_label_(disp, "", font::SIZE_SMALL, font::GOOD_COLOUR),
-       name_entry_label_(disp, _("Name of game") + std::string(":"), 
font::SIZE_SMALL, font::GOOD_COLOUR),
+       name_entry_label_(disp, _("Name of game:"), font::SIZE_SMALL, 
font::GOOD_COLOUR),
        num_players_label_(disp, "", font::SIZE_SMALL, font::GOOD_COLOUR),
-       era_label_(disp, _("Era") + std::string(":"), font::SIZE_SMALL, 
font::GOOD_COLOUR),
-       map_label_(disp, _("Map to play") + std::string(":"), font::SIZE_SMALL, 
font::GOOD_COLOUR),
+       era_label_(disp, _("Era:"), font::SIZE_SMALL, font::GOOD_COLOUR),
+       map_label_(disp, _("Map to play:"), font::SIZE_SMALL, 
font::GOOD_COLOUR),
        fog_game_(disp, _("Fog Of War"), gui::button::TYPE_CHECK),
        shroud_game_(disp, _("Shroud"), gui::button::TYPE_CHECK),
        observers_game_(disp, _("Observers"), gui::button::TYPE_CHECK),
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.332 wesnoth/src/playturn.cpp:1.333
--- wesnoth/src/playturn.cpp:1.332      Sun Feb 27 15:43:31 2005
+++ wesnoth/src/playturn.cpp    Sun Feb 27 17:15:38 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.332 2005/02/27 15:43:31 ydirson Exp $ */
+/* $Id: playturn.cpp,v 1.333 2005/02/27 17:15:38 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -2008,7 +2008,7 @@
 
 void turn_info::speak()
 {
-       create_textbox(floating_textbox::TEXTBOX_MESSAGE,_("Message") + 
std::string(":"), has_friends() ? _("Send to allies only") : "", 
preferences::message_private());
+       create_textbox(floating_textbox::TEXTBOX_MESSAGE,_("Message:"), 
has_friends() ? _("Send to allies only") : "", preferences::message_private());
 }
 
 void turn_info::do_speak(const std::string& message, bool allies_only)
@@ -2458,7 +2458,7 @@
 
        std::string label = gui_.labels().get_label(last_hex_);
        const int res = gui::show_dialog(gui_,NULL,_("Place 
Label"),"",gui::OK_CANCEL,
-                                        NULL,NULL,_("Label") + 
std::string(":"),&label,
+                                        NULL,NULL,_("Label:"),&label,
                                         map_labels::get_max_chars());
        if(res == 0) {
                gui_.labels().set_label(last_hex_,label);