Remove "en" from fluent file paths.

OpenRA.Mods.Common/UtilityCommands/ExtractChromeStrings.cs

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 			{
 				var fluentFolder = layout.Key + "|languages";
 				var fluentPackage = modData.ModFiles.OpenPackage(fluentFolder);
-				var fluentPath = Path.Combine(fluentPackage.Name, "chrome/en.ftl");
+				var fluentPath = Path.Combine(fluentPackage.Name, "chrome.ftl");
 
 				var unsortedCandidates = new List<ExtractionCandidate>();
 				var groupedCandidates = new Dictionary<HashSet<string>, List<ExtractionCandidate>>();

OpenRA.Mods.Common/UtilityCommands/ExtractYamlStrings.cs

@@ -65,7 +65,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 			}
 
 			var fluentPackage = modData.ModFiles.OpenPackage(modData.Manifest.Id + "|languages");
-			ExtractFromFile(Path.Combine(fluentPackage.Name, "rules/en.ftl"), modRules, traitInfos);
+			ExtractFromFile(Path.Combine(fluentPackage.Name, "rules.ftl"), modRules, traitInfos);
 			modRules.Save();
 
 			// Extract from maps.
@@ -83,18 +83,18 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					if (mapRulesNode != null)
 						mapRules.AddRange(UpdateUtils.LoadInternalMapYaml(modData, package, mapRulesNode.Value, new HashSet<string>()));
 
-					const string Enftl = "en.ftl";
+					const string Mapftl = "map.ftl";
-					ExtractFromFile(Path.Combine(package.Name, Enftl), mapRules, traitInfos, () =>
+					ExtractFromFile(Path.Combine(package.Name, Mapftl), mapRules, traitInfos, () =>
 					{
 						var node = yaml.NodeWithKeyOrDefault("FluentMessages");
 						if (node != null)
 						{
 							var value = node.NodeValue<string[]>();
-							if (!value.Contains(Enftl))
+							if (!value.Contains(Mapftl))
-								node.Value.Value = string.Join(", ", value.Concat(new string[] { Enftl }).ToArray());
+								node.Value.Value = string.Join(", ", value.Concat(new string[] { Mapftl }).ToArray());
 						}
 						else
-							yaml.Nodes.Add(new MiniYamlNodeBuilder("FluentMessages", Enftl));
+							yaml.Nodes.Add(new MiniYamlNodeBuilder("FluentMessages", Mapftl));
 					});
 
 					mapRules.Save();

mods/cnc-content/mod.yaml

@@ -37,10 +37,10 @@ ChromeMetrics:
 	content|metrics.yaml
 
 FluentMessages:
-	common|languages/en.ftl
+	common|fluent/common.ftl
-	content|languages/en.ftl
+	content|fluent/content.ftl
-	content|languages/chrome/en.ftl
+	content|fluent/chrome.ftl
-	cnccontent|languages/chrome/en.ftl
+	cnccontent|fluent/chrome.ftl
 
 Fonts:
 	Tiny:

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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl

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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl

mods/cnc/maps/gdi05b/map.yaml

@@ -613,4 +613,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl

mods/cnc/maps/gdi05c/map.yaml

@@ -770,4 +770,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl

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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl

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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl

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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl

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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl

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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl

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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl

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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl

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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl, languages/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl, map.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl, languages/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl, map.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.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
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
 
 Weapons: weapons.yaml

mods/cnc/mod.yaml

@@ -145,13 +145,13 @@ ChromeLayout:
 	common|chrome/text-notifications.yaml
 
 FluentMessages:
-	common|languages/en.ftl
+	common|fluent/common.ftl
-	common|languages/hotkeys/en.ftl
+	common|fluent/hotkeys.ftl
-	common|languages/rules/en.ftl
+	common|fluent/rules.ftl
-	cnc|languages/en.ftl
+	cnc|fluent/cnc.ftl
-	cnc|languages/chrome/en.ftl
+	cnc|fluent/chrome.ftl
-	cnc|languages/hotkeys/en.ftl
+	cnc|fluent/hotkeys.ftl
-	cnc|languages/rules/en.ftl
+	cnc|fluent/rules.ftl
 
 AllowUnusedFluentMessagesInExternalPackages: false
 

mods/d2k-content/mod.yaml

@@ -37,10 +37,10 @@ ChromeMetrics:
 	content|metrics.yaml
 
 FluentMessages:
-	common|languages/en.ftl
+	common|fluent/common.ftl
-	content|languages/en.ftl
+	content|fluent/content.ftl
-	content|languages/chrome/en.ftl
+	content|fluent/chrome.ftl
-	d2kcontent|languages/chrome/en.ftl
+	d2kcontent|fluent/chrome.ftl
 
 Fonts:
 	Tiny:

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

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
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl

mods/d2k/mod.yaml

@@ -130,14 +130,14 @@ ChromeLayout:
 	d2k|chrome/encyclopedia.yaml
 
 FluentMessages:
-	common|languages/en.ftl
+	common|fluent/common.ftl
-	common|languages/chrome/en.ftl
+	common|fluent/chrome.ftl
-	common|languages/hotkeys/en.ftl
+	common|fluent/hotkeys.ftl
-	common|languages/rules/en.ftl
+	common|fluent/rules.ftl
-	d2k|languages/en.ftl
+	d2k|fluent/d2k.ftl
-	d2k|languages/chrome/en.ftl
+	d2k|fluent/chrome.ftl
-	d2k|languages/hotkeys/en.ftl
+	d2k|fluent/hotkeys.ftl
-	d2k|languages/rules/en.ftl
+	d2k|fluent/rules.ftl
 
 AllowUnusedFluentMessagesInExternalPackages: false
 

mods/ra-content/mod.yaml

@@ -37,10 +37,10 @@ ChromeMetrics:
 	content|metrics.yaml
 
 FluentMessages:
-	common|languages/en.ftl
+	common|fluent/en.ftl
-	content|languages/en.ftl
+	content|fluent/content.ftl
-	content|languages/chrome/en.ftl
+	content|fluent/chrome.ftl
-	racontent|languages/chrome/en.ftl
+	racontent|fluent/chrome.ftl
 
 Fonts:
 	Tiny: