(81d7f4c1c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-18 17:44:13 +03:00
parent ada4e17dfe
commit 6332cfd55f
17 changed files with 126 additions and 123 deletions
@@ -543,7 +543,10 @@ namespace Barotrauma
                    //equipped item that can't be put in the inventory, use delayed dropping
                    if (quickUseAction == QuickUseAction.Drop)
                    {
-                        slots[i].QuickUseButtonToolTip = "Hold to unequip";
+                        slots[i].QuickUseButtonToolTip =
+                            TextManager.Get("QuickUseAction.HoldToUnequip", returnNull: true) ??
+                            (GameMain.Config.Language == "English" ?  "Hold to unequip" : TextManager.Get("QuickUseAction.Unequip"));
+
                        if (PlayerInput.LeftButtonHeld())
                        {
                            slots[i].QuickUseTimer = Math.Max(0.1f, slots[i].QuickUseTimer + deltaTime);