Use the localized strings from Interface l10n module where possible

apps/openmw/mwgui/alchemywindow.cpp

@@ -95,7 +95,7 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             mControllerButtons.a = "#{sSelect}";
-            mControllerButtons.b = "#{sCancel}";
+            mControllerButtons.b = "#{Interface:Cancel}";
             mControllerButtons.x = "#{sCreate}";
             mControllerButtons.y = "#{sMagicEffects}";
             mControllerButtons.r3 = "#{sInfo}";

apps/openmw/mwgui/bookwindow.cpp

@@ -68,7 +68,7 @@ namespace MWGui
 
         mControllerButtons.l1 = "#{sPrev}";
         mControllerButtons.r1 = "#{sNext}";
-        mControllerButtons.b = "#{sClose}";
+        mControllerButtons.b = "#{Interface:Close}";
 
         center();
     }

apps/openmw/mwgui/class.cpp

@@ -885,7 +885,7 @@ namespace MWGui
         cancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSpecializationDialog::onCancelClicked);
 
         mControllerButtons.a = "#{sSelect}";
-        mControllerButtons.b = "#{sCancel}";
+        mControllerButtons.b = "#{Interface:Cancel}";
     }
 
     SelectSpecializationDialog::~SelectSpecializationDialog() {}
@@ -967,7 +967,7 @@ namespace MWGui
                 mAttributeButtons[0]->setStateSelected(true);
 
             mControllerButtons.a = "#{sSelect}";
-            mControllerButtons.b = "#{sCancel}";
+            mControllerButtons.b = "#{Interface:Cancel}";
         }
     }
 
@@ -1067,7 +1067,7 @@ namespace MWGui
                 mSkillButtons[0]->setStateSelected(true);
 
             mControllerButtons.a = "#{sSelect}";
-            mControllerButtons.b = "#{sCancel}";
+            mControllerButtons.b = "#{Interface:Cancel}";
         }
     }
 
@@ -1156,7 +1156,7 @@ namespace MWGui
         // Make sure the edit box has focus
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mTextEdit);
 
-        mControllerButtons.a = "#{sOk}";
+        mControllerButtons.a = "#{Interface:OK}";
     }
 
     DescriptionDialog::~DescriptionDialog() {}

apps/openmw/mwgui/companionwindow.cpp

@@ -65,7 +65,7 @@ namespace MWGui
         setCoord(200, 0, 600, 300);
 
         mControllerButtons.a = "#{sTake}";
-        mControllerButtons.b = "#{sClose}";
+        mControllerButtons.b = "#{Interface:Close}";
         mControllerButtons.r3 = "#{sInfo}";
         mControllerButtons.l2 = "#{sInventory}";
     }

apps/openmw/mwgui/confirmationdialog.cpp

@@ -23,8 +23,8 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             mDisableGamepadCursor = true;
-            mControllerButtons.a = "#{sOk}";
+            mControllerButtons.a = "#{Interface:OK}";
-            mControllerButtons.b = "#{sCancel}";
+            mControllerButtons.b = "#{Interface:Cancel}";
         }
     }
 

apps/openmw/mwgui/container.cpp

@@ -60,7 +60,7 @@ namespace MWGui
         setCoord(200, 0, 600, 300);
 
         mControllerButtons.a = "#{sTake}";
-        mControllerButtons.b = "#{sClose}";
+        mControllerButtons.b = "#{Interface:Close}";
         mControllerButtons.x = "#{sTakeAll}";
         mControllerButtons.r3 = "#{sInfo}";
         mControllerButtons.l2 = "#{sInventory}";

apps/openmw/mwgui/countdialog.cpp

@@ -28,8 +28,8 @@ namespace MWGui
         // make sure we read the enter key being pressed to accept multiple items
         mItemEdit->eventEditSelectAccept += MyGUI::newDelegate(this, &CountDialog::onEnterKeyPressed);
 
-        mControllerButtons.a = "#{sOk}";
+        mControllerButtons.a = "#{Interface:OK}";
-        mControllerButtons.b = "#{sCancel}";
+        mControllerButtons.b = "#{Interface:Cancel}";
     }
 
     void CountDialog::openCountDialog(const std::string& item, const std::string& message, const int maxCount)

apps/openmw/mwgui/dialogue.cpp

@@ -91,7 +91,7 @@ namespace MWGui
 
         mDisableGamepadCursor = Settings::gui().mControllerMenus;
         mControllerButtons.a = "#{sSelect}";
-        mControllerButtons.b = "#{sCancel}";
+        mControllerButtons.b = "#{Interface:Cancel}";
     }
 
     void PersuasionDialog::adjustAction(MyGUI::Widget* action, int& totalHeight)

apps/openmw/mwgui/enchantingdialog.cpp

@@ -61,7 +61,7 @@ namespace MWGui
         mName->eventEditSelectAccept += MyGUI::newDelegate(this, &EnchantingDialog::onAccept);
 
         mControllerButtons.a = "#{sSelect}";
