#4213 translation string fixes (#4217)

* #4213 some translation string fixes

* #4213 cargo localization string fixes

* #4213 more localization tweaks and fixes

* #4213 - fixed some translation string issues

* #4213 - fixed some translation string issues

Content.Client/AME/UI/AMEWindow.cs

@@ -38,7 +38,7 @@ namespace Content.Client.AME.UI
                         {
                             Children =
                             {
-                                new Label {Text = Loc.GetString("ame-window-engine-status-label")},
+                                new Label {Text = Loc.GetString("ame-window-engine-status-label") + " "},
                                 (InjectionStatus = new Label {Text = Loc.GetString("ame-window-engine-injection-status-not-injecting-label")})
                             }
                         },
@@ -53,7 +53,7 @@ namespace Content.Client.AME.UI
                         {
                             Children =
                             {
-                                new Label {Text = Loc.GetString("ame-window-fuel-status-label")},
+                                new Label {Text = Loc.GetString("ame-window-fuel-status-label") + " "},
                                 (FuelAmount = new Label {Text = Loc.GetString("ame-window-fuel-not-inserted-text")})
                             }
                         },
@@ -68,7 +68,7 @@ namespace Content.Client.AME.UI
                         {
                             Children =
                             {
-                                new Label {Text = Loc.GetString("ame-window-injection-amount-label")},
+                                new Label {Text = Loc.GetString("ame-window-injection-amount-label") + " "},
                                 (InjectionAmount = new Label {Text = "0"})
                             }
                         },
@@ -84,7 +84,7 @@ namespace Content.Client.AME.UI
                         {
                             Children =
                             {
-                                 new Label { Text = Loc.GetString("ame-window-core-count-label")},
+                                 new Label { Text = Loc.GetString("ame-window-core-count-label") + " "},
                                 (CoreCount = new Label { Text = "0"}),
                             }
                         }
@@ -130,7 +130,7 @@ namespace Content.Client.AME.UI
                 EjectButton.Disabled = false;
             }
 
-            if(!castState.HasFuelJar)
+            if (!castState.HasFuelJar)
             {
                 EjectButton.Disabled = true;
                 ToggleInjection.Disabled = true;
@@ -143,18 +143,18 @@ namespace Content.Client.AME.UI
                 FuelAmount.Text = $"{castState.FuelAmount}";
             }
 
-            if(!castState.IsMaster)
+            if (!castState.IsMaster)
             {
                 ToggleInjection.Disabled = true;
             }
 
             if (!castState.Injecting)
             {
-                InjectionStatus.Text = Loc.GetString("ame-window-engine-injection-status-not-injecting-label");
+                InjectionStatus.Text = Loc.GetString("ame-window-engine-injection-status-not-injecting-label") + " ";
             }
             else
             {
-                InjectionStatus.Text = Loc.GetString("ame-window-engine-injection-status-injecting-label");
+                InjectionStatus.Text = Loc.GetString("ame-window-engine-injection-status-injecting-label") + " ";
             }
 
             CoreCount.Text = $"{castState.CoreCount}";

Content.Client/Actions/UI/ActionMenu.cs

@@ -87,7 +87,7 @@ namespace Content.Client.Actions.UI
                             }),
                             (_filterButton = new MultiselectOptionButton<string>()
                             {
-                                Label = Loc.GetString("ui-actionmenu-filter-buttonr")
+                                Label = Loc.GetString("ui-actionmenu-filter-button")
                             })
                         }
                     },

Content.Client/Cargo/UI/CargoConsoleOrderMenu.cs

@@ -27,12 +27,12 @@ namespace Content.Client.Cargo.UI
             gridContainer.AddChild(requesterLabel);
             gridContainer.AddChild(Requester);
 
-            var reasonLabel = new Label { Text = Loc.GetString("cargo-console-order-menu-reason-label:") };
+            var reasonLabel = new Label { Text = Loc.GetString("cargo-console-order-menu-reason-label") };
             Reason = new LineEdit();
             gridContainer.AddChild(reasonLabel);
             gridContainer.AddChild(Reason);
 
