Merge branch 'notnpcdating' into 'master'

Translate gamepad actions, part 4

See merge request OpenMW/openmw!4922

apps/openmw/mwgui/inventorywindow.cpp

@@ -968,25 +968,25 @@ namespace MWGui
                 mControllerButtons.mA = "#{OMWEngine:InventorySelect}";
                 mControllerButtons.mB = "#{Interface:Close}";
                 mControllerButtons.mX.clear();
-                mControllerButtons.mR2 = "#{sCompanionShare}";
+                mControllerButtons.mR2 = "#{Interface:Share}";
                 break;
             case MWGui::GM_Container:
                 mControllerButtons.mA = "#{OMWEngine:InventorySelect}";
                 mControllerButtons.mB = "#{Interface:Close}";
                 mControllerButtons.mX = "#{Interface:TakeAll}";
-                mControllerButtons.mR2 = "#{sContainer}";
+                mControllerButtons.mR2 = "#{Interface:Container}";
                 break;
             case MWGui::GM_Barter:
-                mControllerButtons.mA = "#{sSell}";
+                mControllerButtons.mA = "#{Interface:Sell}";
                 mControllerButtons.mB = "#{Interface:Cancel}";
                 mControllerButtons.mX = "#{Interface:Offer}";
-                mControllerButtons.mR2 = "#{sBarter}";
+                mControllerButtons.mR2 = "#{Interface:Barter}";
                 break;
             case MWGui::GM_Inventory:
             default:
-                mControllerButtons.mA = "#{sEquip}";
+                mControllerButtons.mA = "#{Interface:Equip}";
                 mControllerButtons.mB = "#{Interface:Back}";
-                mControllerButtons.mX = "#{sDrop}";
+                mControllerButtons.mX = "#{Interface:Drop}";
                 mControllerButtons.mR2.clear();
                 break;
         }

apps/openmw/mwgui/mapwindow.cpp

@@ -835,9 +835,10 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             mControllerButtons.mB = "#{Interface:Back}";
-            mControllerButtons.mX = global ? "#{sLocal}" : "#{sWorld}";
-            mControllerButtons.mY = "#{sCenter}";
-            mControllerButtons.mDpad = Settings::map().mAllowZooming ? "" : "#{sMove}";
+            mControllerButtons.mX = global ? "#{Interface:Local}" : "#{Interface:World}";
+            mControllerButtons.mY = "#{Interface:Center}";
+            if (!Settings::map().mAllowZooming)
+                mControllerButtons.mDpad = "#{Interface:Move}";
         }
     }
 
@@ -1228,7 +1229,7 @@ namespace MWGui
         mLocalMap->setVisible(!global);
 
         mButton->setCaptionWithReplacing(global ? "#{sLocal}" : "#{sWorld}");
-        mControllerButtons.mX = global ? "#{sLocal}" : "#{sWorld}";
+        mControllerButtons.mX = global ? "#{Interface:Local}" : "#{Interface:World}";
         MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
     }
 
@@ -1532,7 +1533,10 @@ namespace MWGui
 
     ControllerButtons* EditNoteDialog::getControllerButtons()
     {
-        mControllerButtons.mX = getDeleteButtonShown() ? "#{sDelete}" : "";
+        if (getDeleteButtonShown())
+            mControllerButtons.mX = "#{Interface:Delete}";
+        else
+            mControllerButtons.mX.clear();
         return &mControllerButtons;
     }
 

apps/openmw/mwgui/race.cpp

@@ -111,9 +111,9 @@ namespace MWGui
             mControllerButtons.mLStick = "#{Interface:Mouse}";
             mControllerButtons.mA = "#{Interface:Select}";
             mControllerButtons.mB = "#{Interface:Back}";
-            mControllerButtons.mY = "#{sSex}";
-            mControllerButtons.mL1 = "#{sHair}";
-            mControllerButtons.mR1 = "#{sFace}";
+            mControllerButtons.mY = "#{Interface:Sex}";
+            mControllerButtons.mL1 = "#{Interface:Hair}";
+            mControllerButtons.mR1 = "#{Interface:Face}";
         }
 
         updateRaces();

