Merge branch 'master' into dependabot/dotnet_sdk/dotnet-sdk-9.0.102

ParadoxGameConverters · Jan 20, 2025 · 3b80d28 · 3b80d28
2 parents 369b370 + f63d29c
commit 3b80d28
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/Fronter.NET b/Fronter.NET
diff --git a/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj b/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <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
@@ -24,3 +24,13 @@
  unlock_final_hasan_decisions_1_tt: ""
  unlock_final_hasan_decisions_2_tt: ""
  unlock_final_hasan_decisions_3_tt: ""
+
+ # "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