Fix bug #4201 -- "Default Era" renamed "Era of Turmoil"

in accordance with the master history at
http://www.wesnoth.org/wiki/WesnothHistory#417-530_YW:_The_Turmoil_of_Asheviere

changelog

@@ -15,6 +15,8 @@ Version 1.3.6+svn:
      settings" on in a darker font. (patch #771 by uso)
    * the random start ToD option is now properly saved and loaded when use map
      default is used (bug #9532)
+   * "Default Era" is now renamed to "Era of Turmoil" (bug #4201) in
+     accordance with the master history.
  * user interface:
    * Enable "Save Game" and "View Chat Log" menu entries in replay mode.
    * Add an additional line below the minimap in the "Multiplayer->Create game"

data/multiplayer/eras.cfg

@@ -8,16 +8,16 @@
 #enddef
 
 [era]
-    id=era_default
-    name= _ "Default"
+    id=era_turmoil
+    name= _ "Era of Turmoil"
 
     {RANDOM_SIDE}
-    {multiplayer/factions/loyalists-default.cfg}
-    {multiplayer/factions/rebels-default.cfg}
-    {multiplayer/factions/northerners-default.cfg}
-    {multiplayer/factions/undead-default.cfg}
-    {multiplayer/factions/knalgans-default.cfg}
-    {multiplayer/factions/drakes-default.cfg}
+    {multiplayer/factions/loyalists-turmoil.cfg}
+    {multiplayer/factions/rebels-turmoil.cfg}
+    {multiplayer/factions/northerners-turmoil.cfg}
+    {multiplayer/factions/undead-turmoil.cfg}
+    {multiplayer/factions/knalgans-turmoil.cfg}
+    {multiplayer/factions/drakes-turmoil.cfg}
 [/era]
 
 [era]

data/tools/wesnoth/wmltools.py

@@ -359,6 +359,9 @@ def resolve_unit_image(namespace, subdir, resource):
     "Construct a plausible location for given resource in specified namespace."
     return os.path.join(namespace_directory(namespace), "images/units", subdir, resource)
 
+# And this is for code that does syntax transformation
+baseindent = "    "
+
 ## Version-control hooks begin here.
 #
 # Change these if we move away from Subversion

data/tools/wmlindent

@@ -70,7 +70,6 @@ class bailout:
 
 def reindent(name, infp, outfp):
     "Reindent WML."
-    baseindent = "    "
     dostrip = True
     seen_wml = False
     inmacro = False

players_changelog

@@ -10,6 +10,8 @@ Version 1.3.6+svn:
       "Use map settings" on in a darker font. (patch #771 by uso)
     * The random starting time of day setting is will now be remembered if 
       "Use map settings" is used.
+   * "Default Era" is now renamed to "Era of Turmoil" (bug #4201) in
+     accordance with the master history.
 
   * User interface
     * Enable "Save Game" and "View Chat Log" menu entries in replay mode.

src/game.cpp

@@ -466,7 +466,7 @@ bool game_controller::play_multiplayer_mode()
 		return true;
 	}
 
-	std::string era = "era_default";
+	std::string era = "era_turmoil";
 	std::string scenario = "multiplayer_Charge";
 	std::map<int,std::string> side_types, side_controllers, side_algorithms;
 	std::map<int,string_map> side_parameters;