Manual cleanup

2023-11-11 23:20:42 +02:00
parent db8a28f2c0
commit caad8ba44b
182 changed files with 399 additions and 424 deletions
--- a/mods/cnc/languages/campaign/en.ftl
+++ b/mods/cnc/languages/campaign/en.ftl
@@ -0,0 +1,28 @@
+## world
+dropdown-difficulty =
+    .label = Difficulty
+    .description = The difficulty of the mission
+
+options-difficulty =
+    .easy = Easy
+    .normal = Normal
+    .hard = Hard
+
+## campaign-maprules.yaml
+actor-moneycrate-name = Money Crate
+
+## gdi03, gdi07, gdi08a, gdi08b, gdi09, nod03a, nod03b
+actor-hq-description = Provides an overview of the battlefield.
+      Requires power to operate.
+
+## gdi08a
+actor-c3-name = Farmer Mike
+
+## gdi08b
+civilian-killed = Civilian killed.
+
+## nod01
+actor-c10-name = Nikoomba
+
+## nod03a, nod03b
+actor-prison-name = Prison
--- a/mods/cnc/languages/rules/en.ftl
+++ b/mods/cnc/languages/rules/en.ftl
@@ -1,4 +1,4 @@
-## Player
+## player.yaml
 options-tech-level =
    .low = Low
    .medium = Medium
@@ -20,7 +20,7 @@ notification-base-under-attack = Base under attack.
 notification-ally-under-attack = Our ally is under attack.
 notification-silos-needed = Silos needed.

-## World
+## world.yaml
 options-starting-units =
    .mcv-only = MCV Only
    .light-support = Light Support
@@ -30,33 +30,13 @@ dropdown-map-creeps =
    .label = Creep Actors
    .description = Hostile forces spawn on the battlefield

-## Structures
-notification-construction-complete = Construction complete.
-notification-unit-ready = Unit ready.
-notification-reinforcements-have-arrived = Reinforcements have arrived.
-notification-unable-to-build-more = Unable to build more.
-notification-unable-to-comply-building-in-progress = Unable to comply. Building in progress.
-notification-repairing = Repairing.
-notification-ion-cannon-charging = Ion cannon charging.
-notification-ion-cannon-ready = Ion cannon ready.
-notification-select-target = Select target.
-notification-insufficient-power = Insufficient power.
-notification-airstrike-ready = Airstrike ready.
-notification-enemy-planes-approaching = Enemy planes approaching.
-notification-nuclear-weapon-available = Nuclear weapon available.
-notification-nuclear-weapon-launched = Nuclear weapon launched.
-notification-nuclear-warhead-approaching = Nuclear warhead approaching.
-
-## Defaults
+## defaults.yaml
 notification-unit-lost = Unit lost.
 notification-unit-promoted = Unit promoted.
 notification-building-captured = Building captured.
 notification-civilian-building-captured = Civilian Building captured.
 notification-structure-lost = Structure lost.

-## Vehicles
-notification-harvester-lost = Harvester lost.
-
 ## aircraft.yaml
 actor-tran =
   .name = Chinook Transport
@@ -82,9 +62,6 @@ actor-tran-husk-name = Chinook Transport
 actor-heli-husk-name = Apache Longbow
 actor-orca-husk-name = Orca

-## campaign-maprules.yaml
-actor-moneycrate-name = Money Crate
-
 ## civilian-desert.yaml
 actor-v20-name = Sala's House
 actor-v20-husk-name = Sala's House (Destroyed)
@@ -170,7 +147,6 @@ meta-tank-generic-name = Tank
 meta-helicopter-generic-name = Helicopter
 meta-soldier-generic-name = Soldier
 meta-civinfantry-name = Civilian
-meta-dino-name = Dinosaur
 meta-viceroid-name = Visceroid
 meta-ship-generic-name = Ship
 meta-building-generic-name = Structure
@@ -182,8 +158,6 @@ meta-civhaystackorigloo =
   .winter--name = Igloo
   .summer--name = Haystacks

-meta-civfieldhusk-name = Field (Destroyed)
-
 meta-civhaystackorigloohusk =
   .winter--name = Igloo (Destroyed)
   .summer--name = Haystacks (Destroyed)
@@ -292,6 +266,22 @@ actor-boat-name = Gunboat
 actor-lst-name = Landing Craft

 ## structures.yaml
