Move hardcoded strings to i10n

apps/openmw/mwgui/enchantingdialog.cpp

@@ -62,7 +62,7 @@ namespace MWGui
 
         mControllerButtons.a = "#{sSelect}";
         mControllerButtons.b = "#{sCancel}";
-        mControllerButtons.y = "Cast Type";
+        mControllerButtons.y = "#{OMWEngine:EnchantType}";
         mControllerButtons.l1 = "#{sItem}";
         mControllerButtons.r1 = "#{sSoulGem}";
     }

apps/openmw/mwgui/inventorywindow.cpp

@@ -923,7 +923,7 @@ namespace MWGui
         {
             case MWGui::GM_Companion:
             case MWGui::GM_Container:
-                mControllerButtons.a = "Put";
+                mControllerButtons.a = "#{OMWEngine:InventorySelect}";
                 mControllerButtons.b = "#{sClose}";
                 mControllerButtons.x = "#{sTakeAll}";
                 mControllerButtons.y = "";

apps/openmw/mwgui/journalwindow.cpp

@@ -219,7 +219,7 @@ namespace
             }
 
             mControllerButtons.a = "#{sSelect}";
-            mControllerButtons.x = "Quests";
+            mControllerButtons.x = "#{OMWEngine:JournalQuests}";
             mControllerButtons.y = "#{sTopics}";
 
             mQuestMode = false;
@@ -692,7 +692,7 @@ namespace
             mControllerButtons.b = mOptionsMode || mStates.size() > 1 ? "#{sBack}" : "#{sClose}";
             mControllerButtons.l1 = mOptionsMode ? "" : "#{sPrev}";
             mControllerButtons.r1 = mOptionsMode ? "" : "#{sNext}";
-            mControllerButtons.r3 = mOptionsMode && mQuestMode ? "Show All" : "";
+            mControllerButtons.r3 = mOptionsMode && mQuestMode ? "#{OMWEngine:JournalShowAll}" : "";
             return &mControllerButtons;
         }
 

apps/openmw/mwgui/recharge.cpp

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

apps/openmw/mwgui/repair.cpp

@@ -42,7 +42,7 @@ namespace MWGui
 
         mControllerButtons.a = "#{sRepair}";
         mControllerButtons.b = "#{sCancel}";
-        mControllerButtons.y = "Tool";
+        mControllerButtons.y = "#{OMWEngine:RepairTool}";
     }
 
     void Repair::onOpen()

apps/openmw/mwgui/savegamedialog.cpp

@@ -245,7 +245,7 @@ namespace MWGui
 
         mCharacterSelection->setIndexSelected(selectedIndex);
         if (selectedIndex == MyGUI::ITEM_NONE)
-            mCharacterSelection->setCaptionWithReplacing("#{OMWEngine:SelectCharacter}");
+            mCharacterSelection->setCaptionWithReplacing("#{OMWEngine:SelectCharacter}...");
 
         fillSaveList();
     }
@@ -524,7 +524,7 @@ namespace MWGui
 
     ControllerButtonStr* SaveGameDialog::getControllerButtons()
     {
-        mControllerButtons.y = mSaving ? "" : "Select Character";
+        mControllerButtons.y = mSaving ? "" : "#{OMWEngine:SelectCharacter}";
         return &mControllerButtons;
     }
 

apps/openmw/mwgui/settingswindow.cpp

@@ -462,8 +462,7 @@ namespace MWGui
 
         mControllerButtons.a = "#{sSelect}";
         mControllerButtons.b = "#{sOk}";
-        mControllerButtons.l1 = "#{sPrev} Tab";
-        mControllerButtons.r1 = "#{sNext} Tab";
+        mControllerButtons.lStick = "#{sMouse}";
     }
 
     void SettingsWindow::onTabChanged(MyGUI::TabControl* /*_sender*/, size_t /*index*/)

files/data/l10n/OMWEngine/de.yaml

@@ -58,7 +58,7 @@ MissingContentFilesListCopy: |-
    other{\n\nDrücken Sie „Kopieren“, um alle Namen in die Zwischenablage zu kopieren.}
  }
 OverwriteGameConfirmation: "Sind Sie sicher, dass Sie den Spielstand überschreiben wollen?"
-SelectCharacter: "Charakter auswählen..."
+SelectCharacter: "Charakter auswählen"
 TimePlayed: "Spielzeit"
 
 
@@ -213,3 +213,13 @@ WindowModeWindowed: "Fenster"
 WindowModeWindowedFullscreen: "Fenster in Vollbildgröße"
 # More fitting translations of "wobbly" are welcome
 WobblyShores: "Wabbelige Uferlinien"
