Merge branch 'master' of git://github.com/wesnoth/wesnoth

changelog

@@ -82,6 +82,9 @@ Version 1.13.0-dev:
      without contents or in the wrong state during WML start events until they
      are interacted with or control is given to the player for the first time.
    * Added a new subdialog in Preferences to clean or purge the WML cache.
+   * Fixed AI engine names in the MP game setup screen being translated to the
+     language selected when Wesnoth was started rather than the current
+     language (bug #22092).
  * WML engine:
    * Added customizable recall costs for unit types and individual units,
      using the new recall_cost attribute in [unit_type] and [unit].

src/ai/configuration.cpp

@@ -112,7 +112,7 @@ void configuration::init(const config &game_config)
 
 		description desc;
 		desc.id=id;
-		desc.text = ai_configuration["description"].str();
+		desc.text = ai_configuration["description"].t_str();
 		desc.cfg=ai_configuration;
 
 		ai_configurations_.insert(std::make_pair(id,desc));
@@ -137,7 +137,7 @@ void extract_ai_configurations(std::map<std::string, description> &storage, cons
 
 		description desc;
 		desc.id=id;
-		desc.text = ai_configuration["description"].str();
+		desc.text = ai_configuration["description"].t_str();
 		desc.cfg=ai_configuration;
 
 		storage.insert(std::make_pair(id,desc));

src/ai/configuration.hpp

@@ -51,7 +51,7 @@ public:
 	{
 	}
 
-	std::string text;
+	t_string text;
 	std::string id;
 	config cfg;
 };