Skip to content

Commit bd89c63

Browse files
ekudramekudram
committed
Translations Duplicates fixes
1 parent 5900b75 commit bd89c63

8 files changed

Lines changed: 16 additions & 54 deletions

File tree

‎[CAP] Chat Interactive/Command/CommandHandlers/TraitsCommandHandler.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public static string HandleAddTraitCommand(ChatMessageWrapper messageWrapper, st
191191
catch (Exception ex)
192192
{
193193
Logger.Error($"Error in AddTrait command handler: {ex}");
194-
return "RICS.TCH.Error".Translate();
194+
return "RICS.TCH.Erroradd".Translate();
195195
}
196196
}
197197

@@ -279,7 +279,7 @@ public static string HandleRemoveTraitCommand(ChatMessageWrapper messageWrapper,
279279
catch (Exception ex)
280280
{
281281
Logger.Error($"Error in RemoveTrait command handler: {ex}");
282-
return "RICS.TCH.Error".Translate();
282+
return "RICS.TCH.Errorremove".Translate();
283283
}
284284
}
285285

@@ -427,7 +427,7 @@ public static string HandleReplaceTraitCommand(ChatMessageWrapper messageWrapper
427427
catch (Exception ex)
428428
{
429429
Logger.Error($"Error in ReplaceTrait command handler: {ex}");
430-
return "RICS.TCH.Error".Translate();
430+
return "RICS.TCH.Error.Replace".Translate();
431431
}
432432
}
433433

@@ -657,7 +657,7 @@ public static string HandleSetTraitsCommand(ChatMessageWrapper messageWrapper, s
657657
catch (Exception ex)
658658
{
659659
Logger.Error($"Error in SetTraits command handler: {ex}");
660-
return "RICS.TCH.Error".Translate();
660+
return "RICS.TCH.Error.setting".Translate();
661661
}
662662
}
663663

@@ -751,7 +751,7 @@ public static string HandleListTraitsCommand(ChatMessageWrapper messageWrapper,
751751
catch (Exception ex)
752752
{
753753
Logger.Error($"Error in ListTraits command handler: {ex}");
754-
return "RICS.TCH.Error".Translate();
754+
return "RICS.TCH.Error.list".Translate();
755755
}
756756
}
757757

‎[CAP] Chat Interactive/Command/CommandHandlers/UseItemCommandHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ private static string CreateRimazonInstantInvoice(string username, string itemNa
358358

359359
sb.AppendLine("RICS.UICH.Invoice.Customer".Translate(username));
360360
sb.AppendLine("RICS.UICH.Invoice.Item".Translate(itemName, quantity));
361-
sb.AppendLine("RICS.UICH.Invoice.Service".Translate());
361+
sb.AppendLine("RICS.UICH.Invoice.Service.Immediate".Translate());
362362

363363
sb.AppendLine("RICS.UICH.Invoice.Separator".Translate());
364364

‎[CAP] Chat Interactive/Languages/English/Keyed/BuyPawnCommadnHandler.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@
5454
<RICS.BPCH.RacesList.New>[NEW]</RICS.BPCH.RacesList.New>
5555
<RICS.BPCH.NoXenotypesForRace>No xenotypes currently enabled for {0}.</RICS.BPCH.NoXenotypesForRace>
5656
<RICS.BPCH.TrySpecificRace>(use !listxenotypes {race} to see race-specific options)</RICS.BPCH.TrySpecificRace>
57-
<RICS.BPCH.CommonXenotypes>Common / default xenotypes: {0}</RICS.BPCH.CommonXenotypes>
58-
57+
5958
<!-- Xenotypes - FIXED: Key name consistency -->
6059
<RICS.BPCH.BiotechNotActive>Biotech DLC not active - only baseliners available.</RICS.BPCH.BiotechNotActive>
6160
<RICS.BPCH.XenotypesForRace>Xenotypes available for {0}: {1}</RICS.BPCH.XenotypesForRace>

‎[CAP] Chat Interactive/Languages/English/Keyed/Dialog_CommandEditor.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,23 +85,16 @@
8585
<CAP.CommandManager.PassionMaxSuccess>Max success chance (%):</CAP.CommandManager.PassionMaxSuccess>
8686
<CAP.CommandManager.PassionDescription>These settings control how risky and rewarding the !passion command is. Higher wagers usually improve chances, but critical outcomes can be very powerful — or very punishing.</CAP.CommandManager.PassionDescription>
8787

88-
<CAP.CommandManager.PassionSettings>Passion Gamble Settings</CAP.CommandManager.PassionSettings>
8988
<CAP.CommandManager.PassionWagerSettings>Wager Limits and Scaling</CAP.CommandManager.PassionWagerSettings>
9089
<CAP.CommandManager.PassionSuccessScaling>Success Chance Scaling</CAP.CommandManager.PassionSuccessScaling>
9190
<CAP.CommandManager.PassionCritSuccess>Critical Success</CAP.CommandManager.PassionCritSuccess>
9291
<CAP.CommandManager.PassionCritFailure>Critical Failure</CAP.CommandManager.PassionCritFailure>
9392
<CAP.CommandManager.PassionOutcomeBiases>Outcome Biases (Advanced)</CAP.CommandManager.PassionOutcomeBiases>
9493

9594
<!-- Wager section -->
96-
<CAP.CommandManager.PassionMinWager>Minimum wager</CAP.CommandManager.PassionMinWager>
97-
<CAP.CommandManager.PassionMaxWager>Maximum wager</CAP.CommandManager.PassionMaxWager>
9895
<CAP.CommandManager.PassionWagerBonusPer100>Bonus % per 100 coins wagered</CAP.CommandManager.PassionWagerBonusPer100>
9996
<CAP.CommandManager.PassionMaxWagerBonus>Maximum bonus from wager</CAP.CommandManager.PassionMaxWagerBonus>
10097

101-
<!-- Success scaling -->
102-
<CAP.CommandManager.PassionBaseSuccess>Base success chance (%)</CAP.CommandManager.PassionBaseSuccess>
103-
<CAP.CommandManager.PassionMaxSuccess>Maximum success chance (%)</CAP.CommandManager.PassionMaxSuccess>
104-
10598
<!-- Critical success -->
10699
<CAP.CommandManager.PassionCritSuccessRatio>Critical success multiplier (of base chance)</CAP.CommandManager.PassionCritSuccessRatio>
107100
<CAP.CommandManager.PassionMaxCritSuccess>Hard cap on critical success chance (%)</CAP.CommandManager.PassionMaxCritSuccess>

‎[CAP] Chat Interactive/Languages/English/Keyed/HealPawnCommandHandler.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
<!-- Return messages -->
55
<RICS.HPCH.Return.Notavailble>Healer Mech Serum is not available for healing services.</RICS.HPCH.Return.Notavailble>
6-
<RICS.HPCH.Return.NoInjuries>No injuries found to heal.</RICS.HPCH.Return.NoInjuries>
76
<RICS.HPCH.Return.Error>Error processing heal command. Send this stack trace to mod devolper!</RICS.HPCH.Return.Error>
87
<RICS.HPCH.Return.NoPawn>You don't have a pawn assigned. Use !buy pawn first.</RICS.HPCH.Return.NoPawn>
98
<RICS.HPCH.Return.TargetNoPawn>{0} doesn't have a pawn assigned.</RICS.HPCH.Return.TargetNoPawn>

‎[CAP] Chat Interactive/Languages/English/Keyed/SurgeryBuyItemCommandHandler.xml‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -65,32 +65,9 @@
6565
<RICS.SBCH.NotSuitableAge>Pawn is not suitable for this procedure (age/body type).</RICS.SBCH.NotSuitableAge>
6666
<RICS.SBCH.NoResearch>{0} requires research that hasn't been completed yet.</RICS.SBCH.NoResearch>
6767

68-
<!-- Body surgery adult / safety validation reasons -->
69-
70-
<RICS.SBCH.TooYoung>Your pawn is too young (biological age: {0:F1}). Minimum age for body-altering surgery is {1}.</RICS.SBCH.TooYoung>
71-
<RICS.SBCH.ChildBodyType>Your pawn has a Child body type, indicating they are not an adult.</RICS.SBCH.ChildBodyType>
72-
<RICS.SBCH.Pregnant>Your pawn is currently pregnant. Major body-altering surgeries are not safe during pregnancy.</RICS.SBCH.Pregnant>
73-
7468
<!-- Rare / error cases -->
7569
<RICS.SBCH.NullPawn>Error: Null Pawn.</RICS.SBCH.NullPawn>
7670

77-
<!-- Misc / Biotech surgery validation reasons -->
78-
79-
<RICS.SBCH.MinAgeRequired>Minimum age {0} required.</RICS.SBCH.MinAgeRequired>
80-
<RICS.SBCH.RequiresFemale>Requires female pawn.</RICS.SBCH.RequiresFemale>
81-
<RICS.SBCH.RequiresMale>Requires male pawn.</RICS.SBCH.RequiresMale>
82-
83-
<RICS.SBCH.IncompatibleCondition>Incompatible: {0} condition present (e.g. already sterilized or ovum extracted).</RICS.SBCH.IncompatibleCondition>
84-
<RICS.SBCH.AlreadyScheduled>Already scheduled for this pawn.</RICS.SBCH.AlreadyScheduled>
85-
86-
<RICS.SBCH.NotPregnant>Pawn is not pregnant.</RICS.SBCH.NotPregnant>
87-
<RICS.SBCH.NoVasectomy>Pawn lacks vasectomy.</RICS.SBCH.NoVasectomy>
88-
<RICS.SBCH.NoIUD>No IUD found.</RICS.SBCH.NoIUD>
89-
<RICS.SBCH.NoBenefitTransfusion>Pawn has no blood loss and is not hemogenic—no benefit from transfusion.</RICS.SBCH.NoBenefitTransfusion>
90-
91-
<RICS.SBCH.NotSuitableProcedure>Pawn is not suitable for this procedure (age/body type).</RICS.SBCH.NotSuitableProcedure>
92-
93-
9471
<!-- Invoice fragments -->
9572
<RICS.SBCH.InvoiceSurgeryLabal>🏥 Rimazon Surgery - {0}</RICS.SBCH.InvoiceSurgeryLabal>
9673

‎[CAP] Chat Interactive/Languages/English/Keyed/TraitsCommandHandler.xml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
<RICS.TCH.Add.Success>✅ Added trait '{0}' to {1} for {2}{3}!</RICS.TCH.Add.Success>
3838

39-
<RICS.TCH.Error>An error occurred while adding the trait.</RICS.TCH.Error>
39+
<RICS.TCH.Error.add>An error occurred while adding the trait.</RICS.TCH.Error.add>
4040

4141
<!-- These can be reused in conflict messages from CheckTraitConflicts -->
4242
<RICS.TCH.ConflictPrefix>Conflict: </RICS.TCH.ConflictPrefix>
@@ -58,7 +58,7 @@
5858
<RICS.TCH.Remove.Success>✅ Removed trait '{0}' from {1} for {2}{3}!</RICS.TCH.Remove.Success>
5959

6060
<!-- Reuse the same generic error key as add command -->
61-
<!-- <RICS.TCH.Error>An error occurred while removing the trait.</RICS.TCH.Error> -->
61+
<RICS.TCH.Errorremove>An error occurred while removing the trait.</RICS.TCH.Errorremove>
6262

6363
<!-- Replace Trait Command (RICS.TCH.Replace.*) -->
6464

@@ -85,6 +85,8 @@
8585

8686
<RICS.TCH.Replace.Success>✅ Replaced trait '{0}' with '{1}' on {2} for {3}{4}!</RICS.TCH.Replace.Success>
8787

88+
<RICS.TCH.Error.Replace>An error occurred while replacing traits.</RICS.TCH.Error.Replace>
89+
8890
<!-- Parsing error (rare) -->
8991
<RICS.TCH.Replace.ParseError>Could not parse trait names. Try: !replacetrait "old trait" "new trait"</RICS.TCH.Replace.ParseError>
9092

@@ -106,7 +108,7 @@
106108

107109
<RICS.TCH.Set.Success>✅ Set new traits: {0} for {1}{2}</RICS.TCH.Set.Success>
108110

109-
<RICS.TCH.Error>An error occurred while setting traits.</RICS.TCH.Error>
111+
<RICS.TCH.Error.setting>An error occurred while setting traits.</RICS.TCH.Error.setting>
110112

111113
<!-- List Traits Command (RICS.TCH.List.*) -->
112114

@@ -120,7 +122,7 @@
120122

121123
<RICS.TCH.List.Footer>💡 Use !trait &lt;name&gt; for details, !addtrait &lt;name&gt; to add, !removetrait &lt;name&gt; to remove</RICS.TCH.List.Footer>
122124

123-
<RICS.TCH.Error>An error occurred while listing traits.</RICS.TCH.Error>
125+
<RICS.TCH.Error.list>An error occurred while listing traits.</RICS.TCH.Error.list>
124126

125127
<!-- Conflict message used in multiple trait commands -->
126128
<RICS.TCH.ConflictWithExisting>❌ {0} conflicts with your pawn's existing trait {1}.</RICS.TCH.ConflictWithExisting>
@@ -136,8 +138,4 @@
136138
<RICS.TCH.TraitInfo.NoConflicts>No conflicts</RICS.TCH.TraitInfo.NoConflicts>
137139
<RICS.TCH.TraitInfo.NoExclusions>No exclusions</RICS.TCH.TraitInfo.NoExclusions>
138140

139-
<!-- Placeholder for future trait list / search commands -->
140-
<RICS.TCH.List.Header>Available buyable traits ({0} total):</RICS.TCH.List.Header>
141-
<RICS.TCH.List.NoTraits>No buyable traits configured.</RICS.TCH.List.NoTraits>
142-
143141
</LanguageData>

‎[CAP] Chat Interactive/Languages/English/Keyed/UseItemCommandHandler.xml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,11 @@
4242
<!-- Instant Use Invoice (used for normal !use items, blue Rimazon letter) -->
4343

4444
<RICS.UICH.Invoice.Instant.Header>RIMAZON INSTANT</RICS.UICH.Invoice.Instant.Header>
45-
<RICS.UICH.Invoice.Separator>====================</RICS.UICH.Invoice.Separator>
46-
47-
<RICS.UICH.Invoice.Customer>Customer: {0}</RICS.UICH.Invoice.Customer>
45+
4846
<RICS.UICH.Invoice.Item>Item: {0} x{1}</RICS.UICH.Invoice.Item>
49-
<RICS.UICH.Invoice.Service>Service: Immediate Use</RICS.UICH.Invoice.Service>
50-
51-
<RICS.UICH.Invoice.Total>Total: {0:N0}{1}</RICS.UICH.Invoice.Total>
47+
<RICS.UICH.Invoice.Service.Immediate>Service: Immediate Use</RICS.UICH.Invoice.Service.Immediate>
5248

53-
<RICS.UICH.Invoice.ThankYouInstant>Thank you for using Rimazon Instant!</RICS.UICH.Invoice.ThankYouInstant>
49+
<RICS.UICH.Invoice.ThankYouInstant>Thank you for using Rimazon Instant!</RICS.UICH.Invoice.ThankYouInstant>
5450
<RICS.UICH.Invoice.NoDelivery>No delivery required - instant satisfaction!</RICS.UICH.Invoice.NoDelivery>
5551

5652
<!-- Mechanitor Implant Validation (RICS.UICH.Mechanitor.*) -->

0 commit comments

Comments
 (0)