-        mControllerButtons.b = "#{sCancel}";
+        mControllerButtons.b = "#{Interface:Cancel}";
         mControllerButtons.y = "#{OMWEngine:EnchantType}";
         mControllerButtons.l1 = "#{sItem}";
         mControllerButtons.r1 = "#{sSoulGem}";

apps/openmw/mwgui/inventorywindow.cpp

@@ -983,21 +983,21 @@ namespace MWGui
         {
             case MWGui::GM_Companion:
                 mControllerButtons.a = "#{OMWEngine:InventorySelect}";
-                mControllerButtons.b = "#{sClose}";
+                mControllerButtons.b = "#{Interface:Close}";
                 mControllerButtons.x.clear();
                 mControllerButtons.y.clear();
                 mControllerButtons.r2 = "#{sCompanionShare}";
                 break;
             case MWGui::GM_Container:
                 mControllerButtons.a = "#{OMWEngine:InventorySelect}";
-                mControllerButtons.b = "#{sClose}";
+                mControllerButtons.b = "#{Interface:Close}";
                 mControllerButtons.x = "#{sTakeAll}";
                 mControllerButtons.y.clear();
                 mControllerButtons.r2 = "#{sContainer}";
                 break;
             case MWGui::GM_Barter:
                 mControllerButtons.a = "#{sSell}";
-                mControllerButtons.b = "#{sCancel}";
+                mControllerButtons.b = "#{Interface:Cancel}";
                 mControllerButtons.x = "#{sOffer}";
                 mControllerButtons.y.clear();
                 mControllerButtons.r2 = "#{sBarter}";

apps/openmw/mwgui/itemselection.cpp

@@ -30,7 +30,7 @@ namespace MWGui
         center();
 
         mControllerButtons.a = "#{sSelect}";
-        mControllerButtons.b = "#{sCancel}";
+        mControllerButtons.b = "#{Interface:Cancel}";
         mControllerButtons.r3 = "#{sInfo}";
     }
 

apps/openmw/mwgui/journalwindow.cpp

@@ -698,7 +698,7 @@ namespace
 
         MWGui::ControllerButtonStr* getControllerButtons() override
         {
-            mControllerButtons.b = mOptionsMode || mStates.size() > 1 ? "#{sBack}" : "#{sClose}";
+            mControllerButtons.b = mOptionsMode || mStates.size() > 1 ? "#{sBack}" : "#{Interface:Close}";
             mControllerButtons.l1 = mOptionsMode ? "" : "#{sPrev}";
             mControllerButtons.r1 = mOptionsMode ? "" : "#{sNext}";
             mControllerButtons.r3 = mOptionsMode && mQuestMode ? "#{OMWEngine:JournalShowAll}" : "";

apps/openmw/mwgui/mapwindow.cpp

@@ -1471,8 +1471,8 @@ namespace MWGui
 
         if (Settings::gui().mControllerMenus)
         {
-            mControllerButtons.a = "#{sOk}";
+            mControllerButtons.a = "#{Interface:OK}";
-            mControllerButtons.b = "#{sCancel}";
+            mControllerButtons.b = "#{Interface:Cancel}";
         }
     }
 

apps/openmw/mwgui/merchantrepair.cpp

@@ -33,7 +33,7 @@ namespace MWGui
         {
             mDisableGamepadCursor = true;
             mControllerButtons.a = "#{sRepair}";
-            mControllerButtons.b = "#{sCancel}";
+            mControllerButtons.b = "#{Interface:Cancel}";
         }
     }
 

apps/openmw/mwgui/messagebox.cpp

@@ -285,7 +285,7 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             mDisableGamepadCursor = true;
-            mControllerButtons.a = "#{sOk}";
+            mControllerButtons.a = "#{Interface:OK}";
 
             // If we have more than one button, we need to set the focus to the first one.
             if (mButtons.size() > 1)

apps/openmw/mwgui/quickkeysmenu.cpp

@@ -62,7 +62,7 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             mControllerButtons.a = "#{sSelect}";
-            mControllerButtons.b = "#{sOK}";
+            mControllerButtons.b = "#{Interface:OK}";
         }
     }
 
@@ -537,7 +537,7 @@ namespace MWGui
             mDisableGamepadCursor = true;
             mItemButton->setStateSelected(true);
             mControllerButtons.a = "#{sSelect}";
-            mControllerButtons.b = "#{sCancel}";
+            mControllerButtons.b = "#{Interface:Cancel}";
         }
 
         center();
@@ -683,7 +683,7 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             mControllerButtons.a = "#{sSelect}";
-            mControllerButtons.b = "#{sCancel}";
+            mControllerButtons.b = "#{Interface:Cancel}";
         }
 
         center();

apps/openmw/mwgui/recharge.cpp

@@ -41,7 +41,7 @@ namespace MWGui
         mGemIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Recharge::onSelectItem);
 
         mControllerButtons.a = "#{OMWEngine:RechargeSelect}";
-        mControllerButtons.b = "#{sCancel}";
+        mControllerButtons.b = "#{Interface:Cancel}";
         mControllerButtons.y = "#{sSoulGem}";
     }
 

apps/openmw/mwgui/repair.cpp

