[Wesnoth-cvs-commits] wesnoth src/help.cpp data/translations/english.cfg

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/10/30 21:55:42

Modified files:
        src            : help.cpp 
        data/translations: english.cfg 

Log message:
        Remove a few strings from english.cfg and put them where they belong.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/translations/english.cfg.diff?tr1=1.170&tr2=1.171&r1=text&r2=text

Patches:
Index: wesnoth/data/translations/english.cfg
diff -u wesnoth/data/translations/english.cfg:1.170 
wesnoth/data/translations/english.cfg:1.171
--- wesnoth/data/translations/english.cfg:1.170 Tue Oct 19 21:36:39 2004
+++ wesnoth/data/translations/english.cfg       Sat Oct 30 21:55:42 2004
@@ -113,12 +113,6 @@
 
 choose_scenario= _ "Choose Scenario"
 
-terrain_acts_as= _ "This terrain acts as $terrains for movement and defense 
purposes"
-best_terrain_chosen= _ "The terrain with the best modifier is chosen 
automatically"
-terrain_gives_healing= _ "This terrain gives healing"
-terrain_is_keep= _ "This terrain acts as keep, i.e., you can recruit units 
when a leader is in a location with this terrain"
-terrain_is_castle= _ "This terrain acts as castle, i.e., you can recruit units 
onto a location with this terrain"
-or= _ "or"
 unit_resistance_table= _ "Unit resistance table"
 
 see_also= _ "See Also..."
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.44 wesnoth/src/help.cpp:1.45
--- wesnoth/src/help.cpp:1.44   Sat Oct 30 21:39:48 2004
+++ wesnoth/src/help.cpp        Sat Oct 30 21:55:42 2004
@@ -872,18 +872,18 @@
                        }
                        string_map sm;
                        sm["terrains"] = alias_ss.str();
-                       ss << 
config::interpolate_variables_into_string(string_table["terrain_acts_as"], &sm)
-                          << ".";
+                       ss << config::interpolate_variables_into_string(
+                               _("This terrain acts as $terrains for movement 
and defense purposes."), &sm);
                        if (aliased_terrains.size() > 1)
-                               ss << " " << 
string_table["best_terrain_chosen"] << ".";
+                               ss << " " << _("The terrain with the best 
modifier is chosen automatically.");
                        ss << "\n\n";
                }
                if (type.is_keep())
-                       ss << string_table["terrain_is_keep"] << ".\n\n";
+                       ss << _("This terrain acts as keep, i.e., you can 
recruit units when a leader is in a location with this terrain.") << "\n\n";
                if (type.is_castle())
-                       ss << string_table["terrain_is_castle"] << ".\n\n";
+                       ss << _("This terrain acts as castle, i.e., you can 
recruit units onto a location with this terrain.") << "\n\n";
                if (type.gives_healing())
-                       ss << string_table["terrain_gives_healing"] << ".\n\n";
+                       ss << _("This terrain gives healing.") << "\n\n";
                return ss.str();
        }
 };