-            var amountLabel = new Label { Text = Loc.GetString("cargo-console-order-menu-amount-label:") };
+            var amountLabel = new Label { Text = Loc.GetString("cargo-console-order-menu-amount-label") };
             Amount = new SpinBox
             {
                 HorizontalExpand = true,

Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs

@@ -153,7 +153,7 @@ namespace Content.Client.Kitchen.UI
                 for (var i = 0; i < reagents.Count; i++)
                 {
                     var goodIndex = _prototypeManager.TryIndex(reagents[i].ReagentId, out ReagentPrototype? proto);
-                    var reagentName = goodIndex ? Loc.GetString($"{reagents[i].Quantity} {proto!.Name}") : Loc.GetString("???");
+                    var reagentName = goodIndex ? Loc.GetString($"{reagents[i].Quantity} {proto!.Name}") : "???";
                     var reagentAdded = _menu.BeakerContentBox.BoxContents.AddItem(reagentName);
                     var reagentIndex = _menu.BeakerContentBox.BoxContents.IndexOf(reagentAdded);
                     _beakerVisualContents.Add(reagentIndex, reagents[i]);

Content.Client/Lathe/UI/LatheQueueMenu.cs

@@ -91,7 +91,7 @@ namespace Content.Client.Lathe.UI
         {
             _icon.Texture = Texture.Transparent;
             _nameLabel.Text = "-------";
-            _description.Text = "lathequeue-menu-not-producing-text";
+            _description.Text = Loc.GetString("lathequeue-menu-not-producing-text");
         }
 
         public void PopulateList()

Content.Client/Research/UI/ResearchConsoleMenu.cs

@@ -264,7 +264,7 @@ namespace Content.Client.Research.UI
 
             _technologyIcon.Texture = TechnologySelected.Icon.Frame0();
             _technologyName.Text = TechnologySelected.Name;
-            _technologyDescription.Text = TechnologySelected.Description + $"\n{TechnologySelected.RequiredPoints} " + Loc.GetString("research-console-menu-research-points-text").ToLowerInvariant();
+            _technologyDescription.Text = TechnologySelected.Description + $"\n{TechnologySelected.RequiredPoints} " + Loc.GetString("research-console-menu-research-points-text" ,("points", Owner.Points)).ToLowerInvariant();
             _technologyRequirements.Text = Loc.GetString("research-console-tech-requirements-none");
 
             var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
@@ -286,7 +286,7 @@ namespace Content.Client.Research.UI
         public void PopulatePoints()
         {
             _pointLabel.Text = Loc.GetString("research-console-menu-research-points-text", ("points", Owner.Points));
-            _pointsPerSecondLabel.Text = Loc.GetString("research-console-menu-points-per-second-text", ("pointsPerSeconds", Owner.PointsPerSecond));
+            _pointsPerSecondLabel.Text = Loc.GetString("research-console-menu-points-per-second-text", ("pointsPerSecond", Owner.PointsPerSecond));
         }
 
         /// <summary>

Content.Server/Actions/Actions/CombatMode.cs

@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using Content.Server.CombatMode;
 using Content.Shared.Actions.Behaviors;
 using Content.Shared.Notification;
@@ -20,7 +20,7 @@ namespace Content.Server.Actions.Actions
                 return false;
             }
 
-            args.Performer.PopupMessage(args.ToggledOn ? Loc.GetString("hud-combat-enabled") : Loc.GetString("hud-combat-disabled"));
+            args.Performer.PopupMessage(Loc.GetString(args.ToggledOn ? "hud-combat-enabled" : "hud-combat-disabled"));
             combatMode.IsInCombatMode = args.ToggledOn;
 
             return true;

Content.Server/Botany/Seed.cs

@@ -265,7 +265,7 @@ namespace Content.Server.Botany
                 sprite.LayerSetSprite(0, new SpriteSpecifier.Rsi(PlantRsi, "seed"));
             }
 