+notification-construction-complete = Construction complete.
+notification-unit-ready = Unit ready.
+notification-reinforcements-have-arrived = Reinforcements have arrived.
+notification-unable-to-build-more = Unable to build more.
+notification-unable-to-comply-building-in-progress = Unable to comply. Building in progress.
+notification-repairing = Repairing.
+notification-ion-cannon-charging = Ion cannon charging.
+notification-ion-cannon-ready = Ion cannon ready.
+notification-select-target = Select target.
+notification-insufficient-power = Insufficient power.
+notification-airstrike-ready = Airstrike ready.
+notification-enemy-planes-approaching = Enemy planes approaching.
+notification-nuclear-weapon-available = Nuclear weapon available.
+notification-nuclear-weapon-launched = Nuclear weapon launched.
+notification-nuclear-warhead-approaching = Nuclear warhead approaching.
+
 actor-fact =
   .name = Construction Yard
   .description = Builds structures
@@ -437,6 +427,8 @@ actor-harv =
   .description = Collects Tiberium for processing.
      Unarmed

+notification-harvester-lost = Harvester lost.
+
 actor-apc =
   .name = APC
   .description = Armed infantry transport.
--- a/mods/cnc/maps/cnc64gdi01/map.yaml
+++ b/mods/cnc/maps/cnc64gdi01/map.yaml
@@ -715,4 +715,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/eviction-notice/map.yaml
+++ b/mods/cnc/maps/eviction-notice/map.yaml
@@ -646,4 +646,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/funpark01/map.yaml
+++ b/mods/cnc/maps/funpark01/map.yaml
@@ -414,4 +414,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi01/map.yaml
+++ b/mods/cnc/maps/gdi01/map.yaml
@@ -237,4 +237,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi02/map.yaml
+++ b/mods/cnc/maps/gdi02/map.yaml
@@ -626,4 +626,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi03/en.ftl
+++ b/mods/cnc/maps/gdi03/en.ftl
@@ -1,3 +0,0 @@
-## rules.yaml
-actor-hq-description = Provides an overview of the battlefield.
-      Requires power to operate.
--- a/mods/cnc/maps/gdi03/map.yaml
+++ b/mods/cnc/maps/gdi03/map.yaml
@@ -700,4 +700,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi04a/map.yaml
+++ b/mods/cnc/maps/gdi04a/map.yaml
@@ -452,4 +452,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi04b/map.yaml
+++ b/mods/cnc/maps/gdi04b/map.yaml
@@ -529,4 +529,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi04c/map.yaml
+++ b/mods/cnc/maps/gdi04c/map.yaml
@@ -746,4 +746,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi05a/map.yaml
+++ b/mods/cnc/maps/gdi05a/map.yaml
@@ -758,4 +758,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi05b/map.yaml
+++ b/mods/cnc/maps/gdi05b/map.yaml
@@ -614,4 +614,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi05c/map.yaml
+++ b/mods/cnc/maps/gdi05c/map.yaml
@@ -767,4 +767,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi06/map.yaml
+++ b/mods/cnc/maps/gdi06/map.yaml
@@ -1021,4 +1021,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Music: music.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi07/en.ftl
+++ b/mods/cnc/maps/gdi07/en.ftl
@@ -1,3 +0,0 @@
-## rules.yaml
-actor-hq-description = Provides an overview of the battlefield.
-      Requires power to operate.
--- a/mods/cnc/maps/gdi07/map.yaml
+++ b/mods/cnc/maps/gdi07/map.yaml
@@ -1029,4 +1029,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi08a/en.ftl
+++ b/mods/cnc/maps/gdi08a/en.ftl
@@ -1,4 +0,0 @@
-## rules.yaml
-actor-c3-name = Farmer Mike
-actor-hq-description = Provides an overview of the battlefield.
-      Requires power to operate.
--- a/mods/cnc/maps/gdi08a/map.yaml
+++ b/mods/cnc/maps/gdi08a/map.yaml
@@ -888,4 +888,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi08b/en.ftl
+++ b/mods/cnc/maps/gdi08b/en.ftl
@@ -1,5 +0,0 @@
-civilian-killed = Civilian killed.
-
-## rules.yaml
-actor-hq-description = Provides an overview of the battlefield.
-      Requires power to operate.
--- a/mods/cnc/maps/gdi08b/map.yaml
+++ b/mods/cnc/maps/gdi08b/map.yaml
@@ -1063,4 +1063,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi09/en.ftl
+++ b/mods/cnc/maps/gdi09/en.ftl
@@ -1,3 +0,0 @@
-## rules.yaml
-actor-hq-description = Provides an overview of the battlefield.
-      Requires power to operate.
--- a/mods/cnc/maps/gdi09/map.yaml
+++ b/mods/cnc/maps/gdi09/map.yaml
@@ -784,4 +784,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod01/en.ftl
+++ b/mods/cnc/maps/nod01/en.ftl
@@ -1,2 +0,0 @@
-## rules.yaml
-actor-c10-name = Nikoomba
--- a/mods/cnc/maps/nod01/map.yaml
+++ b/mods/cnc/maps/nod01/map.yaml
@@ -233,4 +233,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod02a/map.yaml
+++ b/mods/cnc/maps/nod02a/map.yaml
@@ -236,4 +236,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod02b/map.yaml
+++ b/mods/cnc/maps/nod02b/map.yaml
@@ -197,4 +197,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod03a/en.ftl
+++ b/mods/cnc/maps/nod03a/en.ftl
@@ -1,4 +0,0 @@
-## rules.yaml
-actor-hq-description = Provides an overview of the battlefield.
-    Requires power to operate.
-actor-miss-name = Prison
--- a/mods/cnc/maps/nod03a/map.yaml
+++ b/mods/cnc/maps/nod03a/map.yaml
@@ -436,4 +436,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod03a/rules.yaml
+++ b/mods/cnc/maps/nod03a/rules.yaml
@@ -96,7 +96,7 @@ RMBO:

 MISS:
 	Tooltip:
