Clarified 'Evacuation' now taking place at Lake Vrug.

data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg

@@ -16,7 +16,7 @@
 
     [story]
         [part]
-            story= _ "Gweddry and his men had escaped from the orcish prisons. After a harried chase south, they found themselves surrounded by orcs at the Great River."
+            story= _ "Gweddry and his men had escaped from the orcish prisons, but after returning to the daylight they soon found themselves surrounded by a host of orcs."
             {EI_BIGMAP}
         [/part]
     [/story]
@@ -175,7 +175,7 @@
                 carryover_percentage=40
             [/gold_carryover]
 
-            note= _ "Note: every unit not on the south side of the river when the bridge is destroyed will be lost (including non-recalled units)"
+            note= _ "Note: every unit not south of the bridge when it is destroyed will be lost (including non-recalled units)"
         [/objectives]
     [/event]
 
@@ -221,7 +221,7 @@
         [/message]
         [message]
             speaker=Gweddry
-            message= _ "Very well, we’ll protect you from the undead. But we can’t help you until we get across this river. Now let’s go!"
+            message= _ "Very well, we’ll protect you from the undead. But we can’t help you until we get off this island. Now let’s go!"
         [/message]
         [message]
             speaker=Engineer

data/themes/default.cfg

@@ -7,8 +7,7 @@
 # http://www.wesnoth.org/forum/viewtopic.php?p=213708#213708
 
 [theme]
-    id=Default
-    name= _ "theme^Default"
+    name=Default
     description= _ "Default theme."
 
 #define DEFAULT_FONT_NORMAL

data/themes/editor.cfg

@@ -7,8 +7,7 @@
 # http://www.wesnoth.org/forum/viewtopic.php?p=213708#213708
 
 [theme]
-    id=editor
-    name= _ "theme^Editor"
+    name=editor
     hidden=yes
 
 #define DEFAULT_EDITOR_FONT_NORMAL

data/themes/null.cfg

@@ -5,7 +5,7 @@
 #
 
 [theme]
-    id=null
+    name=null
     hidden=yes
     [resolution]
         width=1

data/themes/pandora.cfg

@@ -18,8 +18,7 @@
 {themes/macros.cfg}
 
 [theme]
-    id=Pandora
-    name= _ "theme^Pandora"
+    name=Pandora
     description= _ "800x480 theme optimized for Pandora devices."
 
     [resolution]

data/themes/unit_box.cfg

@@ -7,8 +7,7 @@
 # http://www.wesnoth.org/forum/viewtopic.php?p=213708#213708
 
 [theme]
-    id=UnitBox
-    name= _ "theme^UnitBox"
+    name=UnitBox
     description= _ "Experimental work-in-progress replacement for the default theme."
 
 #define DEFAULT_FONT_NORMAL

data/themes/widescreen.cfg

@@ -7,8 +7,7 @@
 # http://www.wesnoth.org/forum/viewtopic.php?p=213708#213708
 
 [theme]
-    id=Widescreen
-    name= _ "theme^Widescreen"
+    name=Widescreen
     description= _ "Experimental theme optimized for widescreen resolutions."
 
 #define DEFAULT_FONT_NORMAL

src/controller_base.cpp

@@ -331,20 +331,12 @@ const config& controller_base::get_theme(const config& game_config, std::string
 {
 	if (theme_name.empty()) theme_name = preferences::theme();
 
-	if (const config &c = game_config.find_child("theme", "id", theme_name))
+	if (const config &c = game_config.find_child("theme", "name", theme_name))
 		return c;
 
-	// Themes created for version 1.11.9 and earlier use name= for
-	// untranslatable ids.
-	// TODO: remove support for this in 1.13.x (1.13.2?).
-	if (const config &c = game_config.find_child("theme", "name", theme_name)) {
-		ERR_DP << "Theme '" << theme_name << "' uses [theme] name= instead of id= to specify its id; this usage is deprecated and will be removed in version 1.13.x.\n";
-		return c;
-	}
-
 	ERR_DP << "Theme '" << theme_name << "' not found. Trying the default theme.\n";
 
-	if (const config &c = game_config.find_child("theme", "id", "Default"))
+	if (const config &c = game_config.find_child("theme", "name", "Default"))
 		return c;
 
 	ERR_DP << "Default theme not found.\n";

src/game_preferences_display.cpp

@@ -1445,7 +1445,7 @@ bool show_theme_dialog(display& disp)
 		gui2::ttheme_list dlg(themes);
 
 		for(size_t k = 0; k < themes.size(); ++k) {
-			if(themes[k].id == preferences::theme()) {
+			if(themes[k].name == preferences::theme()) {
 				dlg.set_selected_index(static_cast<int>(k));
 			}
 		}
@@ -1454,7 +1454,7 @@ bool show_theme_dialog(display& disp)
 		const int action = dlg.selected_index();
 
 		if(action >= 0){
-			preferences::set_theme(themes[action].id);
+			preferences::set_theme(themes[action].name);
 			// FIXME: it would be preferable for the new theme to take effect
 			//        immediately.
 			return 1;

src/gui/dialogs/theme_list.cpp

@@ -69,12 +69,7 @@ void ttheme_list::pre_show(CVideo& /*video*/, twindow& window)
 		std::map<std::string, string_map> data;
 		string_map column;
 
-		std::string theme_name = t.name;
-		if(theme_name.empty()) {
-			theme_name = t.id;
-		}
-
-		column["label"] = theme_name;
+		column["label"] = t.name;
 		data.insert(std::make_pair("name", column));
 		column["label"] = t.description;
 		data.insert(std::make_pair("description", column));

src/theme.cpp

@@ -915,16 +915,9 @@ void theme::set_known_themes(const config* cfg)
 
 	BOOST_FOREACH(const config &thm, cfg->child_range("theme"))
 	{
-		std::string thm_id = thm["id"];
-
-		if (thm_id.empty() && thm.has_attribute("name")) {
-			thm_id = thm["name"].str();
-			ERR_DP << "Theme '" << thm_id << "' uses [theme] name= instead of id= to specify its id; this usage is deprecated and will be removed in version 1.13.x.\n";
-		}
-
-		if (!thm["hidden"].to_bool(false)) {
-			known_themes[thm_id] = thm;
-		}
+		std::string thm_name = thm["name"];
+		if (!thm["hidden"].to_bool(false))
+			known_themes[thm_name] = thm;
 	}
 }
 
@@ -937,8 +930,7 @@ std::vector<theme_info> theme::get_known_themes()
 		++i)
 	{
 		res.push_back(theme_info());
-		res.back().id = i->first;
-		res.back().name = i->second["name"].t_str();
+		res.back().name = i->first;
 		res.back().description = i->second["description"].t_str();
 	}
 

src/theme.hpp

@@ -28,8 +28,7 @@ typedef struct { size_t x1,y1,x2,y2; } _rect;
 
 struct theme_info
 {
-	std::string id;
-	t_string name;
+	std::string name;
 	t_string description;
 };