Standardized filenames and scenario ids in TB;...

...fixed capitalization in a translatable string; did not run pofix yet.

data/campaigns/Two_Brothers/_main.cfg

@@ -12,7 +12,7 @@
     name= _ "A Tale of Two Brothers"
     abbrev= _ "AToTB"
     define="CAMPAIGN_TWO_BROTHERS"
-    first_scenario="1_Rooting_Out_A_Mage"
+    first_scenario="01_Rooting_Out_a_Mage"
     difficulties=EASY,HARD
     difficulty_descriptions={MENU_IMG_TXT2 "units/human-loyalists/horseman-moving.png~RC(magenta>red)" _"Horseman" _"(Beginner)"} +
     ";" + {MENU_IMG_TXT2 "units/human-loyalists/grand-knight.png~RC(magenta>red)" _"Knight" _"(Challenging)"}

data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg

@@ -1,10 +1,10 @@
 #textdomain wesnoth-tb
 [scenario]
-    id=1_Rooting_Out_A_Mage
-    name=_ "Rooting Out A Mage"
-    map_data="{campaigns/Two_Brothers/maps/1_Rooting_Out_A_Mage.map}"
+    id=01_Rooting_Out_a_Mage
+    name=_ "Rooting Out a Mage"
+    map_data="{campaigns/Two_Brothers/maps/01_Rooting_Out_a_Mage.map}"
     turns=18
-    next_scenario=2_The_Chase
+    next_scenario=02_The_Chase
 
     {DUSK}
     {FIRST_WATCH}

data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg

@@ -1,9 +1,9 @@
 #textdomain wesnoth-tb
 [scenario]
-    id=2_The_Chase
+    id=02_The_Chase
     name= _ "The Chase"
-    map_data="{campaigns/Two_Brothers/maps/2_The_Chase.map}"
-    next_scenario=3_Guarded_Castle
+    map_data="{campaigns/Two_Brothers/maps/02_The_Chase.map}"
+    next_scenario=03_Guarded_Castle
 #ifdef EASY
     turns=28
 #endif

data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg

@@ -12,16 +12,16 @@
 
 [scenario]
     #textdomain wesnoth-tb
-    id=3_Guarded_Castle
+    id=03_Guarded_Castle
     name= _ "Guarded Castle"
-    map_data="{campaigns/Two_Brothers/maps/3_Guarded_Castle.map}"
+    map_data="{campaigns/Two_Brothers/maps/03_Guarded_Castle.map}"
 #ifdef EASY
     turns=30
 #endif
 #ifdef HARD
     turns=24
 #endif
-    next_scenario=4_Return_To_The_Village
+    next_scenario=04_Return_to_the_Village
     victory_when_enemies_defeated=no
 
     {SCENARIO_MUSIC revelation.ogg}
@@ -361,9 +361,9 @@ Yet for some reason I fear these brothers more. If Mordak were here it would be
                     speaker=Arne
                     message= _ "The adept didn't lead us astray after all. I'll keep my word, distasteful as it may be; cut him loose, and let's be rid of him."
                 [/message]
-                # Perhaps the Adept is so grateful for Arne's mercy that he 
+                # Perhaps the Adept is so grateful for Arne's mercy that he
                 # offers to stay with the player's force. In this case the
-                # player could choose to keep him as a loyal unit but lose 
+                # player could choose to keep him as a loyal unit but lose
                 # some other loyal unit who leaves in disgust, or dismiss him.
             [/then]
 

data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg

@@ -1,15 +1,15 @@
 #textdomain wesnoth-tb
 [scenario]
-    id=4_Return_To_The_Village
+    id=04_Return_to_the_Village
     name= _ "Return to the Village"
-    map_data="{campaigns/Two_Brothers/maps/4_Return_to_the_Village.map}"
+    map_data="{campaigns/Two_Brothers/maps/04_Return_to_the_Village.map}"
 #ifdef EASY
     turns=26
 #endif
 #ifdef HARD
     turns=24
 #endif
-    next_scenario=epilog
+    next_scenario=05_Epilogue
 
     {SCENARIO_MUSIC northerners.ogg}
     {EXTRA_SCENARIO_MUSIC underground.ogg}

data/campaigns/Two_Brothers/scenarios/05_Epilogue.cfg

@@ -1,6 +1,6 @@
 #textdomain wesnoth-tb
 [scenario]
-    id=epilog
+    id=05_Epilogue
     name= _ "A Tale of Two Brothers — Epilogue"
     {NO_MAP_DATA}
     turns=10

utils/pofix.py

@@ -1153,6 +1153,10 @@ stringfixes = {
 ("they're holding Bjarn", "they’re holding Bjarn"),
 ("day's", "day’s"),
 ("I don't think we can rescue", "I don’t think we can rescue"),
+
+# Fix capitalization
+# conversion added in 1.9.0+svn
+("Rooting Out A Mage", "Rooting Out a Mage"),
 ),
 
 "wesnoth-tutorial" : (