-            seed.Name = Loc.GetString("botany-seed-packet-name", ("seedName", SeedName), ("seedNount", SeedNoun));
+            seed.Name = Loc.GetString("botany-seed-packet-name", ("seedName", SeedName), ("seedNoun", SeedNoun));
 
             return seed;
         }

Content.Server/Interaction/InteractionSystem.cs

@@ -305,7 +305,7 @@ namespace Content.Server.Interaction
                 if (!await InteractUsingRanged(user, item, target, coordinates, inRangeUnobstructed) &&
                     !inRangeUnobstructed)
                 {
-                    var message = Loc.GetString("You can't reach there!");
+                    var message = Loc.GetString("interaction-system-user-interaction-cannot-reach");
                     user.PopupMessage(message);
                 }
 

Content.Server/Kitchen/Components/MicrowaveComponent.cs

@@ -228,7 +228,7 @@ namespace Content.Server.Kitchen.Components
 
             if (_broken)
             {
-                Owner.PopupMessage(eventArgs.User, Loc.GetString("It's broken!"));
+                Owner.PopupMessage(eventArgs.User, Loc.GetString("microwave-component-interact-using-broken"));
                 return false;
             }
 

Content.Server/Medical/Components/MedicalScannerComponent.cs

@@ -237,7 +237,7 @@ namespace Content.Server.Medical.Components
                     return;
                 }
 
-                data.Text = Loc.GetString("eject-verb-get-data-text");
+                data.Text = Loc.GetString("medical-scanner-eject-verb-get-data-text");
                 data.Visibility = component.IsOccupied ? VerbVisibility.Visible : VerbVisibility.Invisible;
             }
 

Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs

@@ -86,7 +86,7 @@ namespace Content.Server.TraitorDeathMatch.Components
             {
                 // This shouldn't even BE POSSIBLE in the actual mode this is meant for.
                 // Advanced Syndicate anti-tampering technology.
-                // Owner.PopupMessage(eventArgs.User, Loc.GetString("Tampering detected."));
+                // Owner.PopupMessage(eventArgs.User, Loc.GetString("traitor-death-match-redemption-component-interact-using-tampering-detected"));
                 // if (eventArgs.User.TryGetComponent<DamagableComponent>(out var userDamagable))
                 //     userDamagable.ChangeDamage(DamageType.Shock, 9001, true, null);
                 // ...So apparently, "it probably shouldn't kill people for a mistake".

Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs

@@ -24,7 +24,7 @@ namespace Content.Shared.Construction.Steps
 
         public override void DoExamine(FormattedMessage message, bool inDetailsRange)
         {
-            message.AddMarkup(Loc.GetString("construction-insert-material-entity",("amount", Amount),("materialName", MaterialPrototype.Name)));
+            message.AddMarkup(Loc.GetString("construction-insert-material-entity", ("amount", Amount), ("materialName", MaterialPrototype.Name)));
         }
 
         public override bool EntityValid(IEntity entity)

Resources/Locale/en-US/arcade/components/space-villain-game-component.ftl

@@ -10,6 +10,6 @@ space-villain-game-enemy-cheers-message = {$enemyName} cheers.
 space-villain-game-enemy-dies-with-player-message = {$enemyName} dies, but takes you with him.
 space-villain-game-enemy-throws-bomb-message = {$enemyName} throws a bomb, exploding you for {$damageReceived} damage!
 space-villain-game-enemy-steals-player-power-message = {$enemyName} steals {$stolenAmount} of your power!
-space-villain-game-enemy-heals-message = {$enemyName} heals for {healedAmount} health!
+space-villain-game-enemy-heals-message = {$enemyName} heals for {$healedAmount} health!
 space-villain-game-enemy-steals-player-power-message = {$enemyName} steals {$stolenAmount} of your power!
 space-villain-game-enemy-attacks-message = {$enemyName} attacks you for {$damageDealt} damage!

Resources/Locale/en-US/botany/components/plant-holder-component.ftl

@@ -12,7 +12,7 @@ plant-holder-component-no-plant-message = There is no plant to remove.
 plant-holder-component-empty-message = {$owner} is empty!
 plant-holder-component-spray-message = You spray {$owner}.
 plant-holder-component-transfer-message = You transfer {$amount}u to {$owner}.
-plant-holder-component-nothing-to-sample-message =There is nothing to take a sample of!.
+plant-holder-component-nothing-to-sample-message = There is nothing to take a sample of!
 plant-holder-component-already-sampled-message = This plant has already been sampled.
 plant-holder-component-dead-plant-message = This plant is dead.
 plant-holder-component-take-sample-message = You take a sample from the {$seedName}.

Resources/Locale/en-US/chemistry/components/chem-master-component.ftl

@@ -5,7 +5,7 @@ chem-master-component-interact-using-no-hands = You have no hands.
 chem-master-component-interact-using-nothing-in-hands = You have nothing in your hand!
 chem-master-component-has-beaker-already-message = This ChemMaster already has a container in it.
 chem-master-component-container-too-large-message = The {$container} is too large for the ChemMaster!
-chem-master-component-cannot-put-entity-message = You can't put {entity} in the ChemMaster!
+chem-master-component-cannot-put-entity-message = You can't put {$entity} in the ChemMaster!
 
 ## Bound UI
 chem-master-bound-user-interface-title = ChemMaster 4000

Resources/Locale/en-US/construction/steps/material-construction-graph-step.ftl

@@ -1 +1 @@
-construction-insert-material-entity = Next, add [color=yellow]{$amount}}x[/color] [color=cyan]{$materialName}[/color].
+construction-insert-material-entity = Next, add [color=yellow]{$amount}x[/color] [color=cyan]{$materialName}[/color].

Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

