Merge 683528c3a7 into b22b737b6a

data/_main.cfg

@@ -35,7 +35,7 @@
 # Using different default eras in SP and MP forces a config reload which we don't want.
 {multiplayer/eras.cfg}
 
-{internal/resources/}
+{internal/}
 
 {campaigns/}
 
@@ -55,16 +55,6 @@
 [textdomain]
     name="wesnoth-editor"
 [/textdomain]
-[binary_path]
-    path=data/internal/Urban_Jungle
-[/binary_path]
-{internal/Urban_Jungle/terrain.cfg}
-{internal/Urban_Jungle/terrain-graphics.cfg}
-[editor_group]
-    id=urban_jungle
-    name= _ "Urban Jungle (Internal)"
-    icon="group_mainline"
-[/editor_group]
 #endif
 
 #ifdef TEST

data/internal/Urban_Jungle/_main.cfg

@@ -8,3 +8,6 @@
 [/binary_path]
 {internal/Urban_Jungle/terrain.cfg}
 {internal/Urban_Jungle/terrain-graphics.cfg}
+#ifdef EDITOR
+{internal/Urban_Jungle/terrain-groups.cfg}
+#endif

data/internal/Urban_Jungle/terrain-groups.cfg

@@ -0,0 +1,7 @@
+#textdomain wesnoth-editor
+
+[editor_group]
+    id=urban_jungle
+    name= _ "Urban Jungle (Internal)"
+    icon="group_mainline"
+[/editor_group]

data/internal/Urban_Jungle/terrain.cfg

@@ -1,3 +1,5 @@
+#textdomain wesnoth-lib
+
 [terrain_type]
     icon_image=symbols/terrain_type_urban
     id=urbanjungle

data/internal/_main.cfg

@@ -0,0 +1,6 @@
+#textdomain wesnoth
+
+{internal/resources/}
+#ifdef EDITOR
+{internal/Urban_Jungle/}
+#endif

src/editor/palette/editor_palettes.hpp

@@ -135,7 +135,7 @@ protected:
 	virtual void select_bg_item(const std::string& item_id) override;
 
 	/**
-	 * The editor_groups as defined in editor-groups.cfg.
+	 * The editor_groups as defined in terrain-groups.cfg.
 	 *
 	 * Note the user must make sure the id's here are the same as the
 	 * editor_group in terrain.cfg.