From f6ac494ad3edb584d29f5bd71d4045d93ea9f55c Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 25 Apr 2024 11:19:17 +1000
Subject: [PATCH] Fix .ftl keys (#27289)

Required for https://github.com/space-wizards/RobustToolbox/pull/4885 to not kill content
---
 Content.Server/Speech/Components/PirateAccentComponent.cs   | 3 ++-
 Resources/Locale/en-US/accent/italian.ftl                   | 3 ---
 Resources/Locale/en-US/accent/pirate.ftl                    | 2 +-
 Resources/Locale/en-US/administration/ui/admin-logs.ftl     | 1 -
 Resources/Locale/en-US/administration/ui/admin-notes.ftl    | 1 -
 Resources/Locale/en-US/alerts/alerts.ftl                    | 3 ---
 .../en-US/ame/components/ame-controller-component.ftl       | 1 -
 .../arcade/components/space-villain-game-component.ftl      | 3 +--
 .../Locale/en-US/construction/ui/construction-menu.ftl      | 3 +--
 .../disposal/tube/components/disposal-router-component.ftl  | 4 ----
 .../disposal/tube/components/disposal-tagger-window.ftl     | 3 ---
 Resources/Locale/en-US/escape-menu/ui/options-menu.ftl      | 1 -
 Resources/Locale/en-US/guidebook/chemistry/effects.ftl      | 2 +-
 .../en-US/interaction/interaction-popup-component.ftl       | 6 ------
 Resources/Locale/en-US/reagents/meta/physical-desc.ftl      | 2 --
 Resources/Locale/en-US/ui/verbs.ftl                         | 3 ---
 16 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 Resources/Locale/en-US/ui/verbs.ftl

diff --git a/Content.Server/Speech/Components/PirateAccentComponent.cs b/Content.Server/Speech/Components/PirateAccentComponent.cs
index 0559d9854b..b5b292775d 100644
--- a/Content.Server/Speech/Components/PirateAccentComponent.cs
+++ b/Content.Server/Speech/Components/PirateAccentComponent.cs
@@ -15,6 +15,7 @@ public sealed partial class PirateAccentComponent : Component
     {
         "accent-pirate-prefix-1",
         "accent-pirate-prefix-2",
-        "accent-pirate-prefix-3"
+        "accent-pirate-prefix-3",
+        "accent-pirate-prefix-4",
     };
 }
diff --git a/Resources/Locale/en-US/accent/italian.ftl b/Resources/Locale/en-US/accent/italian.ftl
index d0ef4e8f72..cc8641417f 100644
--- a/Resources/Locale/en-US/accent/italian.ftl
+++ b/Resources/Locale/en-US/accent/italian.ftl
@@ -78,9 +78,6 @@ accent-italian-words-replace-23 = greek
 accent-italian-words-24 = operatives
 accent-italian-words-replace-24 = greeks
 
-accent-italian-words-24 = ops
-accent-italian-words-replace-24 = greeks
-
 accent-italian-words-25 = sec
 accent-italian-words-replace-25 = polizia
 
diff --git a/Resources/Locale/en-US/accent/pirate.ftl b/Resources/Locale/en-US/accent/pirate.ftl
index 8da975df40..b6db7c803b 100644
--- a/Resources/Locale/en-US/accent/pirate.ftl
+++ b/Resources/Locale/en-US/accent/pirate.ftl
@@ -1,7 +1,7 @@
 accent-pirate-prefix-1 = Arrgh
 accent-pirate-prefix-2 = Garr
 accent-pirate-prefix-3 = Yarr
-accent-pirate-prefix-3 = Yarrgh
+accent-pirate-prefix-4 = Yarrgh
 
 accent-pirate-replaced-1 = my
 accent-pirate-replacement-1 = me
diff --git a/Resources/Locale/en-US/administration/ui/admin-logs.ftl b/Resources/Locale/en-US/administration/ui/admin-logs.ftl
index 549e9587d7..377bea6e84 100644
--- a/Resources/Locale/en-US/administration/ui/admin-logs.ftl
+++ b/Resources/Locale/en-US/administration/ui/admin-logs.ftl
@@ -14,7 +14,6 @@ admin-logs-select-none = None
 
 # Players
 admin-logs-search-players-placeholder = Search Players (OR)
-admin-logs-select-none = None
 admin-logs-include-non-player = Include Non-players
 
 # Logs
