Merge branch 'master' into feature/rajas-of-asia-support

ParadoxGameConverters · Jan 20, 2025 · 1f4c970 · 1f4c970
2 parents 6dca697 + f63d29c
commit 1f4c970
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/Fronter.NET b/Fronter.NET
diff --git a/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj b/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="AwesomeAssertions" Version="8.0.0-rc.3" />
-    <PackageReference Include="coverlet.msbuild" Version="6.0.3">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -23,7 +23,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.3">
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/...s/blankMod/output/localization/replace/english/zzz_IRToCK3_vanilla_override_l_english.yml b/...s/blankMod/output/localization/replace/english/zzz_IRToCK3_vanilla_override_l_english.yml
@@ -27,4 +27,14 @@
 
  # "Chaldean" is a broader term that better encompasses the Babylonian culture added to this heritage.
  heritage_syriac: "Chaldean"
- heritage_syriac_collective_noun: "Chaldeans"
+ heritage_syriac_collective_noun: "Chaldeans"
+
+ # "Ancient Egyptian" is weird as a name for a culture that exists in the megacampaign timeline.
+ ancient_egyptian: "Kemetic"
+ ancient_egyptian_collective_noun: "Kemetics"
+ ancient_egyptian_prefix: "Egypto"
+ # "Egyptian" should not be used for the later Arabic-speaking population of Egypt.
+ # Instead, base the name on "Misr", the Arabic name for Egypt.
+ egyptian: "Misri"
+ egyptian_collective_noun: "Misris"
+ egyptian_prefix: "Egypto"
+2 −2		Fronter.NET/Fronter.csproj
+1 −1		Fronter.NET/Resources/Configuration/converter_l_english.yml
+1 −1		Fronter.NET/Resources/Configuration/converter_l_french.yml
+1 −1		Fronter.NET/Resources/Configuration/converter_l_german.yml
+1 −1		Fronter.NET/Resources/Configuration/converter_l_italian.yml
+1 −1		Fronter.NET/Resources/Configuration/converter_l_latin.yml
+1 −1		Fronter.NET/Resources/Configuration/converter_l_russian.yml
+1 −1		Fronter.NET/Resources/Configuration/converter_l_simp_chinese.yml