@@ -41,7 +41,7 @@ namespace MWGui
         mToolIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Repair::onSelectItem);
 
         mControllerButtons.a = "#{sRepair}";
-        mControllerButtons.b = "#{sCancel}";
+        mControllerButtons.b = "#{Interface:Cancel}";
         mControllerButtons.y = "#{OMWEngine:RepairTool}";
     }
 

apps/openmw/mwgui/savegamedialog.cpp

@@ -68,7 +68,7 @@ namespace MWGui
         mDeleteButton->setNeedKeyFocus(false);
 
         mControllerButtons.a = "#{sSelect}";
-        mControllerButtons.b = "#{sCancel}";
+        mControllerButtons.b = "#{Interface:Cancel}";
     }
 
     void SaveGameDialog::onSlotActivated(MyGUI::ListBox* sender, size_t pos)

apps/openmw/mwgui/scrollwindow.cpp

@@ -40,7 +40,7 @@ namespace MWGui
         mTakeButton->eventKeyButtonPressed += MyGUI::newDelegate(this, &ScrollWindow::onKeyButtonPressed);
 
         mControllerScrollWidget = mTextView;
-        mControllerButtons.b = "#{sClose}";
+        mControllerButtons.b = "#{Interface:Close}";
         mControllerButtons.dpad = "#{sScrolldown}";
 
         center();

apps/openmw/mwgui/settingswindow.cpp

@@ -461,7 +461,7 @@ namespace MWGui
         }
 
         mControllerButtons.a = "#{sSelect}";
-        mControllerButtons.b = "#{sOk}";
+        mControllerButtons.b = "#{Interface:OK}";
         mControllerButtons.lStick = "#{sMouse}";
     }
 

apps/openmw/mwgui/spellbuyingwindow.cpp

@@ -39,7 +39,7 @@ namespace MWGui
         {
             mDisableGamepadCursor = true;
             mControllerButtons.a = "#{sBuy}";
-            mControllerButtons.b = "#{sCancel}";
+            mControllerButtons.b = "#{Interface:Cancel}";
             mControllerButtons.r3 = "#{sInfo}";
         }
     }

apps/openmw/mwgui/spellcreationdialog.cpp

@@ -101,8 +101,8 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             mControllerButtons.a = "#{sSelect}";
-            mControllerButtons.b = "#{sCancel}";
+            mControllerButtons.b = "#{Interface:Cancel}";
-            mControllerButtons.x = "#{sOk}";
+            mControllerButtons.x = "#{Interface:OK}";
         }
     }
 
@@ -599,7 +599,7 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             mControllerButtons.a = "#{sSelect}";
-            mControllerButtons.b = "#{sCancel}";
+            mControllerButtons.b = "#{Interface:Cancel}";
             mControllerButtons.x = "#{sBuy}";
             mControllerButtons.r3 = "#{sInfo}";
         }

apps/openmw/mwgui/textinput.cpp

@@ -26,7 +26,7 @@ namespace MWGui
         // Make sure the edit box has focus
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mTextEdit);
 
-        mControllerButtons.a = "#{sOk}";
+        mControllerButtons.a = "#{Interface:OK}";
     }
 
     void TextInputDialog::setNextButtonShow(bool shown)

apps/openmw/mwgui/tradewindow.cpp

@@ -189,7 +189,7 @@ namespace MWGui
                 SDL_CONTROLLER_BUTTON_RIGHTSHOULDER));
 
             mControllerButtons.a = "#{sBuy}";
-            mControllerButtons.b = "#{sCancel}";
+            mControllerButtons.b = "#{Interface:Cancel}";
             mControllerButtons.x = "#{sOffer}";
             mControllerButtons.r3 = "#{sInfo}";
             mControllerButtons.l2 = "#{sInventory}";

apps/openmw/mwgui/trainingwindow.cpp

@@ -41,7 +41,7 @@ namespace MWGui
         {
             mDisableGamepadCursor = true;
             mControllerButtons.a = "#{sBuy}";
-            mControllerButtons.b = "#{sCancel}";
+            mControllerButtons.b = "#{Interface:Cancel}";
         }
     }
 

apps/openmw/mwgui/travelwindow.cpp

@@ -42,7 +42,7 @@ namespace MWGui
         {
             mDisableGamepadCursor = true;
             mControllerButtons.a = "#{sTravel}";
-            mControllerButtons.b = "#{sCancel}";
+            mControllerButtons.b = "#{Interface:Cancel}";
         }
     }
 

apps/openmw/mwgui/waitdialog.cpp

@@ -80,7 +80,7 @@ namespace MWGui
         mTimeAdvancer.eventInterrupted += MyGUI::newDelegate(this, &WaitDialog::onWaitingInterrupted);
         mTimeAdvancer.eventFinished += MyGUI::newDelegate(this, &WaitDialog::onWaitingFinished);
 
-        mControllerButtons.b = "#{sCancel}";
+        mControllerButtons.b = "#{Interface:Cancel}";
         mDisableGamepadCursor = Settings::gui().mControllerMenus;
     }