diff --git a/Resources/Locale/en-US/administration/ui/admin-notes.ftl b/Resources/Locale/en-US/administration/ui/admin-notes.ftl
index ca5348a940..03e1290257 100644
--- a/Resources/Locale/en-US/administration/ui/admin-notes.ftl
+++ b/Resources/Locale/en-US/administration/ui/admin-notes.ftl
@@ -35,7 +35,6 @@ admin-notes-message-seen = Seen
 admin-notes-banned-from = Banned from
 admin-notes-the-server = the server
 admin-notes-permanently = permanently
-admin-notes-for = for {$player}
 admin-notes-days = {$days} days
 admin-notes-hours = {$hours} hours
 admin-notes-minutes = {$minutes} minutes
diff --git a/Resources/Locale/en-US/alerts/alerts.ftl b/Resources/Locale/en-US/alerts/alerts.ftl
index 795d740141..319809da40 100644
--- a/Resources/Locale/en-US/alerts/alerts.ftl
+++ b/Resources/Locale/en-US/alerts/alerts.ftl
@@ -57,9 +57,6 @@ alerts-no-battery-desc = You don't have a battery, rendering you unable to charg
 alerts-internals-name = Toggle internals
 alerts-internals-desc = Toggles your gas tank internals on or off.
 
-alerts-internals-name = Toggle internals
-alerts-internals-desc = Toggles your gas tank internals on or off.
-
 alerts-piloting-name = Piloting Shuttle
 alerts-piloting-desc = You are piloting a shuttle. Click the alert to stop.
 
diff --git a/Resources/Locale/en-US/ame/components/ame-controller-component.ftl b/Resources/Locale/en-US/ame/components/ame-controller-component.ftl
index ee1f7f42e7..f15141ebcc 100644
--- a/Resources/Locale/en-US/ame/components/ame-controller-component.ftl
+++ b/Resources/Locale/en-US/ame/components/ame-controller-component.ftl
@@ -16,7 +16,6 @@ ame-window-refresh-parts-button = Refresh Parts
 ame-window-core-count-label = Core count:
 ame-window-power-currentsupply-label = Current power supply:
 ame-window-power-targetsupply-label = Targeted power supply:
-ame-window-toggle-injection-button = Toggle Injection
 ame-window-eject-button = Eject
 ame-window-increase-fuel-button = Increase
 ame-window-decrease-fuel-button = Decrease
diff --git a/Resources/Locale/en-US/arcade/components/space-villain-game-component.ftl b/Resources/Locale/en-US/arcade/components/space-villain-game-component.ftl
index af005ae62d..75e18c8d71 100644
--- a/Resources/Locale/en-US/arcade/components/space-villain-game-component.ftl
+++ b/Resources/Locale/en-US/arcade/components/space-villain-game-component.ftl
@@ -11,5 +11,4 @@ space-villain-game-enemy-dies-with-player-message = {$enemyName} dies, but takes
 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-steals-player-power-message = {$enemyName} steals {$stolenAmount} of your power!
-space-villain-game-enemy-attacks-message = {$enemyName} attacks you for {$damageDealt} damage!
\ No newline at end of file
+space-villain-game-enemy-attacks-message = {$enemyName} attacks you for {$damageDealt} damage!
diff --git a/Resources/Locale/en-US/construction/ui/construction-menu.ftl b/Resources/Locale/en-US/construction/ui/construction-menu.ftl
index f4b7f3559a..82ebc01bc9 100644
--- a/Resources/Locale/en-US/construction/ui/construction-menu.ftl
+++ b/Resources/Locale/en-US/construction/ui/construction-menu.ftl
@@ -4,5 +4,4 @@ construction-menu-title = Construction
 construction-menu-place-ghost = Place construction ghost
 construction-menu-clear-all = Clear All
 construction-menu-eraser-mode = Eraser Mode
-construction-menu-title = Construction
-construction-menu-craft = Craft
\ No newline at end of file
+construction-menu-craft = Craft
diff --git a/Resources/Locale/en-US/disposal/tube/components/disposal-router-component.ftl b/Resources/Locale/en-US/disposal/tube/components/disposal-router-component.ftl
index 64fbfdf66f..4fe24b7853 100644
--- a/Resources/Locale/en-US/disposal/tube/components/disposal-router-component.ftl
+++ b/Resources/Locale/en-US/disposal/tube/components/disposal-router-component.ftl
@@ -4,7 +4,3 @@ disposal-router-window-title = Disposal Router
 disposal-router-window-tags-label = Tags:
 disposal-router-window-tag-input-tooltip = A comma separated list of tags
 disposal-router-window-tag-input-confirm-button = Confirm