-		Name: actor-miss-name
+		Name: actor-prison-name
 	CaptureManager:
 	Capturable:
 		Types: building
--- a/mods/cnc/maps/nod03b/en.ftl
+++ b/mods/cnc/maps/nod03b/en.ftl
@@ -1,4 +0,0 @@
-## rules.yaml
-actor-hq-description = Provides an overview of the battlefield.
-    Requires power to operate.
-actor-miss-name = Prison
--- a/mods/cnc/maps/nod03b/map.yaml
+++ b/mods/cnc/maps/nod03b/map.yaml
@@ -477,4 +477,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod03b/rules.yaml
+++ b/mods/cnc/maps/nod03b/rules.yaml
@@ -95,7 +95,7 @@ RMBO:

 MISS:
 	Tooltip:
-		Name: actor-miss-name
+		Name: actor-prison-name
 	CaptureManager:
 	Capturable:
 		Types: building
--- a/mods/cnc/maps/nod04a/map.yaml
+++ b/mods/cnc/maps/nod04a/map.yaml
@@ -479,4 +479,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod04b/map.yaml
+++ b/mods/cnc/maps/nod04b/map.yaml
@@ -538,4 +538,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod05/map.yaml
+++ b/mods/cnc/maps/nod05/map.yaml
@@ -377,4 +377,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod06a/map.yaml
+++ b/mods/cnc/maps/nod06a/map.yaml
@@ -669,4 +669,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, languages/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl, languages/en.ftl
--- a/mods/cnc/maps/nod06b/map.yaml
+++ b/mods/cnc/maps/nod06b/map.yaml
@@ -599,4 +599,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, languages/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl, languages/en.ftl
--- a/mods/cnc/maps/nod06c/map.yaml
+++ b/mods/cnc/maps/nod06c/map.yaml
@@ -467,4 +467,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod07a/map.yaml
+++ b/mods/cnc/maps/nod07a/map.yaml
@@ -600,4 +600,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod07b/map.yaml
+++ b/mods/cnc/maps/nod07b/map.yaml
@@ -957,4 +957,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod07c/map.yaml
+++ b/mods/cnc/maps/nod07c/map.yaml
@@ -772,4 +772,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod08a/map.yaml
+++ b/mods/cnc/maps/nod08a/map.yaml
@@ -614,4 +614,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod08b/map.yaml
+++ b/mods/cnc/maps/nod08b/map.yaml
@@ -773,4 +773,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod09/map.yaml
+++ b/mods/cnc/maps/nod09/map.yaml
@@ -886,4 +886,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod10a/map.yaml
+++ b/mods/cnc/maps/nod10a/map.yaml
@@ -1345,4 +1345,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod10b/map.yaml
+++ b/mods/cnc/maps/nod10b/map.yaml
@@ -726,4 +726,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/twist-of-fate/map.yaml
+++ b/mods/cnc/maps/twist-of-fate/map.yaml
@@ -1142,6 +1142,6 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl

 Weapons: weapons.yaml
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -519,8 +519,6 @@
 		Prerequisites: ~disabled
 	Valued:
 		Cost: 1000
-	Tooltip:
-		Name: meta-dino-name
 	RevealsShroud:
 		Range: 6c0
 	Mobile:
