[Wesnoth-cvs-commits] wesnoth/src multiplayer_client.cpp playturn.cpp

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/11/25 00:34:04

Modified files:
        src            : multiplayer_client.cpp playturn.cpp 

Log message:
        distinguish "gold as a measurement unit" from "gold as a resource name"

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_client.cpp.diff?tr1=1.77&tr2=1.78&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.296&tr2=1.297&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_client.cpp
diff -u wesnoth/src/multiplayer_client.cpp:1.77 
wesnoth/src/multiplayer_client.cpp:1.78
--- wesnoth/src/multiplayer_client.cpp:1.77     Thu Nov 18 04:08:32 2004
+++ wesnoth/src/multiplayer_client.cpp  Thu Nov 25 00:34:04 2004
@@ -123,7 +123,7 @@
                        str << description << "," << side_name << ",";
                        if(!leader_name.empty())
                                str << "(" << leader_name << ")";
-                       str << "," << sd["gold"] << " " << _("Gold") << "," << 
sd["team_name"];
+                       str << "," << sd["gold"] << " " << _("unit^Gold") << 
"," << sd["team_name"];
                        details.push_back(str.str());
                }
 
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.296 wesnoth/src/playturn.cpp:1.297
--- wesnoth/src/playturn.cpp:1.296      Mon Nov 22 21:39:13 2004
+++ wesnoth/src/playturn.cpp    Thu Nov 25 00:34:04 2004
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.296 2004/11/22 21:39:13 silene Exp $ */
+/* $Id: playturn.cpp,v 1.297 2004/11/25 00:34:04 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1616,7 +1616,7 @@
                std::stringstream description;
 
                description << font::IMAGE << type.image() << "," << 
font::LARGE_TEXT << prefix << type.language_name() << "\n"
-                           << prefix << type.cost() << " " << _("Gold");
+                           << prefix << type.cost() << " " << _("unit^Gold");
                items.push_back(description.str());
                sample_units.push_back(unit(&type,team_num_));
        }