files/data-mw/l10n/Interface/gmst.yaml

@@ -1,17 +1,26 @@
 Ask: "sAsk"
 Back: "sBack"
+Barter: "sBarter"
 Buy: "sBuy"
 Cancel: "sCancel"
+Center: "sCenter" # This has a trailing space in Russian and French games
 Close: "sClose"
+Container: "sContainer" # This has a trailing space in the Russian game
 Create: "sCreate"
+Delete: "sDelete"
 DisposeOfCorpse: "sDisposeofCorpse"
 Done: "sDone"
+Drop: "sDrop" # This has a trailing space in the Russian game
+Equip: "sEquip" # This has a trailing space in the Russian game
+Face: "sFace"
 Goodbye: "sGoodbye"
+Hair: "sHair"
 Info: "sInfo"
 Inventory: "sInventory"
 Item: "sItem"
+Local: "sLocal"
 MagicEffects: "sMagicEffects"
-# NB: sMouse exists but it is not localized in the Russian game and should not be used to translate Mouse
+# Mouse/Move: sMouse and sMove exist but they are not localised in the Russian game and should not be used
 Next: "sNext"
 No: "sNo"
 None: "sNone"
@@ -25,6 +34,9 @@ Rest: "sRest"
 ScrollDown: "sScrolldown"
 ScrollUp: "sScrollup"
 Select: "sSelect"
+Sell: "sSell"
+Sex: "sSex"
+Share: "sCompanionShare"
 Soul: "sSoulGem"
 Take: "sTake"
 TakeAll: "sTakeAll"
@@ -32,4 +44,5 @@ Topics: "sTopics"
 Travel: "sTravel"
 UntilHealed: "sUntilHealed"
 Wait: "sWait"
+World: "sWorld"
 Yes: "sYes"

files/data/l10n/Interface/de.yaml

@@ -1,12 +1,17 @@
 Ask: "Fragen"
 Back: "Zurück"
+Barter: "Handeln"
 Buy: "Kaufen"
 Cancel: "Abbruch"
+Center: "Zentrieren"
 Close: "Schließen"
+Container: "Behälter"
 Copy: "Kopieren"
 Create: "Herstellen"
+Delete: "Entfernen"
 DisposeOfCorpse: "Leiche beseitigen"
 Done: "Fertig"
+Drop: "Ablegen"
 DurationDay: "{days} d "
 DurationHour: "{hours} h "
 DurationMinute: "{minutes} min "
@@ -26,12 +31,17 @@ DurationYear: |-
    one{{years} Jahr }
    other{{years} Jahre }
  }
+Equip: "Verwenden"
+Face: "Gesicht"
 Goodbye: "Lebt wohl!"
+Hair: "Haar"
 Info: "Info"
 Inventory: "Inventar"
 Item: "Gegenstand"
+Local: "Lokal"
 MagicEffects: "Magischer Effekt"
 Mouse: "Maus"
+Move: "Bewegen"
 Next: "Weiter"
 No: "Nein"
 # This one is a bit tricky since it can be translated to
@@ -51,6 +61,9 @@ Rest: "Rasten"
 ScrollDown: "Nach unten scrollen"
 ScrollUp: "Nach oben scrollen"
 Select: "Auswählen"
+Sell: "Verkaufen"
+Sex: "Geschlecht"
+Share: "Teilen"
 Soul: "Seele"
 Take: "Nehmen"
 TakeAll: "Alles nehmen"
@@ -58,4 +71,5 @@ Topics: "Themen"
 Travel: "Reisen"
 UntilHealed: "Bis geheilt"
 Wait: "Warten"
+World: "Welt"
 Yes: "Ja"

files/data/l10n/Interface/en.yaml

@@ -1,12 +1,17 @@
 Ask: "Ask"
 Back: "Back"
+Barter: "Barter"
 Buy: "Buy"
 Cancel: "Cancel"
+Center: "Center"
 Close: "Close"
+Container: "Container"
 Copy: "Copy"
 Create: "Create"
+Delete: "Delete"
 DisposeOfCorpse: "Dispose of Corpse"
 Done: "Done"