@@ -861,7 +859,6 @@
 		Dimensions: 1,1
 		Footprint: =
 	Tooltip:
-		Name: meta-civfieldhusk-name
 		GenericVisibility: None
 		ShowOwnerRow: false
 	RenderSprites:
--- a/mods/cnc/languages/difficulties/en.ftl
+++ b/mods/cnc/languages/difficulties/en.ftl
@@ -1,3 +1,4 @@
+## world
 dropdown-difficulty =
    .label = Difficulty
    .description = The difficulty of the mission
@@ -6,3 +7,9 @@ options-difficulty =
    .easy = Easy
    .normal = Normal
    .hard = Hard
+
+## campaign-tooltips.yaml
+neutral-prefix = Neutral
+
+## harkonnen-05, ordos-04
+actor-outpost-modified--name = Modified Outpost
--- a/mods/d2k/languages/difficulties/en.ftl
+++ b/mods/d2k/languages/difficulties/en.ftl
@@ -1,8 +0,0 @@
-dropdown-difficulty =
-    .label = Difficulty
-    .description = The difficulty of the mission
-
-options-difficulty =
-    .easy = Easy
-    .normal = Normal
-    .hard = Hard
--- a/mods/d2k/languages/rules/en.ftl
+++ b/mods/d2k/languages/rules/en.ftl
@@ -1,4 +1,4 @@
-## Player
+## player.yaml
 options-tech-level =
    .low = Low
    .medium = Medium
@@ -21,7 +21,7 @@ notification-no-room-for-new-units = No room for new unit.
 notification-cannot-build-here = Cannot build here.
 notification-one-of-our-buildings-has-been-captured = One of our buildings has been captured.

-## World
+## world.yaml
 dropdown-map-worms =
    .label = Worms
    .description = Worms roam the map and devour unprepared forces
@@ -31,26 +31,7 @@ options-starting-units =
    .light-support = Light Support
    .heavy-support = Heavy Support

-## Arrakis
-notification-worm-attack = Worm attack.
-notification-worm-sign = Worm sign.
-
-## Structures
-notification-construction-complete = Construction complete.
-notification-unit-ready = Unit ready.
-notification-repairing = Repairing.
-notification-unit-repaired = Unit repaired.
-notification-select-target = Select target.
-notifciation-missile-launch-detected = Missile launch detected.
-notification-airstrike-ready = Airstrike ready.
-notification-building-lost = Building lost.
-notification-reinforcements-have-arrived = Reinforcements have arrived.
-notification-death-hand-missile-prepping = Death Hand missile prepping.
-notification-death-hand-missile-ready = Death Hand missile ready.
-notification-fremen-ready = Fremen ready.
-notification-saboteur-ready = Saboteur ready.
-
-## Defaults
+## defaults.yaml
 notification-unit-lost = Unit lost.
 notification-unit-promoted = Unit promoted.
 notification-enemy-building-captured = Enemy Building captured.
@@ -77,19 +58,14 @@ actor-carryall-husk-name = Carryall
 actor-carryall-huskvtol-name = Carryall

 ## arrakis.yaml
+notification-worm-attack = Worm attack.
+notification-worm-sign = Worm sign.
+
 actor-spicebloom-spawnpoint-name = Spice Bloom spawnpoint
 actor-spicebloom-name = Spice Bloom
 actor-sandworm-name = Sandworm
 actor-sietch-name = Fremen Sietch

-## campaign-tooltips.yaml
-meta-vehicle-neutral-prefix = Neutral
-meta-tank-neutral-prefix = Neutral
-meta-infantry-neutral-prefix = Neutral
-meta-plane-neutral-prefix = Neutral
-meta-building-neutral-prefix = Neutral
-actor-wall-neutral-prefix = Neutral
-
 ## defaults.yaml
 meta-vehicle-generic-name = Unit
 meta-husk-generic-name = Destroyed Unit
@@ -230,8 +206,21 @@ actor-deathhand =
   .encyclopedia = The Death Hand warhead carries atomic cluster munitions. It detonates above the target, inflicting great damage over a wide area.

 ## structures.yaml
+notification-construction-complete = Construction complete.
+notification-unit-ready = Unit ready.
+notification-repairing = Repairing.
+notification-unit-repaired = Unit repaired.
+notification-select-target = Select target.
+notifciation-missile-launch-detected = Missile launch detected.
+notification-airstrike-ready = Airstrike ready.
+notification-building-lost = Building lost.
+notification-reinforcements-have-arrived = Reinforcements have arrived.
+notification-death-hand-missile-prepping = Death Hand missile prepping.
+notification-death-hand-missile-ready = Death Hand missile ready.
+notification-fremen-ready = Fremen ready.
+notification-saboteur-ready = Saboteur ready.
+
 meta-concrete =
