diff --git a/Content.Client/UserInterface/Systems/EscapeMenu/OptionsUIController.cs b/Content.Client/UserInterface/Systems/EscapeMenu/OptionsUIController.cs index fedd64a43f..9f2179701c 100644 --- a/Content.Client/UserInterface/Systems/EscapeMenu/OptionsUIController.cs +++ b/Content.Client/UserInterface/Systems/EscapeMenu/OptionsUIController.cs @@ -26,7 +26,7 @@ public sealed class OptionsUIController : UIController if (!int.TryParse(args[0], out var tab)) { - shell.WriteError(Loc.GetString("cmd-parse-failure-int", ("arg", args[0]))); + shell.WriteError(Loc.GetString("cmd-parse-failure-integer", ("arg", args[0]))); return; } diff --git a/Content.Server/Administration/Commands/PanicBunkerCommand.cs b/Content.Server/Administration/Commands/PanicBunkerCommand.cs index 18aed7e3f0..1536bf0e9b 100644 --- a/Content.Server/Administration/Commands/PanicBunkerCommand.cs +++ b/Content.Server/Administration/Commands/PanicBunkerCommand.cs @@ -187,6 +187,6 @@ public sealed class PanicBunkerMinOverallMinutesCommand : LocalizedCommands } _cfg.SetCVar(CCVars.PanicBunkerMinOverallMinutes, minutes); - shell.WriteLine(Loc.GetString("panicbunker-command-overall-minutes-age-set", ("minutes", minutes))); + shell.WriteLine(Loc.GetString("panicbunker-command-min-overall-minutes-set", ("minutes", minutes))); } } diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs index 900a52057e..2d4f582bfc 100644 --- a/Content.Server/RoundEnd/RoundEndSystem.cs +++ b/Content.Server/RoundEnd/RoundEndSystem.cs @@ -233,7 +233,7 @@ namespace Content.Server.RoundEnd } _chatSystem.DispatchGlobalAnnouncement(Loc.GetString("round-end-system-shuttle-recalled-announcement"), - Loc.GetString("Station"), false, colorOverride: Color.Gold); + Loc.GetString("round-end-system-shuttle-sender-announcement"), false, colorOverride: Color.Gold); _audio.PlayGlobal("/Audio/Announcements/shuttlerecalled.ogg", Filter.Broadcast(), true); diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs index 0493bb22ce..466678be3d 100644 --- a/Content.Server/Salvage/SalvageSystem.Expeditions.cs +++ b/Content.Server/Salvage/SalvageSystem.Expeditions.cs @@ -128,7 +128,7 @@ public sealed partial class SalvageSystem { var component = expedition.Comp; component.NextOffer = _timing.CurTime + TimeSpan.FromSeconds(_cooldown); - Announce(uid, Loc.GetString("salvage-expedition-mission-completed")); + Announce(uid, Loc.GetString("salvage-expedition-completed")); component.ActiveMission = 0; component.Cooldown = true; UpdateConsoles(expedition); diff --git a/Resources/Locale/en-US/actions/actions/actions-commands.ftl b/Resources/Locale/en-US/actions/actions/actions-commands.ftl index c0cd59cdac..ac5374f008 100644 --- a/Resources/Locale/en-US/actions/actions/actions-commands.ftl +++ b/Resources/Locale/en-US/actions/actions/actions-commands.ftl @@ -1,6 +1,7 @@ ## Actions Commands loc ## Upgradeaction command loc +upgradeaction-command-help = Usage: upgradeaction [level] upgradeaction-command-need-one-argument = upgradeaction needs at least one argument, the action entity uid. The second optional argument is a specified level. upgradeaction-command-max-two-arguments = upgradeaction has a maximum of two arguments, the action entity uid and the (optional) level to set. upgradeaction-command-second-argument-not-number = upgradeaction's second argument can only be a number. diff --git a/Resources/Locale/en-US/commands/colornetwork-command.ftl b/Resources/Locale/en-US/commands/colornetwork-command.ftl index 3fd60bcb89..c77657000e 100644 --- a/Resources/Locale/en-US/commands/colornetwork-command.ftl +++ b/Resources/Locale/en-US/commands/colornetwork-command.ftl @@ -1,3 +1,5 @@ cmd-colornetwork-desc = Paints the atmos devices in the specified color cmd-colornetwork-help = colornetwork Pipe cmd-colornetwork-no-access = You are not currently able to use mapping commands. +shell-entity-is-not-node-container = Target entity is not a node container. +shell-node-group-is-invalid = Invalid node group specified. Valid groups: { $groups }. \ No newline at end of file diff --git a/Resources/Locale/en-US/components/screen-component.ftl b/Resources/Locale/en-US/components/screen-component.ftl new file mode 100644 index 0000000000..baa3229533 --- /dev/null +++ b/Resources/Locale/en-US/components/screen-component.ftl @@ -0,0 +1,2 @@ +screen-text = screenText +screen-color = screenColor \ No newline at end of file diff --git a/Resources/Locale/en-US/info/ban.ftl b/Resources/Locale/en-US/info/ban.ftl index cc3a34c28b..5cbdaced97 100644 --- a/Resources/Locale/en-US/info/ban.ftl +++ b/Resources/Locale/en-US/info/ban.ftl @@ -27,7 +27,7 @@ cmd-banpanel-player-err = The specified player could not be found cmd-banlist-desc = Lists a user's active bans. cmd-banlist-help = Usage: banlist cmd-banlist-empty = No active bans found for {$user} -cmd-banlistF-hint = +cmd-banlist-hint = cmd-ban_exemption_update-desc = Set an exemption to a type of ban on a player. cmd-ban_exemption_update-help = Usage: ban_exemption_update [ [...]] diff --git a/Resources/Locale/en-US/ninja/ninja-actions.ftl b/Resources/Locale/en-US/ninja/ninja-actions.ftl index b3e295b7a2..9ca0468666 100644 --- a/Resources/Locale/en-US/ninja/ninja-actions.ftl +++ b/Resources/Locale/en-US/ninja/ninja-actions.ftl @@ -4,6 +4,7 @@ ninja-suit-cooldown = The suit needs time to recuperate from the last attack. ninja-cell-downgrade = The suit will only accept a new power cell that is better than the current one! ninja-cell-too-large = This power source does not fit in the ninja suit! +ninja-download-fail = Server has no research data... ninja-research-steal-fail = No new research nodes were stolen... ninja-research-steal-success = Stole {$count} new nodes from {THE($server)}. diff --git a/Resources/Locale/en-US/ui/spray-painter-window.ftl b/Resources/Locale/en-US/ui/spray-painter-window.ftl new file mode 100644 index 0000000000..5466810e11 --- /dev/null +++ b/Resources/Locale/en-US/ui/spray-painter-window.ftl @@ -0,0 +1 @@ +pipe-painter-no-color-selected = (No color selected) \ No newline at end of file