+Drop: "Drop"
 DurationDay: "{days} d "
 DurationHour: "{hours} h "
 DurationMinute: "{minutes} min "
@@ -21,12 +26,17 @@ DurationYear: |-
     one{{years} yr }
     other{{years} yrs }
   }
+Equip: "Equip"
+Face: "Face"
 Goodbye: "Goodbye"
+Hair: "Hair"
 Info: "Info"
 Inventory: "Inventory"
 Item: "Item"
+Local: "Local"
 MagicEffects: "Magic Effects"
 Mouse: "Mouse"
+Move: "Move"
 Next: "Next"
 No: "No"
 None: "None"
@@ -42,6 +52,9 @@ Rest: "Rest"
 ScrollDown: "Scroll Down"
 ScrollUp: "Scroll Up"
 Select: "Select"
+Sell: "Sell"
+Sex: "Sex"
+Share: "Share"
 Soul: "Soul"
 Take: "Take"
 TakeAll: "Take All"
@@ -49,4 +62,5 @@ Topics: "Topics"
 Travel: "Travel"
 UntilHealed: "Until Healed"
 Wait: "Wait"
+World: "World"
 Yes: "Yes"

files/data/l10n/Interface/fr.yaml

@@ -1,12 +1,17 @@
 Ask: "Demander"
 Back: "En arrière"
+Barter: "Marchander"
 Buy: "Acheter"
 Cancel: "Annuler"
+Center: "Centrer"
 Close: "Fermer"
+Container: "Contenant"
 Copy: "Copier"
 Create: "Créer"
 DisposeOfCorpse: "Supprimer cadavre"
+Delete: "Effacer"
 Done: "Fait"
+Drop: "Lâcher"
 DurationDay: |-
   {days, plural,
     one{{days} jour }
@@ -21,12 +26,17 @@ DurationYear: |-
     one{{years} an }
     other{{years} ans }
   }
+Equip: "S'équiper"
+Face: "Face"
 Goodbye: "Au revoir"
+Hair: "Cheveux"
 Info: "Info"
 Inventory: "Inventaire"
 Item: "Objet"
+Local: "Local"
 MagicEffects: "Effets magiques"
 Mouse: "Souris"
+Move: "Déplacement"
 Next: "Suivant"
 No: "Non"
 None: "Aucun"
@@ -42,6 +52,9 @@ Rest: "Repos"
 ScrollDown: "Défilement bas"
 ScrollUp: "Défilement haut"
 Select: "Sélectionner"
+Sell: "Vendre"
+Sex: "Sexe"
+Share: "Répartir"
 Soul: "Ame"
 Take: "Prendre"
 TakeAll: "Tout prendre"
@@ -49,4 +62,5 @@ Topics: "Sujets"
 Travel: "Voyager"
 UntilHealed: "Récup. totale"
 Wait: "Attendre"
+World: "Monde"
 Yes: "Oui"

files/data/l10n/Interface/pl.yaml

@@ -1,12 +1,17 @@
 Ask: "Zapytaj"
 Back: "Wstecz"
+Barter: "Handel"
 Buy: "Kup"
 Cancel: "Anuluj"
+Center: "Centruj"
 Close: "Zamknij"
+Container: "Pojemnik"
 Copy: "Kopiuj"
 Create: "Utwórz"
+Delete: "Usuń"
 DisposeOfCorpse: "Usuń zwłoki"
 Done: "Koniec"
+Drop: "Upuść"
 DurationDay: "{days} d. "
 DurationHour: "{hours} godz. "
 DurationMinute: "{minutes} min "
@@ -19,12 +24,17 @@ DurationYear: |-
     few{{years} lata }
     many{{years} lat }
   }
+Equip: "Załóż"
+Face: "Twarz"
 Goodbye: "Do widzenia"
+Hair: "Włosy"
 Info: "Info"
 Inventory: "Ekwipunek"
 Item: "Przedmiot"
+Local: "Okolica"
 MagicEffects: "Magiczne efekty"
 Mouse: "Mysz"
+Move: "Przenieś"
 Next: "Nast."
 No: "Nie"
 None: "Brak"
