[Wesnoth-cvs-commits] wesnoth/src game.cpp multiplayer.cpp multiplaye...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/02/27 18:10:48

Modified files:
        src            : game.cpp multiplayer.cpp 
                         multiplayer_connect.cpp playturn.cpp 
                         reports.cpp 

Log message:
        move more colons following a translatable label into the label

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.200&tr2=1.201&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.141&tr2=1.142&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.116&tr2=1.117&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.333&tr2=1.334&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/reports.cpp.diff?tr1=1.60&tr2=1.61&r1=text&r2=text

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.200 wesnoth/src/game.cpp:1.201
--- wesnoth/src/game.cpp:1.200  Sun Feb 27 17:15:38 2005
+++ wesnoth/src/game.cpp        Sun Feb 27 18:10:48 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.200 2005/02/27 17:15:38 gruikya Exp $ */
+/* $Id: game.cpp,v 1.201 2005/02/27 18:10:48 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1289,7 +1289,7 @@
        host_or_join.push_back(pre + "ai.png" + sep1 + _("Human vs AI") + sep2 
+ _("Play a game against AI opponents"));
 
        std::string login = preferences::login();
-       const int res = 
gui::show_dialog(disp(),NULL,_("Multiplayer"),"",gui::OK_CANCEL,&host_or_join,NULL,_("Login")
 + std::string(": "),&login);
+       const int res = 
gui::show_dialog(disp(),NULL,_("Multiplayer"),"",gui::OK_CANCEL,&host_or_join,NULL,_("Login:
 "),&login);
 
        if(res >= 0) {
                preferences::set_login(login);
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.141 wesnoth/src/multiplayer.cpp:1.142
--- wesnoth/src/multiplayer.cpp:1.141   Sat Feb 26 22:41:19 2005
+++ wesnoth/src/multiplayer.cpp Sun Feb 27 18:10:48 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.141 2005/02/26 22:41:19 gruikya Exp $ */
+/* $Id: multiplayer.cpp,v 1.142 2005/02/27 18:10:48 ydirson Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -84,7 +84,7 @@
                h = preferences::network_host();
                const int res = gui::show_dialog(disp, NULL, _("Connect to 
Host"), "",
                                gui::OK_CANCEL, NULL, NULL,
-                               _("Choose host to connect to") + std::string(": 
"), &h);
+                               _("Choose host to connect to: "), &h);
 
                if(res != 0 || h.empty()) {
                        return ABORT_SERVER;
@@ -134,7 +134,7 @@
                        if(!first_time) {       
                                const int res = gui::show_dialog(disp, NULL, "",
                                                _("You must log in to this 
server"), gui::OK_CANCEL,
-                                               NULL, NULL, _("Login") + 
std::string(": "), &login);
+                                               NULL, NULL, _("Login: "), 
&login);
                                if(res != 0 || login.empty()) {
                                        return ABORT_SERVER;
                                }
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.116 
wesnoth/src/multiplayer_connect.cpp:1.117
--- wesnoth/src/multiplayer_connect.cpp:1.116   Sun Feb 27 17:15:38 2005
+++ wesnoth/src/multiplayer_connect.cpp Sun Feb 27 18:10:48 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.116 2005/02/27 17:15:38 gruikya Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.117 2005/02/27 18:10:48 ydirson Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -783,7 +783,7 @@
 
        const config* const era_cfg = game_config().find_child("era","id",era_);
        if(era_cfg == NULL) {
-               throw config::error(_("Era not available") + std::string(": ") 
+ era_);
+               throw config::error(_("Era not available: ") + era_);
        }
 
        era_sides_ = era_cfg->get_children("multiplayer_side");
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.333 wesnoth/src/playturn.cpp:1.334
--- wesnoth/src/playturn.cpp:1.333      Sun Feb 27 17:15:38 2005
+++ wesnoth/src/playturn.cpp    Sun Feb 27 18:10:48 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.333 2005/02/27 17:15:38 gruikya Exp $ */
+/* $Id: playturn.cpp,v 1.334 2005/02/27 18:10:48 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -648,7 +648,7 @@
                preview_panes.push_back(&defender_preview);
 
                res = gui::show_dialog(gui_,NULL,_("Attack Enemy"),
-                               _("Choose weapon")+std::string(":\n"),
+                               _("Choose weapon:")+std::string("\n"),
                                
gui::OK_CANCEL,&items,&preview_panes,"",NULL,-1,NULL,NULL,-1,-1,
                                NULL,&buttons);
        }
@@ -1780,7 +1780,7 @@
                preview_panes.push_back(&unit_preview);
 
                recruit_res = gui::show_dialog(gui_,NULL,_("Recruit"),
-                               _("Select unit") + std::string(":\n"),
+                               _("Select unit:") + std::string("\n"),
                                
gui::OK_CANCEL,&items,&preview_panes,"",NULL,-1,NULL,NULL,-1,-1,
                                NULL,NULL,"recruit_and_recall");
        }
@@ -1964,7 +1964,7 @@
                        preview_panes.push_back(&unit_preview);
 
                        res = gui::show_dialog(gui_,NULL,_("Recall"),
-                                       _("Select unit") + std::string(":\n"),
+                                       _("Select unit:") + std::string("\n"),
                                        gui::OK_CANCEL,&options,
                                        &preview_panes,"",NULL,-1,
                                        NULL,NULL,-1,-1,NULL,&buttons);
Index: wesnoth/src/reports.cpp
diff -u wesnoth/src/reports.cpp:1.60 wesnoth/src/reports.cpp:1.61
--- wesnoth/src/reports.cpp:1.60        Sun Feb 27 15:43:31 2005
+++ wesnoth/src/reports.cpp     Sun Feb 27 18:10:48 2005
@@ -369,7 +369,7 @@
                        return report();
                }
 
-               str << _("Observers") << ":\n";
+               str << _("Observers:") << "\n";
 
                for(std::set<std::string>::const_iterator i = 
observers.begin(); i != observers.end(); ++i) {
                        str << *i << "\n";