Manual cleanup

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

mods/cnc/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

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)
@@ -226,12 +200,12 @@ actor-e1 =
 
 actor-e2 =
    .name = Grenadier
-   .description = Fast infantry armed with grenades. 
+   .description = Fast infantry armed with grenades.
       Strong vs Buildings, slow-moving targets
 
 actor-e3 =
    .name = Rocket Soldier
-   .description = Anti-tank/Anti-aircraft infantry. 
+   .description = Anti-tank/Anti-aircraft infantry.
       Strong vs Tanks, Aircraft
       Weak vs Infantry
 
@@ -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.

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

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

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

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

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

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.

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

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

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

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

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

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

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

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

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.

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

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.

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

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.

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

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.

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

mods/cnc/maps/nod01/en.ftl

@@ -1,2 +0,0 @@
-## rules.yaml
-actor-c10-name = Nikoomba

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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: