Merge branch 'master' into air-alarm-fixup

Resources/Locale/en-US/access/components/id-card-console-component.ftl

@@ -5,7 +5,7 @@ id-card-console-window-save-button = Save
 id-card-console-window-job-title-label = Job title:
 id-card-console-window-eject-button = Eject
 id-card-console-window-insert-button = Insert
-id-card-console-window-job-selection-label = Job presets:
+id-card-console-window-job-selection-label = Job presets (sets department and job icon):
 
 access-id-card-console-component-no-hands-error = You have no hands.
 id-card-console-privileged-id = Privileged ID

Resources/Locale/en-US/administration/smites.ftl

@@ -11,6 +11,7 @@ admin-smite-remove-hands-other = {CAPITALIZE($name)}'s hands fall off!
 admin-smite-turned-ash-other = {CAPITALISE($name)} turns into a pile of ash!
 admin-smite-stomach-removal-self = Your stomach feels hollow...
 admin-smite-run-walk-swap-prompt = You have to press shift to run!
+admin-smite-super-speed-prompt = You move at mach 0.8!
 admin-smite-lung-removal-self = You can't breath!
 
 
@@ -47,6 +48,7 @@ admin-smite-maid-description = Forcibly converts them into a janitorial cat maid
 admin-smite-zoom-in-description = Zooms in their view so that they can no longer see their surroundings.
 admin-smite-flip-eye-description = Flips their view, effectively reversing their controls and making the game annoying to play.
 admin-smite-run-walk-swap-description = Swaps running and walking, forcing them to hold shift to move fast.
+admin-smite-super-speed-description = Makes them really fast, causing them to turn into gibs when hitting a wall.
 admin-smite-stomach-removal-description = Removes their stomach, rendering them unable to eat.
 admin-smite-speak-backwards-description = Forces them to speak backwards, so they can't call for help.
 admin-smite-lung-removal-description = Removes their lungs, drowning them.

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

@@ -1,4 +1,4 @@
-comp-storage-no-item-size = None
+comp-storage-no-item-size = N/A
 comp-storage-cant-insert = Can't insert.
 comp-storage-insufficient-capacity = Insufficient capacity.
 comp-storage-invalid-container = Invalid container for this item.

Resources/Locale/en-US/connection-messages.ftl

@@ -3,9 +3,15 @@ whitelist-not-whitelisted-rp = You are not whitelisted. To become whitelisted, v
 
 command-whitelistadd-description = Adds the player with the given username to the server whitelist.
 command-whitelistadd-help = whitelistadd <username>
+command-whitelistadd-existing = {$username} is already on the whitelist!
+command-whitelistadd-added = {$username} added to the whitelist
+command-whitelistadd-not-found = Unable to find '{$username}'
 
 command-whitelistremove-description = Removes the player with the given username from the server whitelist.
 command-whitelistremove-help = whitelistremove <username>
+command-whitelistremove-existing = {$username} is not on the whitelist!
+command-whitelistremove-removed = {$username} removed from the whitelist
+command-whitelistremove-not-found = Unable to find '{$username}'
 
 command-kicknonwhitelisted-description = Kicks all non-whitelisted players from the server.
 command-kicknonwhitelisted-help = kicknonwhitelisted

Resources/Locale/en-US/construction/construction-categories.ftl

@@ -1,4 +1,5 @@
-construction-category-furniture = Furniture
+construction-category-all = All
+construction-category-furniture = Furniture
 construction-category-storage = Storage
 construction-category-tools = Tools
 construction-category-materials = Materials

Resources/Locale/en-US/construction/ui/construction-menu-presenter.ftl

@@ -1,5 +1,4 @@
-construction-presenter-category-all = All
-construction-presenter-to-craft = To craft this item, you need to:
+construction-presenter-to-craft = To craft this item, you need to:
 construction-presenter-to-build = To build this, first you need to:
 
 construction-presenter-step-wrapper = {$step-number}. {$text}

Resources/Locale/en-US/escape-menu/ui/options-menu.ftl

@@ -169,4 +169,8 @@ ui-options-function-shuttle-brake = Brake
 
 ## Network menu
 
-ui-options-net-interp-ratio = Network Smoothing
+ui-options-net-interp-ratio = State buffer size
+ui-options-net-interp-ratio-tooltip = Increasing this will generally make the game
+                                      more resistant to packet-loss, however in doing
+                                      so it effectively adds slightly more latency and
+                                      requires the client to predict more future ticks.

Resources/Locale/en-US/guardian/guardian.ftl

@@ -6,7 +6,8 @@ guardian-already-present-invalid-creation = You are NOT re-living that haunting
 guardian-no-actions-invalid-creation = You don't have the ability to host a guardian!
 guardian-activator-empty-invalid-creation = The injector is spent.
 guardian-activator-empty-examine = [color=#ba1919]The injector is spent.[/color]
-guardian-activator-invalid-target = Only humans can be injected! # Change this once other species can inject it?
+# TODO: Change this once other species can inject it?
+guardian-activator-invalid-target = Only humans can be injected!
 guardian-no-soul = Your guardian has no soul.
 guardian-available = Your guardian now has a soul.
 

Resources/Locale/en-US/job/role-timers.ftl

@@ -1,8 +1,8 @@
-role-timer-department-insufficient = Require {TOSTRING($time, "0")} more minutes in {$department} department.
-role-timer-department-too-high = Requires {TOSTRING($time, "0")} fewer minutes in {$department} department. (Are you trying to play a trainee role?)
-role-timer-overall-insufficient = Require {TOSTRING($time, "0")} more minutes of playtime.
-role-timer-overall-too-high = Require {TOSTRING($time, "0")} fewer minutes of playtime. (Are you trying to play a trainee role?)
-role-timer-role-insufficient = Require {TOSTRING($time, "0")} more minutes with {$job} for this role.
-role-timer-role-too-high = Require {TOSTRING($time, "0")} fewer minutes with {$job} for this role. (Are you trying to play a trainee role?)
+role-timer-department-insufficient = You require {TOSTRING($time, "0")} more minutes in {$department} department to play this role.
+role-timer-department-too-high = You require {TOSTRING($time, "0")} fewer minutes in {$department} department to play this role. (Are you trying to play a trainee role?)
+role-timer-overall-insufficient = You require {TOSTRING($time, "0")} more minutes of playtime to play this role.
+role-timer-overall-too-high = You require {TOSTRING($time, "0")} fewer minutes of playtime to play this role. (Are you trying to play a trainee role?)
+role-timer-role-insufficient = You require {TOSTRING($time, "0")} more minutes with {$job} to play this role.
+role-timer-role-too-high = You require {TOSTRING($time, "0")} fewer minutes with {$job} to play this role. (Are you trying to play a trainee role?)
 
 role-timer-locked = Locked (hover for details)

Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl

@@ -1,16 +1,16 @@
-ent-WeldingFuelTank = Fuel tank
+ent-WeldingFuelTank = fuel tank
     .desc = A fuel tank. It's used to store high amounts of fuel.
 
 ent-WeldingFuelTankFull = { ent-WeldingFuelTank }
     .desc = { ent-WeldingFuelTank.desc }
 
-ent-WaterTank = Water tank
+ent-WaterTank = water tank
     .desc = A water tank. It's used to store high amounts of water.
 
 ent-WaterTankFull = { ent-WaterTank }
     .desc = { ent-WaterTank.desc }
 
-ent-WaterCooler = Water cooler
+ent-WaterCooler = water cooler
     .desc = Seems like a good place to stand and waste time.
 
 ent-WaterTankHighCapacity = High-capacity water tank

Resources/Locale/en-US/reagents/meta/elements.ftl

@@ -50,7 +50,7 @@ reagent-name-sulfur = sulfur
 reagent-desc-sulfur = A yellow, crystalline solid.
 
 reagent-name-sodium = sodium
-reagent-desc-sodium = A silvery-white alkali metal. Highly reactive in its pure form. #thanks visne <3
+reagent-desc-sodium = A silvery-white alkali metal. Highly reactive in its pure form.
 
 reagent-name-uranium = uranium
 reagent-desc-uranium = A grey metallic chemical element in the actinide series, weakly radioactive.

Resources/Locale/en-US/store/currency.ftl

@@ -0,0 +1,14 @@
+store-currency-inserted = {CAPITALIZE(THE($used))} is inserted into the {THE($target)}.
+
+store-currency-free = Free
+store-currency-balance-display-debugdollar = Debug Dollar: {$amount}
+store-currency-price-display-debugdollar = {$amount ->
+    [one] {$amount} Debug Dollar
+    *[other] {$amount} Debug Dollars
+}
+
+store-currency-balance-display-telecrystal = TC: {$amount}
+store-currency-price-display-telecrystal = {$amount} TC
+
+store-currency-balance-display-stolen-essence = Stolen Essence: {$amount}
+store-currency-price-display-stolen-essence = {$amount} Stolen Essence

Resources/Locale/en-US/store/store.ftl

@@ -0,0 +1,4 @@
+store-ui-default-title = Store
+store-ui-default-withdraw-text = Withdraw
+
+store-withdraw-button-ui = Withdraw {$currency}

Resources/Locale/en-US/tools/components/welder-component.ftl

@@ -1,7 +1,7 @@
 welder-component-welder-not-lit-message = The welder is turned off!
 welder-component-cannot-weld-message = The welder does not have enough fuel for that!
 welder-component-no-fuel-message = The welder has no fuel left!
-welder-component-no-fuel-in-tank = {$owner} is empty
+welder-component-no-fuel-in-tank = The {$owner} is empty.
 welder-component-on-examine-welder-lit-message = [color=orange]Lit[/color]
 welder-component-on-examine-welder-not-lit-message = Not lit
 welder-component-on-examine-detailed-message = Fuel: [color={$colorName}]{$fuelLeft}/{$fuelCapacity}[/color]. {$status}
@@ -10,3 +10,4 @@ welder-component-suicide-lit-message = You weld your every orifice closed!
 welder-component-suicide-unlit-others-message = {$victim} bashes themselves with the unlit welding torch!
 welder-component-suicide-unlit-message = You bash yourself with the unlit welding torch!
 welder-component-after-interact-refueled-message = Refueled!
+welder-component-already-full = The welder is already full.