-
-## ConfigureVerb
-
-configure-verb-get-data-text = Open Configuration
diff --git a/Resources/Locale/en-US/disposal/tube/components/disposal-tagger-window.ftl b/Resources/Locale/en-US/disposal/tube/components/disposal-tagger-window.ftl
index dc4b40fc7f..55523c4b95 100644
--- a/Resources/Locale/en-US/disposal/tube/components/disposal-tagger-window.ftl
+++ b/Resources/Locale/en-US/disposal/tube/components/disposal-tagger-window.ftl
@@ -1,6 +1,3 @@
 disposal-tagger-window-title = Disposal Tagger
 disposal-tagger-window-tag-input-label = Tag:
 disposal-tagger-window-tag-confirm-button = Confirm
-
-## ConfigureVerb
-configure-verb-get-data-text = Open Configuration
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index 6173977285..416d87f7c5 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -196,7 +196,6 @@ ui-options-function-editor-rotate-object = Rotate
 ui-options-function-editor-flip-object = Flip
 ui-options-function-editor-copy-object = Copy
 
-ui-options-function-open-abilities-menu = Open action menu
 ui-options-function-show-debug-console = Open Console
 ui-options-function-show-debug-monitors = Show Debug Monitors
 ui-options-function-inspect-entity = Inspect Entity
diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
index b6f45d2386..94c1376083 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
@@ -43,7 +43,7 @@ reagent-effect-guidebook-foam-area-reaction-effect =
         *[other] create
     } large quantities of foam
 
-reagent-effect-guidebook-foam-area-reaction-effect =
+reagent-effect-guidebook-smoke-area-reaction-effect =
     { $chance ->
         [1] Creates
         *[other] create
diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index bb56233ff1..4929b11b1c 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -42,7 +42,6 @@ petting-failure-crab = You reach out to pet {THE($target)}, but {SUBJECT($target
 petting-failure-dehydrated-carp = You pet {THE($target)} on {POSS-ADJ($target)} dry little head.
 petting-failure-goat = You reach out to pet {THE($target)}, but {SUBJECT($target)} stubbornly refuses!
 petting-failure-goose = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} too horrible!
-petting-failure-goose = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} too australian!
 petting-failure-possum = You reach out to pet {THE($target)}, but are met with hisses and snarls!
 petting-failure-pig = You reach out to pet {THE($target)}, but are met with irritated oinks and squeals!
 petting-failure-raccoon = You reach out to pet {THE($target)}, but {THE($target)} is busy raccooning around.
@@ -68,11 +67,6 @@ petting-failure-cleanbot = You reach out to pet {THE($target)}, but {SUBJECT($ta
 petting-failure-mimebot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy miming!
 petting-failure-medibot = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} syringe nearly stabs your hand!
 
-## Knocking on windows
-
-# Shown when knocking on a window
-comp-window-knock = *knock knock*
-
 ## Rattling fences
 
 fence-rattle-success = *rattle*
diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
index 2e959bf14e..355b76c2a4 100644
--- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
+++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
@@ -64,7 +64,6 @@ reagent-physical-desc-sticky = sticky
 reagent-physical-desc-bubbly = bubbly
 reagent-physical-desc-rocky = rocky
 reagent-physical-desc-lemony-fresh = lemony fresh
-reagent-physical-desc-soapy = soapy
 reagent-physical-desc-crisp = crisp
 reagent-physical-desc-citric = citric
 reagent-physical-desc-acidic = acidic
@@ -76,7 +75,6 @@ reagent-physical-desc-overpowering = overpowering
 reagent-physical-desc-sour = sour
 reagent-physical-desc-pungent = pungent
 reagent-physical-desc-clumpy = clumpy
-reagent-physical-desc-strong-smelling = strong-smelling
 reagent-physical-desc-odorless = odorless
 reagent-physical-desc-gloopy = gloopy
 reagent-physical-desc-cloudy = cloudy
diff --git a/Resources/Locale/en-US/ui/verbs.ftl b/Resources/Locale/en-US/ui/verbs.ftl
deleted file mode 100644
index 1471261dcb..0000000000
--- a/Resources/Locale/en-US/ui/verbs.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-### Loc for the various UI-related verbs
-ui-verb-toggle-open = Toggle UI
-verb-instrument-openui = Play Music