-   .name = Concrete
   .generic-name = Structure
   .description = Provides a strong foundation that prevents
    damage from the terrain.
@@ -462,11 +451,9 @@ actor-deviator =

    The Deviator is vulnerable to most types of weapon, though high-caliber guns are slightly less effective.

-meta-combat-tank =
-   .description = Main Battle Tank
+meta-combat-tank-description = Main Battle Tank
      Strong vs Tanks
      Weak vs Infantry
-   .name = Combat Tank

 actor-combat-tank-a =
   .name = Atreides Combat Tank
--- a/mods/d2k/maps/atreides-01a/map.yaml
+++ b/mods/d2k/maps/atreides-01a/map.yaml
@@ -114,4 +114,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/atreides-01b/map.yaml
+++ b/mods/d2k/maps/atreides-01b/map.yaml
@@ -113,4 +113,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/atreides-02a/map.yaml
+++ b/mods/d2k/maps/atreides-02a/map.yaml
@@ -171,4 +171,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/atreides-02b/map.yaml
+++ b/mods/d2k/maps/atreides-02b/map.yaml
@@ -141,4 +141,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/atreides-03a/map.yaml
+++ b/mods/d2k/maps/atreides-03a/map.yaml
@@ -138,4 +138,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/atreides-03b/map.yaml
+++ b/mods/d2k/maps/atreides-03b/map.yaml
@@ -135,4 +135,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/atreides-04/map.yaml
+++ b/mods/d2k/maps/atreides-04/map.yaml
@@ -419,4 +419,4 @@ Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rule

 Sequences: sequences.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/atreides-05/map.yaml
+++ b/mods/d2k/maps/atreides-05/map.yaml
@@ -368,4 +368,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/harkonnen-01a/map.yaml
+++ b/mods/d2k/maps/harkonnen-01a/map.yaml
@@ -109,4 +109,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/harkonnen-01b/map.yaml
+++ b/mods/d2k/maps/harkonnen-01b/map.yaml
@@ -109,4 +109,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/harkonnen-02a/map.yaml
+++ b/mods/d2k/maps/harkonnen-02a/map.yaml
@@ -165,4 +165,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/harkonnen-02b/map.yaml
+++ b/mods/d2k/maps/harkonnen-02b/map.yaml
@@ -147,4 +147,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/harkonnen-03a/map.yaml
+++ b/mods/d2k/maps/harkonnen-03a/map.yaml
@@ -180,4 +180,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/harkonnen-03b/map.yaml
+++ b/mods/d2k/maps/harkonnen-03b/map.yaml
@@ -210,4 +210,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/harkonnen-04/map.yaml
+++ b/mods/d2k/maps/harkonnen-04/map.yaml
@@ -379,4 +379,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/harkonnen-05/en.ftl
+++ b/mods/d2k/maps/harkonnen-05/en.ftl
@@ -1,2 +0,0 @@
-## rules.yaml
-actor-outpost-modified--name = Modified Outpost
--- a/mods/d2k/maps/harkonnen-05/map.yaml
+++ b/mods/d2k/maps/harkonnen-05/map.yaml
@@ -517,4 +517,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl, en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/harkonnen-06a/map.yaml
+++ b/mods/d2k/maps/harkonnen-06a/map.yaml
@@ -718,4 +718,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/harkonnen-06b/map.yaml
+++ b/mods/d2k/maps/harkonnen-06b/map.yaml
@@ -655,4 +655,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/harkonnen-07/map.yaml
+++ b/mods/d2k/maps/harkonnen-07/map.yaml
@@ -772,4 +772,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/harkonnen-08/map.yaml
+++ b/mods/d2k/maps/harkonnen-08/map.yaml
@@ -655,4 +655,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/harkonnen-09a/map.yaml
+++ b/mods/d2k/maps/harkonnen-09a/map.yaml
@@ -1045,4 +1045,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/harkonnen-09b/map.yaml
+++ b/mods/d2k/maps/harkonnen-09b/map.yaml
@@ -1008,4 +1008,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/ordos-01a/map.yaml
+++ b/mods/d2k/maps/ordos-01a/map.yaml
@@ -104,4 +104,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/ordos-01b/map.yaml
+++ b/mods/d2k/maps/ordos-01b/map.yaml
@@ -104,4 +104,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/ordos-02a/map.yaml
+++ b/mods/d2k/maps/ordos-02a/map.yaml
@@ -155,4 +155,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/ordos-02b/map.yaml
+++ b/mods/d2k/maps/ordos-02b/map.yaml
@@ -140,4 +140,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/ordos-03a/map.yaml
+++ b/mods/d2k/maps/ordos-03a/map.yaml
@@ -146,4 +146,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/ordos-03b/map.yaml
+++ b/mods/d2k/maps/ordos-03b/map.yaml
@@ -257,4 +257,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/ordos-04/en.ftl
+++ b/mods/d2k/maps/ordos-04/en.ftl
@@ -1,2 +0,0 @@
-## rules.yaml
-actor-outpost-modified--name = Modified Outpost
--- a/mods/d2k/maps/ordos-04/map.yaml
+++ b/mods/d2k/maps/ordos-04/map.yaml
@@ -519,4 +519,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl, en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/ordos-05/map.yaml
+++ b/mods/d2k/maps/ordos-05/map.yaml
@@ -573,4 +573,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/maps/ordos-06a/map.yaml
+++ b/mods/d2k/maps/ordos-06a/map.yaml
@@ -577,4 +577,4 @@ Actors:

 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml

-Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl
+Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
--- a/mods/d2k/rules/campaign-tooltips.yaml
+++ b/mods/d2k/rules/campaign-tooltips.yaml
@@ -1,31 +1,31 @@
 ^Vehicle:
 	Tooltip:
 		GenericVisibility: Enemy, Neutral
-		NeutralPrefix: meta-vehicle-neutral-prefix
+		NeutralPrefix: neutral-prefix
 		ShowOwnerRow: false

 ^Tank:
 	Tooltip:
 		GenericVisibility: Enemy, Neutral
-		NeutralPrefix: meta-tank-neutral-prefix
+		NeutralPrefix: neutral-prefix
 		ShowOwnerRow: false

 ^Infantry:
 	Tooltip:
 		GenericVisibility: Enemy, Neutral
-		NeutralPrefix: meta-infantry-neutral-prefix
+		NeutralPrefix: neutral-prefix
 		ShowOwnerRow: false

 ^Plane:
 	Tooltip:
 		GenericVisibility: Enemy, Neutral
-		NeutralPrefix: meta-plane-neutral-prefix
+		NeutralPrefix: neutral-prefix
 		ShowOwnerRow: false

 ^Building:
 	Tooltip:
 		GenericVisibility: Enemy, Neutral
-		NeutralPrefix: meta-building-neutral-prefix
+		NeutralPrefix: neutral-prefix
 		ShowOwnerRow: false

 ^Husk:
@@ -41,5 +41,5 @@
 wall:
 	Tooltip:
 		GenericVisibility: Enemy, Neutral
-		NeutralPrefix: actor-wall-neutral-prefix
+		NeutralPrefix: neutral-prefix
 		ShowOwnerRow: false
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -10,7 +10,6 @@
 		AreaTypes: building
 		Adjacent: 4
 	Tooltip:
-		Name: meta-concrete.name
 		GenericName: meta-concrete.generic-name
 	RenderSprites:
 	KillsSelf:
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -568,11 +568,9 @@ deviator:
 		BuildPaletteOrder: 40
 		BuildDuration: 432
 		BuildDurationModifier: 100
-		Description: meta-combat-tank.description
+		Description: meta-combat-tank-description
 	Valued:
 		Cost: 700
-	Tooltip:
-		Name: meta-combat-tank.name
 	UpdatesPlayerStatistics:
 		AddToArmyValue: true
 	Health:
--- a/mods/ra/languages/campaign/en.ftl
+++ b/mods/ra/languages/campaign/en.ftl
@@ -0,0 +1,71 @@
+## world
+dropdown-difficulty =
+    .label = Difficulty
+    .description = The difficulty of the mission
+
+options-difficulty =
+    .easy = Easy
+    .normal = Normal
+    .hard = Hard
+
+## campaign-rules.yaml
+actor-crate-name = Crate
+
+## campaign-tooltips.yaml
+actor-technology-center-name = Technology Center
+
+## allies-05a, allies-05b, allies-05c
+actor-prison-name = Prison
+
+## fall-of-greece-1-personal-war, situation-critical
+actor-strategic-bomber-name = Strategic Bomber
+
+## fall-of-greece-1-personal-war, mousetrap
+actor-stavros-name = Stavros
+
+## intervention
+actor-air-force-hq-name = Soviet Air Force HQ
+actor-mainland-name = Reach the mainland
+actor-givefix-name = Weapons Factory or Helipad
+
+## monster-tank-madness
+actor-demitri-name = Dr. Demitri
+
+actor-5tnk =
+   .name = Super Tank
+   .generic-name = Super Tank
+
+actor-5tnk-husk-name = Husk (Super Tank)
+
+## mousetrap
+actor-gas-name = Gas
+
+## sarin-gas-2-down-under
+actor-offiser-name = Officer
+
+## sarin-gas-3-controlled-burn
+actor-sarin-processing-plant-name = Sarin Processing Plant
+
+## siberian-conflict-1-fresh-tracks
+actor-atomic-material-name = Atomic Material
+
+## situation-critical
+actor-scientist-name = Scientist
+
+## soviet-soldier-volkov-n-chitzkoi
+actor-afac =
+   .name = Alloy Facility
+   .generic-name = Alloy Facility
+
+actor-ccen =
+   .name = Control Center
+   .generic-name = Control Center
+
+actor-hgun-name = Heavy Turret Prototype
+
+actor-zkoi =
+   .name = Chitzkoi
+   .generic-name = Cyborg Dog
+
+## situation-critical, soviet-soldier-volkov-n-chitzkoi
+actor-volk-name = Volkov
--- a/mods/ra/languages/difficulties/en.ftl
+++ b/mods/ra/languages/difficulties/en.ftl
@@ -1,8 +0,0 @@
-dropdown-difficulty =
-    .label = Difficulty
-    .description = The difficulty of the mission
-
-options-difficulty =
-    .easy = Easy
-    .normal = Normal
-    .hard = Hard
--- a/mods/ra/languages/rules/en.ftl
+++ b/mods/ra/languages/rules/en.ftl
@@ -1,4 +1,4 @@
-## Player
+## player.yaml
 options-tech-level =
    .infantry-only = Infantry Only
    .low = Low
@@ -26,48 +26,12 @@ notification-base-under-attack = Base under attack.
 notification-ally-under-attack = Our ally is under attack.
 notification-silos-needed = Silos needed.

-## World
+## world.yaml
 options-starting-units =
    .mcv-only = MCV Only
    .light-support = Light Support
    .heavy-support = Heavy Support

-## Structures
-notification-construction-complete = Construction complete.
-notification-unit-ready = Unit ready.
-notification-unable-to-build-more = Unable to build more.
-notification-unable-to-comply-building-in-progress = Unable to comply. Building in progress.
-notification-repairing = Repairing.
-notification-unit-repaired = Unit repaired.
-notification-select-target = Select target.
-notification-insufficient-power = Insufficient power.
-notification-reinforcements-have-arrived = Reinforcements have arrived.
-notification-abomb-prepping = A-bomb prepping.
-notification-abomb-ready = A-bomb ready.
-notification-abomb-launch-detected = A-bomb launch detected.
-notification-iron-curtain-charging = Iron curtain charging.
-notification-iron-curtain-ready = Iron curtain ready.
-notification-chronosphere-charging = Chronosphere charging.
-notification-chronosphere-ready = Chronosphere ready.
-notification-satellite-launched = Satellite launched.
-notification-credits-stolen = Credits stolen.
-notifcation-spy-plane-ready = Spy plane ready.
-
-## Defaults
-notification-unit-lost = Unit lost.
-notification-airborne-unit-lost = Airborne Unit lost.
-notification-naval-unit-lost = Naval Unit lost.
-notification-unit-promoted = Unit promoted.
-notification-primary-building-selected = Primary building selected.
-notification-structure-captured = Structure captured.
-notification-unit-stolen = Unit stolen.
-
-## Infantry
-notification-building-infiltrated = Building infiltrated.
-
-## Misc
-notification-sonar-pulse-ready = Sonar pulse ready.
-
 ## aircraft.yaml
 actor-badr-name = Badger

@@ -112,12 +76,6 @@ actor-mh60 =
      Weak vs Tanks, Aircraft
   .name = Black Hawk

-## campaign-rules.yaml
-actor-moneycrate-name = Crate
-
-## campaign-tooltips.yaml
-actor-miss-name = Technology Center
-
 ## civilian.yaml
 actor-c10-name = Scientist
 actor-tecn-name = Technician
@@ -148,6 +106,14 @@ actor-tanktrap1-name = Tank Trap
 actor-tanktrap2-name = Tank Trap

 ## defaults.yaml