+
+
+# Controller button names
+
+EnchantType: "Zaubertyp"
+InventorySelect: "Geben"
+JournalQuests: "Quests"
+JournalShowAll: "Alle Anzeigen"
+RechargeSelect: "Aufladen"
+RepairTool: "Werkzeug"

files/data/l10n/OMWEngine/en.yaml

@@ -58,7 +58,7 @@ MissingContentFilesListCopy: |-
     other{\n\nPress Copy to place their names to the clipboard.}
   }
 OverwriteGameConfirmation: "Are you sure you want to overwrite this saved game?"
-SelectCharacter: "Select Character..."
+SelectCharacter: "Select Character"
 TimePlayed: "Time Played"
 
 
@@ -212,3 +212,13 @@ WindowModeHint: "Hint: Windowed Fullscreen mode\nalways uses the native display
 WindowModeWindowed: "Windowed"
 WindowModeWindowedFullscreen: "Windowed Fullscreen"
 WobblyShores: "Wobbly Shores"
+
+
+# Controller button names
+
+EnchantType: "Cast Type"
+InventorySelect: "Put"
+JournalQuests: "Quests"
+JournalShowAll: "Show All"
+RechargeSelect: "Recharge"
+RepairTool: "Tool"

files/data/l10n/OMWEngine/fr.yaml

@@ -58,7 +58,7 @@ MissingContentFilesListCopy: |-
     other{\n\nCliquez sur Copier pour placer ces noms dans le presse-papier.}
   }
 OverwriteGameConfirmation: "Écraser la sauvegarde précédente ?"
-SelectCharacter: "Sélection du personnage..."
+SelectCharacter: "Sélection du personnage"
 TimePlayed: "Temps de jeu"
 
 
@@ -212,3 +212,13 @@ WindowModeHint: "Info : Le mode \"Fenêtré plein écran\" utilise toujours la r
 WindowModeWindowed: "Fenêtré"
 WindowModeWindowedFullscreen: "Fenêtré plein écran"
 WobblyShores: "Rivages vacillants"
+
+
+# Controller button names
+
+EnchantType: "Type de lancement"
+InventorySelect: "Placer"
+JournalQuests: "Quêtes"
+JournalShowAll: "Tout Afficher"
+RechargeSelect: "Recharge"
+RepairTool: "Outil"

files/data/l10n/OMWEngine/ru.yaml

@@ -58,7 +58,7 @@ MissingContentFilesListCopy: |-
     other{\n\nНажмите Скопировать, чтобы поместить их названия в буфер обмена.}
   }
 OverwriteGameConfirmation: "Вы уверены, что хотите перезаписать это сохранение?"
-SelectCharacter: "Выберите персонажа..."
+SelectCharacter: "Выберите персонажа"
 TimePlayed: "Время в игре"
 
 
@@ -212,3 +212,13 @@ WindowModeHint: "Подсказка: режим Оконный без полей
 WindowModeWindowed: "Оконный"
 WindowModeWindowedFullscreen: "Оконный без полей"
 WobblyShores: "Колеблющиеся берега"
+
+
+# Controller button names
+
+EnchantType: "Тип заклинания"
+InventorySelect: "Поместить"
+JournalQuests: "Квесты"
+JournalShowAll: "Показать все"
+RechargeSelect: "Перезарядить"
+RepairTool: "Инструмент"

files/data/l10n/OMWEngine/sv.yaml

@@ -59,7 +59,7 @@ MissingContentFilesListCopy: |-
     other{\n\nKlicka på kopiera för att placera deras namn i urklipp.}
   } 
 OverwriteGameConfirmation: "Är du säker på att du vill skriva över det här sparade spelet?"
-SelectCharacter: "Välj spelfigur..."
+SelectCharacter: "Välj spelfigur"
 
 
 # Settings menu
@@ -213,3 +213,13 @@ WindowModeHint: "Notera: Helskärm i fönsterläge\nanvänder alltid skärmens n
 WindowModeWindowed: "Fönster"
 WindowModeWindowedFullscreen: "Helskärm i fönsterläge"
 WobblyShores: "Vaggande stränder"
+
+
+# Controller button names
+
+EnchantType: "Typ"
+InventorySelect: "Sätta"
+JournalQuests: "Uppdrag"
+JournalShowAll: "Visa Alla"
+RechargeSelect: "Ladda"
+RepairTool: "Verktyg"

files/data/mygui/openmw_savegame_dialog.layout

@@ -6,7 +6,7 @@
         <Property key="Spacing" value="8"/>
 
         <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 0 24" name="SelectCharacter">
-            <Property key="Caption" value="#{OMWEngine:SelectCharacter}"/>
+            <Property key="Caption" value="#{OMWEngine:SelectCharacter}..."/>
             <UserString key="HStretch" value="true"/>
         </Widget>