From 1182004937c037b6a1c38584b66f8d9d09f0dc28 Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Sun, 14 Sep 2025 03:55:16 +0300 Subject: [PATCH] Use l10n for inventory gamepad actions --- apps/openmw/mwgui/inventorywindow.cpp | 12 ++++++------ files/data-mw/l10n/Interface/gmst.yaml | 10 ++++++++-- files/data/l10n/Interface/de.yaml | 6 ++++++ files/data/l10n/Interface/en.yaml | 6 ++++++ files/data/l10n/Interface/fr.yaml | 6 ++++++ files/data/l10n/Interface/pl.yaml | 6 ++++++ files/data/l10n/Interface/ru.yaml | 6 ++++++ files/data/l10n/Interface/sv.yaml | 6 ++++++ 8 files changed, 50 insertions(+), 8 deletions(-) diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp index 64d45f1447..44be79ab91 100644 --- a/apps/openmw/mwgui/inventorywindow.cpp +++ b/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; } diff --git a/files/data-mw/l10n/Interface/gmst.yaml b/files/data-mw/l10n/Interface/gmst.yaml index e409d2e61d..0ab886a83e 100644 --- a/files/data-mw/l10n/Interface/gmst.yaml +++ b/files/data-mw/l10n/Interface/gmst.yaml @@ -1,13 +1,17 @@ Ask: "sAsk" Back: "sBack" +Barter: "sBarter" Buy: "sBuy" Cancel: "sCancel" -Center: "sCenter" # NB: in Russian and French localisations this has a trailing space +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" @@ -16,7 +20,7 @@ Inventory: "sInventory" Item: "sItem" Local: "sLocal" MagicEffects: "sMagicEffects" -# NB: sMouse and sMove exist but they are not localised in the Russian game and should not be used +# 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" @@ -30,7 +34,9 @@ Rest: "sRest" ScrollDown: "sScrolldown" ScrollUp: "sScrollup" Select: "sSelect" +Sell: "sSell" Sex: "sSex" +Share: "sCompanionShare" Soul: "sSoulGem" Take: "sTake" TakeAll: "sTakeAll" diff --git a/files/data/l10n/Interface/de.yaml b/files/data/l10n/Interface/de.yaml index cd1797edf0..81244aeb8d 100644 --- a/files/data/l10n/Interface/de.yaml +++ b/files/data/l10n/Interface/de.yaml @@ -1,14 +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 " @@ -28,6 +31,7 @@ DurationYear: |- one{{years} Jahr } other{{years} Jahre } } +Equip: "Verwenden" Face: "Gesicht" Goodbye: "Lebt wohl!" Hair: "Haar" @@ -57,7 +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" diff --git a/files/data/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml index 0930546fd5..cd5ee9df0d 100644 --- a/files/data/l10n/Interface/en.yaml +++ b/files/data/l10n/Interface/en.yaml @@ -1,14 +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 " @@ -23,6 +26,7 @@ DurationYear: |- one{{years} yr } other{{years} yrs } } +Equip: "Equip" Face: "Face" Goodbye: "Goodbye" Hair: "Hair" @@ -48,7 +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" diff --git a/files/data/l10n/Interface/fr.yaml b/files/data/l10n/Interface/fr.yaml index df3f7965e5..d6f17150a3 100644 --- a/files/data/l10n/Interface/fr.yaml +++ b/files/data/l10n/Interface/fr.yaml @@ -1,14 +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 } @@ -23,6 +26,7 @@ DurationYear: |- one{{years} an } other{{years} ans } } +Equip: "S'équiper" Face: "Face" Goodbye: "Au revoir" Hair: "Cheveux" @@ -48,7 +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" diff --git a/files/data/l10n/Interface/pl.yaml b/files/data/l10n/Interface/pl.yaml index cc8220db23..2968c482dc 100644 --- a/files/data/l10n/Interface/pl.yaml +++ b/files/data/l10n/Interface/pl.yaml @@ -1,14 +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 " @@ -21,6 +24,7 @@ DurationYear: |- few{{years} lata } many{{years} lat } } +Equip: "Załóż" Face: "Twarz" Goodbye: "Do widzenia" Hair: "Włosy" @@ -46,7 +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" diff --git a/files/data/l10n/Interface/ru.yaml b/files/data/l10n/Interface/ru.yaml index de1981dcf4..eb98026298 100644 --- a/files/data/l10n/Interface/ru.yaml +++ b/files/data/l10n/Interface/ru.yaml @@ -1,14 +1,17 @@ Ask: "Спросить" Back: "Назад" +Barter: "Торговать" Buy: "Купить" Cancel: "Отмена" Center: "Центр" Close: "Закрыть" +Container: "Контейнер" Copy: "Скопировать" Create: "Создать" Delete: "Удалить" DisposeOfCorpse: "Убрать тело" Done: "Готово" +Drop: "Бросить" DurationDay: "{days} д " DurationHour: "{hours} ч " DurationMinute: "{minutes} мин " @@ -20,6 +23,7 @@ DurationYear: |- few{{years} г } other{{years} л } } +Equip: "Надеть" Face: "Лицо" Goodbye: "Прощание" Hair: "Прическа" @@ -45,7 +49,9 @@ Rest: "Отдых" ScrollDown: "Прокрутить вниз" ScrollUp: "Прокрутить вверх" Select: "Выбрать" +Sell: "Продать" Sex: "Пол" +Share: "Доля" Soul: "Душа" Take: "Взять" TakeAll: "Взять все" diff --git a/files/data/l10n/Interface/sv.yaml b/files/data/l10n/Interface/sv.yaml index ed22ff2dcf..6871a27cf2 100644 --- a/files/data/l10n/Interface/sv.yaml +++ b/files/data/l10n/Interface/sv.yaml @@ -1,14 +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 " @@ -23,6 +26,7 @@ DurationYear: |- one{{years} år } other{{years} år } } +Equip: "Utrusta" Face: "Ansikte" Goodbye: "Adjö" Hair: "Hår" @@ -48,7 +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"