@@ -28,7 +28,7 @@ traitor-death-match-title = Traitor Deathmatch
 traitor-death-match-description = Everyone's a traitor. Everyone wants each other dead.
 traitor-death-match-station-is-too-unsafe-announcement = The station is too unsafe to continue. You have one minute.
 traitor-death-match-end-round-description-first-line = The PDAs recovered afterwards...
-traitor-death-match-end-round-description-entry = {$originalName}'s PDA, with {tcBalance} TC
+traitor-death-match-end-round-description-entry = {$originalName}'s PDA, with {$tcBalance} TC
 
 ## TraitorRole
 

Resources/Locale/en-US/hands/components/hands-component.ftl

@@ -1,8 +1,4 @@
-hands-component-disarm-success-others-message = {$source} disarms {$target}!
+hands-component-disarm-success-others-message = {$disarmer} disarms {$disarmed}!
-hands-component-disarm-success-message = You disarm {$target}!
+hands-component-disarm-success-message = You disarm {$disarmed}!
-hands-component-shove-success-others-message = {$source} shoves {$target}!
+hands-component-shove-success-others-message = {$shover} shoves {$shoved}!
-hands-component-shove-success-message = You shove {$target}!
+hands-component-shove-success-message = You shove {$shoved}!
-
-### HandComponent stuff
-
-

Resources/Locale/en-US/interaction/interaction-system.ftl

@@ -1 +1,2 @@
 shared-interaction-system-in-range-unobstructed-cannot-reach = You can't reach there!
+interaction-system-user-interaction-cannot-reach = You can't reach there!

Resources/Locale/en-US/kitchen/components/microwave-component.ftl

@@ -1,6 +1,7 @@
 ## Entity
 
 microwave-component-interact-using-no-power = It has no power!
+microwave-component-interact-using-broken = It's broken!
 microwave-component-interact-using-no-active-hand = You have no active hand!
 microwave-component-interact-using-container-full = Container is full
 microwave-component-interact-using-transfer-success = Transferred {$amount}u