+notification-unit-lost = Unit lost.
+notification-airborne-unit-lost = Airborne Unit lost.
+notification-naval-unit-lost = Naval Unit lost.
+notification-unit-promoted = Unit promoted.
+notification-primary-building-selected = Primary building selected.
+notification-structure-captured = Structure captured.
+notification-unit-stolen = Unit stolen.
+
 meta-vehicle-generic-name = Vehicle
 meta-infantry-generic-name = Soldier
 meta-civinfantry-name = Civilian
@@ -261,6 +227,8 @@ actor-u2-husk-name = Husk (Spy Plane)
 actor-mh60-husk-name = Black Hawk

 ## infantry.yaml
+notification-building-infiltrated = Building infiltrated.
+
 actor-dog =
   .description = Anti-infantry unit.
    Can detect spies.
@@ -364,6 +332,8 @@ actor-scoutant-name = Scout Ant
 actor-warriorant-name = Warrior Ant

 ## misc.yaml
+notification-sonar-pulse-ready = Sonar pulse ready.
+
 actor-moneycrate-name = Money Crate
 actor-healcrate-name = Heal Crate
 actor-wcrate-name = Wooden Crate
@@ -429,6 +399,26 @@ actor-pt =
   .name = Gunboat

 ## structures.yaml
+notification-construction-complete = Construction complete.
+notification-unit-ready = Unit ready.
+notification-unable-to-build-more = Unable to build more.
+notification-unable-to-comply-building-in-progress = Unable to comply. Building in progress.
+notification-repairing = Repairing.
+notification-unit-repaired = Unit repaired.
+notification-select-target = Select target.
+notification-insufficient-power = Insufficient power.
+notification-reinforcements-have-arrived = Reinforcements have arrived.
+notification-abomb-prepping = A-bomb prepping.
+notification-abomb-ready = A-bomb ready.
+notification-abomb-launch-detected = A-bomb launch detected.
+notification-iron-curtain-charging = Iron curtain charging.
+notification-iron-curtain-ready = Iron curtain ready.
+notification-chronosphere-charging = Chronosphere charging.
+notification-chronosphere-ready = Chronosphere ready.
+notification-satellite-launched = Satellite launched.
+notification-credits-stolen = Credits stolen.
+notifcation-spy-plane-ready = Spy plane ready.
+
 actor-mslo =
   .name = Missile Silo
   .description = Provides an atomic bomb.
--- a/mods/ra/maps/allies-01/map.yaml
+++ b/mods/ra/maps/allies-01/map.yaml
@@ -449,4 +449,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c

 Weapons: weapons.yaml

-Translations: ra|languages/lua/en.ftl
+Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
--- a/mods/ra/maps/allies-02/map.yaml
+++ b/mods/ra/maps/allies-02/map.yaml
@@ -658,4 +658,4 @@ Actors:

 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml

-Translations: ra|languages/lua/en.ftl, languages/en.ftl
+Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl, languages/en.ftl
--- a/mods/ra/maps/allies-03a/map.yaml
+++ b/mods/ra/maps/allies-03a/map.yaml
@@ -1312,4 +1312,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c

 Weapons: weapons.yaml

-Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl
+Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
--- a/mods/ra/maps/allies-03b/map.yaml
+++ b/mods/ra/maps/allies-03b/map.yaml
@@ -1212,4 +1212,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c

 Weapons: weapons.yaml

-Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl
+Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
--- a/mods/ra/maps/allies-04/map.yaml
+++ b/mods/ra/maps/allies-04/map.yaml
@@ -535,4 +535,4 @@ Actors:

 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml

-Translations: ra|languages/lua/en.ftl, languages/en.ftl
+Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl, languages/en.ftl
--- a/mods/ra/maps/allies-05a/en.ftl
+++ b/mods/ra/maps/allies-05a/en.ftl
@@ -1,2 +0,0 @@
-## rules.yaml
-actor-miss-name = Prison
--- a/mods/ra/maps/allies-05a/map.yaml
+++ b/mods/ra/maps/allies-05a/map.yaml
@@ -1565,4 +1565,4 @@ Weapons: weapons.yaml

 Notifications: notifications.yaml

-Translations: ra|languages/lua/en.ftl, languages/en.ftl, en.ftl
+Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl, languages/en.ftl
--- a/mods/ra/maps/allies-05a/rules.yaml
+++ b/mods/ra/maps/allies-05a/rules.yaml
@@ -96,7 +96,7 @@ WEAP.infiltratable:

 MISS:
 	Tooltip:
-		Name: actor-miss-name
+		Name: actor-prison-name
 	Targetable:
 		TargetTypes: GroundActor, C4, DetonateAttack, Structure, Mission Objectives
 	AttackOmni:
--- a/Show More
+++ b/Show More