@@ -40,6 +50,9 @@ Rest: "Odpocznij"
 ScrollDown: "Przewiń w dół"
 ScrollUp: "Przewiń w górę"
 Select: "Wybierz"
+Sell: "Sprzedaj"
+Sex: "Płeć"
+Share: "Podział"
 Soul: "Dusza"
 Take: "Weź"
 TakeAll: "Weź wszystko"
@@ -47,4 +60,5 @@ Topics: "Tematy"
 Travel: "Podróż"
 UntilHealed: "Do wyzdr."
 Wait: "Czekaj"
+World: "Świat"
 Yes: "Tak"

files/data/l10n/Interface/ru.yaml

@@ -1,12 +1,17 @@
 Ask: "Спросить"
 Back: "Назад"
+Barter: "Торговать"
 Buy: "Купить"
 Cancel: "Отмена"
+Center: "Центр"
 Close: "Закрыть"
+Container: "Контейнер"
 Copy: "Скопировать"
 Create: "Создать"
+Delete: "Удалить"
 DisposeOfCorpse: "Убрать тело"
 Done: "Готово"
+Drop: "Бросить"
 DurationDay: "{days} д "
 DurationHour: "{hours} ч "
 DurationMinute: "{minutes} мин "
@@ -18,12 +23,17 @@ DurationYear: |-
     few{{years} г }
     other{{years} л }
   }
+Equip: "Надеть"
+Face: "Лицо"
 Goodbye: "Прощание"
+Hair: "Прическа"
 Info: "Инфо"
 Inventory: "Инвентарь"
 Item: "Предмет"
+Local: "Местность"
 MagicEffects: "Маг. эффекты"
 Mouse: "Мышь"
+Move: "Переместить"
 Next: "След"
 No: "Нет"
 None: "Нет"
@@ -39,6 +49,9 @@ Rest: "Отдых"
 ScrollDown: "Прокрутить вниз"
 ScrollUp: "Прокрутить вверх"
 Select: "Выбрать"
+Sell: "Продать"
+Sex: "Пол"
+Share: "Доля"
 Soul: "Душа"
 Take: "Взять"
 TakeAll: "Взять все"
@@ -46,4 +59,5 @@ Topics: "Темы"
 Travel: "Путешествие"
 UntilHealed: "Выздороветь"
 Wait: "Ждать"
+World: "Мир"
 Yes: "Да"

files/data/l10n/Interface/sv.yaml

@@ -1,12 +1,17 @@
 Ask: "Fråga"
 Back: "Bakåt"
+Barter: "Handla"
 Buy: "Köp"
 Cancel: "Avbryt"
+Center: "Centrera"
 Close: "Stäng"
+Container: "Behållare"
 Copy: "Kopiera"
 Create: "Skapa"
+Delete: "Radera"
 DisposeOfCorpse: "Undanröj liket"
 Done: "Klar"
+Drop: "Släpp"
 DurationDay: "{days} d "
 DurationHour: "{hours} tim "
 DurationMinute: "{minutes} min "
@@ -21,12 +26,17 @@ DurationYear: |-
     one{{years} år }
     other{{years} år }
   }
+Equip: "Utrusta"
+Face: "Ansikte"
 Goodbye: "Adjö"
+Hair: "Hår"
 Info: "Info"
 Item: "Föremål"
 Inventory: "Inventariet"
+Local: "Lokal"
 MagicEffects: "Magiska effekter"
 Mouse: "Mus"
+Move: "Flytta"
 Next: "Nästa"
 No: "Nej"
 None: "Inget"
@@ -42,6 +52,9 @@ Rest: "Vila"
 ScrollDown: "Scrolla ner"
 ScrollUp: "Scrolla upp"
 Select: "Välj"
+Sell: "Sälj"
+Sex: "Kön"
+Share: "Dela"
 Soul: "Själ"
 Take: "Ta"
 TakeAll: "Ta allt"
@@ -49,4 +62,5 @@ Topics: "Ämnen"
 Travel: "Res"
 UntilHealed: "Tills återställd"
 Wait: "Vänta"
+World: "Värld"
 Yes: "Ja"