Resources/Locale/en-US/launcher/launcher-connecting.ftl

@@ -10,3 +10,8 @@ connecting-tip = Don't die!
 connecting-version = ver 0.1
 connecting-fail-reason = Failed to connect to server:
                          { $reason }
+connecting-state-NotConnecting = Not connecting
+connecting-state-ResolvingHost = Resolving host
+connecting-state-EstablishingConnection = Establishing connection
+connecting-state-Handshake = Handshake
+connecting-state-Connected = Connected

Resources/Locale/en-US/medical/components/medical-scanner-component.ftl

@@ -9,7 +9,7 @@ enter-verb-get-data-text = Enter
 
 ## EjectVerb
 
-eject-verb-get-data-text = Eject
+medical-scanner-eject-verb-get-data-text = Eject
 
 ## UI
 

Resources/Locale/en-US/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl

@@ -13,4 +13,4 @@ particle-accelerator-control-menu-status-label = Status: {$status}
 particle-accelerator-control-menu-status-operational = Operational
 particle-accelerator-control-menu-status-incomplete = Incomplete
 particle-accelerator-control-menu-draw-not-available = Draw: N/A
-particle-accelerator-control-menu-draw = Draw: {$watts}/{lastReceive} 
+particle-accelerator-control-menu-draw = Draw: {$watts}/{$lastReceive} 

Resources/Locale/en-US/shell.ftl

@@ -5,7 +5,7 @@
 shell-server-cannot = Server cannot do this.
 shell-command-success = Command successful
 shell-invalid-command = Invalid command.
-shell-invalid-command-specific = Invalid {commandName} command.
+shell-invalid-command-specific = Invalid {$commandName} command.
 shell-cannot-run-command-from-server = You cannot run this command from the server. 
 shell-only-players-can-run-this-command = Only players can run this command.
 

Resources/Locale/en-US/strip/strippable-component.ftl

@@ -12,5 +12,5 @@ strip-verb-get-data-text = Strip
 
 ## UI
 
-strippable-bound-user-interface-stripping-menu-title = {ownerName}'s inventory
+strippable-bound-user-interface-stripping-menu-title = {$ownerName}'s inventory
 strippable-bound-user-interface-stripping-menu-handcuffs-button = Restraints

Resources/Locale/en-US/traitor-death-match/components/traitor-death-match-redemption-component.ftl

@@ -6,6 +6,7 @@ traitor-death-match-redemption-component-interact-using-no-pda-message = GIVEN P
 traitor-death-match-redemption-component-interact-using-no-pda-owner-message ="GIVEN PDA HAS NO OWNER (0064)"
 traitor-death-match-redemption-component-interact-using-pda-different-user-message = "GIVEN PDA OWNED BY USER (0070)"
 traitor-death-match-redemption-component-interact-using-no-pda-in-pocket-message = "NO USER PDA IN IDCARD POCKET (0083)"
+traitor-death-match-redemption-component-interact-using-tampering-detected = "TAMPERING DETECTED (0101)"
 traitor-death-match-redemption-component-interact-using-user-no-uplink-account-message = "USER PDA HAS NO UPLINK ACCOUNT (0102)"
 traitor-death-match-redemption-component-interact-using-victim-no-uplink-account-message = "USER PDA HAS NO UPLINK ACCOUNT (0108)"
 traitor-death-match-redemption-component-interact-using-success-message = The machine plays a happy little tune, and displays: "SUCCESS: {$tcAmount} TC TRANSFERRED"

Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml

@@ -2,7 +2,7 @@
   parent: BaseItem
   id: AMEPart
   name: AME part
-  description: A flatpack used for constructing an antimatter engine reactor.\nUse a multitool to unpack it.
+  description: A flatpack used for constructing an antimatter engine reactor. Use a multitool to unpack it.
   components:
   - type: Item
     size: 5