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

This commit is contained in:
Guillaume Melquiond 2004-10-30 21:55:42 +00:00
parent 73e452d6cd
commit 70d6ef3989
2 changed files with 6 additions and 12 deletions

View file

@ -113,12 +113,6 @@ options= _ "Options"
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..."

View file

@ -872,18 +872,18 @@ struct terrain_topic_generator: topic_generator
}
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();
}
};