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

data/campaigns/Sceptre_of_Fire/utils/bigmap.cfg

@@ -1,3 +1,5 @@
+#textdomain wesnoth-sof
+
 #define SOF_BIGMAP
     [background_layer]
         image=maps/background.jpg

data/campaigns/Secrets_of_the_Ancients/utils/terrain_graphics.cfg

@@ -1,3 +1,4 @@
+#textdomain wesnoth-sota
 #ifdef EDITOR
 [terrain_graphics]
     [tile]

data/campaigns/The_Rise_Of_Wesnoth/units/Kalian.cfg

@@ -1,4 +1,4 @@
-
+#textdomain wesnoth-trow
 # Cutscene-only unit, has no need of fancy animations
 [unit_type]
     id=Elvish Champion Kalian

data/campaigns/World_Conquest/_main.cfg

@@ -1,6 +1,5 @@
-## MP Campaign (Scenarios in Multiplayer >> Random Maps)
-
 #textdomain wesnoth-wc
+## MP Campaign (Scenarios in Multiplayer >> Random Maps)
 
 [textdomain]
     name="wesnoth-wc"

data/campaigns/World_Conquest/config.cfg

@@ -1,3 +1,5 @@
+#textdomain wesnoth-wc
+
 #ifdef EDITOR
 #ifndef LOAD_WC2
 #define LOAD_WC2

data/campaigns/World_Conquest/era/campaign/heroes.cfg

@@ -1,4 +1,4 @@
-##############################################################
+#textdomain wesnoth-wc
 
 #define WORLD_CONQUEST_II_ERA_HEROES_TRAITS
     [trait_extra]

data/campaigns/World_Conquest/era/era.cfg

@@ -1,3 +1,4 @@
+#textdomain wesnoth-wc
 ## add subfolders
 {./factions}
 {./campaign}

data/campaigns/World_Conquest/resources/data/artifacts.cfg

@@ -1,4 +1,4 @@
-
+#textdomain wesnoth-wc
 #define WORLD_CONQUEST_TEK_ARTIFACT_DEFINITIONS
     ## in alphabetic order by name
     ## uses some macros from training

data/campaigns/World_Conquest/resources/data/training.cfg

@@ -1,4 +1,4 @@
-
+#textdomain wesnoth-wc
 #define WORLD_CONQUEST_TEK_TRAINER_DEFINITIONS
     [trainer]
         type=Lich

data/campaigns/World_Conquest/resources/resources.cfg

@@ -1,3 +1,4 @@
+#textdomain wesnoth-wc
 ## add subfolders
 {./data}
 {./strings}

data/campaigns/World_Conquest/scenarios/WC_II_scenario.cfg

@@ -1,3 +1,4 @@
+#textdomain wesnoth-wc
 ## macros may not be used inside translatable strings.
 
 #define WC_II_CAMPAIGN_NAME_1P