From cac8d59db95fe82ab9ca4e48516dce21ec0fd434 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 5 Sep 2025 00:44:58 +0300
Subject: [PATCH 1/9] Use l10n for journal gamepad actions

---
 apps/openmw/mwgui/journalwindow.cpp    | 23 ++++++++++++++++++-----
 files/data-mw/l10n/Interface/gmst.yaml |  1 +
 files/data/l10n/Interface/de.yaml      |  1 +
 files/data/l10n/Interface/en.yaml      |  1 +
 files/data/l10n/Interface/fr.yaml      |  1 +
 files/data/l10n/Interface/pl.yaml      |  1 +
 files/data/l10n/Interface/ru.yaml      |  1 +
 7 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index 8d7cfac586..c1fba27cfb 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -226,7 +226,7 @@ namespace
 
             mControllerButtons.mA = "#{Interface:Select}";
             mControllerButtons.mX = "#{OMWEngine:JournalQuests}";
-            mControllerButtons.mY = "#{sTopics}";
+            mControllerButtons.mY = "#{Interface:Topics}";
 
             mQuestMode = false;
             mAllQuests = false;
@@ -696,10 +696,23 @@ namespace
 
         MWGui::ControllerButtons* getControllerButtons() override
         {
-            mControllerButtons.mB = mOptionsMode || mStates.size() > 1 ? "#{sBack}" : "#{Interface:Close}";
-            mControllerButtons.mL1 = mOptionsMode ? "" : "#{sPrev}";
-            mControllerButtons.mR1 = mOptionsMode ? "" : "#{sNext}";
-            mControllerButtons.mR3 = mOptionsMode && mQuestMode ? "#{OMWEngine:JournalShowAll}" : "";
+            if (mOptionsMode || mStates.size() > 1)
+                mControllerButtons.mB = "#{Interface:Back}";
+            else
+                mControllerButtons.mB = "#{Interface:Close}";
+
+            mControllerButtons.mL1.clear();
+            mControllerButtons.mR1.clear();
+            mControllerButtons.mR3.clear();
+            if (!mOptionsMode)
+            {
+                mControllerButtons.mL1 = "#{Interface:Prev}";
+                mControllerButtons.mR1 = "#{Interface:Next}";
+            }
+            else if (mQuestMode)
+            {
+                mControllerButtons.mR3 = "#{OMWEngine:JournalShowAll}";
+            }
             return &mControllerButtons;
         }
 
diff --git a/files/data-mw/l10n/Interface/gmst.yaml b/files/data-mw/l10n/Interface/gmst.yaml
index cef128fdb6..dd20f4132a 100644
--- a/files/data-mw/l10n/Interface/gmst.yaml
+++ b/files/data-mw/l10n/Interface/gmst.yaml
@@ -24,4 +24,5 @@ Select: "sSelect"
 Soul: "sSoulGem"
 Take: "sTake"
 TakeAll: "sTakeAll"
+Topics: "sTopics"
 Yes: "sYes"
diff --git a/files/data/l10n/Interface/de.yaml b/files/data/l10n/Interface/de.yaml
index 0413292169..211faf3d29 100644
--- a/files/data/l10n/Interface/de.yaml
+++ b/files/data/l10n/Interface/de.yaml
@@ -50,4 +50,5 @@ Select: "Auswählen"
 Soul: "Seele"
 Take: "Nehmen"
 TakeAll: "Alles nehmen"
+Topics: "Themen"
 Yes: "Ja"
diff --git a/files/data/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml
index 0a97542c35..05a1a1fb7c 100644
--- a/files/data/l10n/Interface/en.yaml
+++ b/files/data/l10n/Interface/en.yaml
@@ -41,4 +41,5 @@ Select: "Select"
 Soul: "Soul"
 Take: "Take"
 TakeAll: "Take All"
+Topics: "Topics"
 Yes: "Yes"
diff --git a/files/data/l10n/Interface/fr.yaml b/files/data/l10n/Interface/fr.yaml
index df5d950e5d..c886c9ba0c 100644
--- a/files/data/l10n/Interface/fr.yaml
+++ b/files/data/l10n/Interface/fr.yaml
@@ -41,4 +41,5 @@ Select: "Sélectionner"
 Soul: "Ame"
 Take: "Prendre"
 TakeAll: "Tout prendre"
+Topics: "Sujets"
 Yes: "Oui"
diff --git a/files/data/l10n/Interface/pl.yaml b/files/data/l10n/Interface/pl.yaml
index cb71ed6fcd..457d3e903f 100644
--- a/files/data/l10n/Interface/pl.yaml
+++ b/files/data/l10n/Interface/pl.yaml
@@ -39,4 +39,5 @@ Select: "Wybierz"
 Soul: "Dusza"
 Take: "Weź"
 TakeAll: "Weź wszystko"
+Topics: "Tematy"
 Yes: "Tak"
diff --git a/files/data/l10n/Interface/ru.yaml b/files/data/l10n/Interface/ru.yaml
index 03d7ba53b1..0f49a2bea7 100644
--- a/files/data/l10n/Interface/ru.yaml
+++ b/files/data/l10n/Interface/ru.yaml
@@ -38,4 +38,5 @@ Select: "Выбрать"
 Soul: "Душа"
 Take: "Взять"
 TakeAll: "Взять все"
+Topics: "Темы"
 Yes: "Да"

From 43617286fb57525af3c100b2954d2cfe4cbe2008 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 5 Sep 2025 09:16:14 +0300
Subject: [PATCH 2/9] Use l10n for scroll down scroll gamepad action

---
 apps/openmw/mwgui/scrollwindow.cpp     | 2 +-
 files/data-mw/l10n/Interface/gmst.yaml | 1 +
 files/data/l10n/Interface/de.yaml      | 1 +
 files/data/l10n/Interface/en.yaml      | 1 +
 files/data/l10n/Interface/fr.yaml      | 1 +
 files/data/l10n/Interface/pl.yaml      | 1 +
 files/data/l10n/Interface/ru.yaml      | 1 +
 files/data/l10n/Interface/sv.yaml      | 2 ++
 8 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/scrollwindow.cpp b/apps/openmw/mwgui/scrollwindow.cpp
index de1ceaa573..0113045c83 100644
--- a/apps/openmw/mwgui/scrollwindow.cpp
+++ b/apps/openmw/mwgui/scrollwindow.cpp
@@ -41,7 +41,7 @@ namespace MWGui
 
         mControllerScrollWidget = mTextView;
         mControllerButtons.mB = "#{Interface:Close}";
-        mControllerButtons.mDpad = "#{sScrolldown}";
+        mControllerButtons.mDpad = "#{Interface:ScrollDown}";
 
         center();
     }
diff --git a/files/data-mw/l10n/Interface/gmst.yaml b/files/data-mw/l10n/Interface/gmst.yaml
index dd20f4132a..c368315a56 100644
--- a/files/data-mw/l10n/Interface/gmst.yaml
+++ b/files/data-mw/l10n/Interface/gmst.yaml
@@ -19,6 +19,7 @@ Off: "sOff"
 OK: "sOK"
 On: "sOn"
 Prev: "sPrev"
+ScrollDown: "sScrolldown"
 ScrollUp: "sScrollup"
 Select: "sSelect"
 Soul: "sSoulGem"
diff --git a/files/data/l10n/Interface/de.yaml b/files/data/l10n/Interface/de.yaml
index 211faf3d29..6f02068c1f 100644
--- a/files/data/l10n/Interface/de.yaml
+++ b/files/data/l10n/Interface/de.yaml
@@ -45,6 +45,7 @@ OK: "OK"
 On: "An"
 Prev: "Zurück"
 Reset: "Zurücksetzen"
+ScrollDown: "Nach unten scrollen"
 ScrollUp: "Nach oben scrollen"
 Select: "Auswählen"
 Soul: "Seele"
diff --git a/files/data/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml
index 05a1a1fb7c..9ed8c3be4f 100644
--- a/files/data/l10n/Interface/en.yaml
+++ b/files/data/l10n/Interface/en.yaml
@@ -36,6 +36,7 @@ OK: "OK"
 On: "On"
 Prev: "Prev"
 Reset: "Reset"
+ScrollDown: "Scroll Down"
 ScrollUp: "Scroll Up"
 Select: "Select"
 Soul: "Soul"
diff --git a/files/data/l10n/Interface/fr.yaml b/files/data/l10n/Interface/fr.yaml
index c886c9ba0c..1ca2f152fd 100644
--- a/files/data/l10n/Interface/fr.yaml
+++ b/files/data/l10n/Interface/fr.yaml
@@ -36,6 +36,7 @@ OK: "Valider"
 On: "Actif"
 Prev: "Précédent"
 Reset: "Réinitialiser"
+ScrollDown: "Défilement bas"
 ScrollUp: "Défilement haut"
 Select: "Sélectionner"
 Soul: "Ame"
diff --git a/files/data/l10n/Interface/pl.yaml b/files/data/l10n/Interface/pl.yaml
index 457d3e903f..d0fd605628 100644
--- a/files/data/l10n/Interface/pl.yaml
+++ b/files/data/l10n/Interface/pl.yaml
@@ -34,6 +34,7 @@ OK: "OK"
 On: "Wł."
 Prev: "Poprz."
 Reset: "Przywróć"
+ScrollDown: "Przewiń w dół"
 ScrollUp: "Przewiń w górę"
 Select: "Wybierz"
 Soul: "Dusza"
diff --git a/files/data/l10n/Interface/ru.yaml b/files/data/l10n/Interface/ru.yaml
index 0f49a2bea7..30d096d72c 100644
--- a/files/data/l10n/Interface/ru.yaml
+++ b/files/data/l10n/Interface/ru.yaml
@@ -33,6 +33,7 @@ OK: "OK"
 On: "Вкл"
 Prev: "Пред"
 Reset: "Сбросить"
+ScrollDown: "Прокрутить вниз"
 ScrollUp: "Прокрутить вверх"
 Select: "Выбрать"
 Soul: "Душа"
diff --git a/files/data/l10n/Interface/sv.yaml b/files/data/l10n/Interface/sv.yaml
index 8e183edb55..c498ee5d37 100644
--- a/files/data/l10n/Interface/sv.yaml
+++ b/files/data/l10n/Interface/sv.yaml
@@ -36,9 +36,11 @@ OK: "Ok"
 On: "På"
 Prev: "Föreg."
 Reset: "Återställ"
+# ScrollDown: "Scroll Down"
 ScrollUp: "Scrolla upp"
 Select: "Välj"
 Soul: "Själ"
 Take: "Ta"
 TakeAll: "Ta allt"
+# Topics: "Topics"
 Yes: "Ja"

From 1ab32749ee1cdb7365d90579bee0d643afcce35c Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 5 Sep 2025 09:20:16 +0300
Subject: [PATCH 3/9] Use l10n for travel travel window action

---
 apps/openmw/mwgui/travelwindow.cpp     | 2 +-
 files/data-mw/l10n/Interface/gmst.yaml | 1 +
 files/data/l10n/Interface/de.yaml      | 1 +
 files/data/l10n/Interface/en.yaml      | 1 +
 files/data/l10n/Interface/fr.yaml      | 1 +
 files/data/l10n/Interface/pl.yaml      | 1 +
 files/data/l10n/Interface/ru.yaml      | 1 +
 files/data/l10n/Interface/sv.yaml      | 1 +
 8 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index b5d9fd317b..e83c327125 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -41,7 +41,7 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             mDisableGamepadCursor = true;
-            mControllerButtons.mA = "#{sTravel}";
+            mControllerButtons.mA = "#{Interface:Travel}";
             mControllerButtons.mB = "#{Interface:Cancel}";
         }
     }
diff --git a/files/data-mw/l10n/Interface/gmst.yaml b/files/data-mw/l10n/Interface/gmst.yaml
index c368315a56..b3ca68f311 100644
--- a/files/data-mw/l10n/Interface/gmst.yaml
+++ b/files/data-mw/l10n/Interface/gmst.yaml
@@ -26,4 +26,5 @@ Soul: "sSoulGem"
 Take: "sTake"
 TakeAll: "sTakeAll"
 Topics: "sTopics"
+Travel: "sTravel"
 Yes: "sYes"
diff --git a/files/data/l10n/Interface/de.yaml b/files/data/l10n/Interface/de.yaml
index 6f02068c1f..b324306964 100644
--- a/files/data/l10n/Interface/de.yaml
+++ b/files/data/l10n/Interface/de.yaml
@@ -52,4 +52,5 @@ Soul: "Seele"
 Take: "Nehmen"
 TakeAll: "Alles nehmen"
 Topics: "Themen"
+Travel: "Reisen"
 Yes: "Ja"
diff --git a/files/data/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml
index 9ed8c3be4f..923c36dd88 100644
--- a/files/data/l10n/Interface/en.yaml
+++ b/files/data/l10n/Interface/en.yaml
@@ -43,4 +43,5 @@ Soul: "Soul"
 Take: "Take"
 TakeAll: "Take All"
 Topics: "Topics"
+Travel: "Travel"
 Yes: "Yes"
diff --git a/files/data/l10n/Interface/fr.yaml b/files/data/l10n/Interface/fr.yaml
index 1ca2f152fd..bfc15a6233 100644
--- a/files/data/l10n/Interface/fr.yaml
+++ b/files/data/l10n/Interface/fr.yaml
@@ -43,4 +43,5 @@ Soul: "Ame"
 Take: "Prendre"
 TakeAll: "Tout prendre"
 Topics: "Sujets"
+Travel: "Voyager"
 Yes: "Oui"
diff --git a/files/data/l10n/Interface/pl.yaml b/files/data/l10n/Interface/pl.yaml
index d0fd605628..71b7f6d3d1 100644
--- a/files/data/l10n/Interface/pl.yaml
+++ b/files/data/l10n/Interface/pl.yaml
@@ -41,4 +41,5 @@ Soul: "Dusza"
 Take: "Weź"
 TakeAll: "Weź wszystko"
 Topics: "Tematy"
+Travel: "Podróż"
 Yes: "Tak"
diff --git a/files/data/l10n/Interface/ru.yaml b/files/data/l10n/Interface/ru.yaml
index 30d096d72c..37280cd0d5 100644
--- a/files/data/l10n/Interface/ru.yaml
+++ b/files/data/l10n/Interface/ru.yaml
@@ -40,4 +40,5 @@ Soul: "Душа"
 Take: "Взять"
 TakeAll: "Взять все"
 Topics: "Темы"
+Travel: "Путешествие"
 Yes: "Да"
diff --git a/files/data/l10n/Interface/sv.yaml b/files/data/l10n/Interface/sv.yaml
index c498ee5d37..510fdcc0c1 100644
--- a/files/data/l10n/Interface/sv.yaml
+++ b/files/data/l10n/Interface/sv.yaml
@@ -43,4 +43,5 @@ Soul: "Själ"
 Take: "Ta"
 TakeAll: "Ta allt"
 # Topics: "Topics"
+# Travel: "Travel"
 Yes: "Ja"

From b7d9d01cc8d4a60ecbe028ce1147ff8c551506ce Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 5 Sep 2025 09:29:34 +0300
Subject: [PATCH 4/9] Use l10n for wait dialog gamepad actions

---
 apps/openmw/mwgui/waitdialog.cpp       | 13 +++++++++++--
 files/data-mw/l10n/Interface/gmst.yaml |  3 +++
 files/data/l10n/Interface/de.yaml      |  3 +++
 files/data/l10n/Interface/en.yaml      |  3 +++
 files/data/l10n/Interface/fr.yaml      |  3 +++
 files/data/l10n/Interface/pl.yaml      |  3 +++
 files/data/l10n/Interface/ru.yaml      |  3 +++
 files/data/l10n/Interface/sv.yaml      |  3 +++
 8 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index 7d5fb0503e..8663ea1071 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -330,8 +330,17 @@ namespace MWGui
 
     ControllerButtons* WaitDialog::getControllerButtons()
     {
-        mControllerButtons.mA = mSleeping ? "#{sRest}" : "#{sWait}";
-        mControllerButtons.mX = mSleeping && mUntilHealedButton->getVisible() ? "#{sUntilHealed}" : "";
+        mControllerButtons.mX.clear();
+        if (mSleeping)
+        {
+            mControllerButtons.mA = "#{Interface:Rest}";
+            if (mUntilHealedButton->getVisible())
+                mControllerButtons.mX = "#{Interface:UntilHealed}";
+        }
+        else
+        {
+            mControllerButtons.mA = "#{Interface:Wait}";
+        }
         return &mControllerButtons;
     }
 
diff --git a/files/data-mw/l10n/Interface/gmst.yaml b/files/data-mw/l10n/Interface/gmst.yaml
index b3ca68f311..d690b9d457 100644
--- a/files/data-mw/l10n/Interface/gmst.yaml
+++ b/files/data-mw/l10n/Interface/gmst.yaml
@@ -19,6 +19,7 @@ Off: "sOff"
 OK: "sOK"
 On: "sOn"
 Prev: "sPrev"
+Rest: "sRest"
 ScrollDown: "sScrolldown"
 ScrollUp: "sScrollup"
 Select: "sSelect"
@@ -27,4 +28,6 @@ Take: "sTake"
 TakeAll: "sTakeAll"
 Topics: "sTopics"
 Travel: "sTravel"
+UntilHealed: "sUntilHealed"
+Wait: "sWait"
 Yes: "sYes"
diff --git a/files/data/l10n/Interface/de.yaml b/files/data/l10n/Interface/de.yaml
index b324306964..8b731e3f64 100644
--- a/files/data/l10n/Interface/de.yaml
+++ b/files/data/l10n/Interface/de.yaml
@@ -45,6 +45,7 @@ OK: "OK"
 On: "An"
 Prev: "Zurück"
 Reset: "Zurücksetzen"
+Rest: "Rasten"
 ScrollDown: "Nach unten scrollen"
 ScrollUp: "Nach oben scrollen"
 Select: "Auswählen"
@@ -53,4 +54,6 @@ Take: "Nehmen"
 TakeAll: "Alles nehmen"
 Topics: "Themen"
 Travel: "Reisen"
+UntilHealed: "Bis geheilt"
+Wait: "Warten"
 Yes: "Ja"
diff --git a/files/data/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml
index 923c36dd88..a4b3ec21cb 100644
--- a/files/data/l10n/Interface/en.yaml
+++ b/files/data/l10n/Interface/en.yaml
@@ -36,6 +36,7 @@ OK: "OK"
 On: "On"
 Prev: "Prev"
 Reset: "Reset"
+Rest: "Rest"
 ScrollDown: "Scroll Down"
 ScrollUp: "Scroll Up"
 Select: "Select"
@@ -44,4 +45,6 @@ Take: "Take"
 TakeAll: "Take All"
 Topics: "Topics"
 Travel: "Travel"
+UntilHealed: "Until Healed"
+Wait: "Wait"
 Yes: "Yes"
diff --git a/files/data/l10n/Interface/fr.yaml b/files/data/l10n/Interface/fr.yaml
index bfc15a6233..c435eec4f1 100644
--- a/files/data/l10n/Interface/fr.yaml
+++ b/files/data/l10n/Interface/fr.yaml
@@ -36,6 +36,7 @@ OK: "Valider"
 On: "Actif"
 Prev: "Précédent"
 Reset: "Réinitialiser"
+Rest: "Repos"
 ScrollDown: "Défilement bas"
 ScrollUp: "Défilement haut"
 Select: "Sélectionner"
@@ -44,4 +45,6 @@ Take: "Prendre"
 TakeAll: "Tout prendre"
 Topics: "Sujets"
 Travel: "Voyager"
+UntilHealed: "Récup. totale"
+Wait: "Attendre"
 Yes: "Oui"
diff --git a/files/data/l10n/Interface/pl.yaml b/files/data/l10n/Interface/pl.yaml
index 71b7f6d3d1..8c634c247e 100644
--- a/files/data/l10n/Interface/pl.yaml
+++ b/files/data/l10n/Interface/pl.yaml
@@ -34,6 +34,7 @@ OK: "OK"
 On: "Wł."
 Prev: "Poprz."
 Reset: "Przywróć"
+Rest: "Odpocznij"
 ScrollDown: "Przewiń w dół"
 ScrollUp: "Przewiń w górę"
 Select: "Wybierz"
@@ -42,4 +43,6 @@ Take: "Weź"
 TakeAll: "Weź wszystko"
 Topics: "Tematy"
 Travel: "Podróż"
+UntilHealed: "Do wyzdr."
+Wait: "Czekaj"
 Yes: "Tak"
diff --git a/files/data/l10n/Interface/ru.yaml b/files/data/l10n/Interface/ru.yaml
index 37280cd0d5..a8fc333701 100644
--- a/files/data/l10n/Interface/ru.yaml
+++ b/files/data/l10n/Interface/ru.yaml
@@ -33,6 +33,7 @@ OK: "OK"
 On: "Вкл"
 Prev: "Пред"
 Reset: "Сбросить"
+Rest: "Отдых"
 ScrollDown: "Прокрутить вниз"
 ScrollUp: "Прокрутить вверх"
 Select: "Выбрать"
@@ -41,4 +42,6 @@ Take: "Взять"
 TakeAll: "Взять все"
 Topics: "Темы"
 Travel: "Путешествие"
+UntilHealed: "Выздороветь"
+Wait: "Ждать"
 Yes: "Да"
diff --git a/files/data/l10n/Interface/sv.yaml b/files/data/l10n/Interface/sv.yaml
index 510fdcc0c1..e0bd136b72 100644
--- a/files/data/l10n/Interface/sv.yaml
+++ b/files/data/l10n/Interface/sv.yaml
@@ -36,6 +36,7 @@ OK: "Ok"
 On: "På"
 Prev: "Föreg."
 Reset: "Återställ"
+# Rest: "Rest"
 # ScrollDown: "Scroll Down"
 ScrollUp: "Scrolla upp"
 Select: "Välj"
@@ -44,4 +45,6 @@ Take: "Ta"
 TakeAll: "Ta allt"
 # Topics: "Topics"
 # Travel: "Travel"
+# UntilHealed: "Until Healed"
+# Wait: "Wait"
 Yes: "Ja"

From bd4d844b87cd3c30b33573cfd9f3d6ce78cdc4d8 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 5 Sep 2025 09:33:22 +0300
Subject: [PATCH 5/9] Use l10n for repair gamepad actions

---
 apps/openmw/mwgui/merchantrepair.cpp   | 2 +-
 apps/openmw/mwgui/repair.cpp           | 2 +-
 files/data-mw/l10n/Interface/gmst.yaml | 1 +
 files/data/l10n/Interface/de.yaml      | 1 +
 files/data/l10n/Interface/en.yaml      | 1 +
 files/data/l10n/Interface/fr.yaml      | 1 +
 files/data/l10n/Interface/pl.yaml      | 1 +
 files/data/l10n/Interface/ru.yaml      | 1 +
 files/data/l10n/Interface/sv.yaml      | 1 +
 9 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/merchantrepair.cpp b/apps/openmw/mwgui/merchantrepair.cpp
index 5e0a889a0f..20c17aa701 100644
--- a/apps/openmw/mwgui/merchantrepair.cpp
+++ b/apps/openmw/mwgui/merchantrepair.cpp
@@ -32,7 +32,7 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             mDisableGamepadCursor = true;
-            mControllerButtons.mA = "#{sRepair}";
+            mControllerButtons.mA = "#{Interface:Repair}";
             mControllerButtons.mB = "#{Interface:Cancel}";
         }
     }
diff --git a/apps/openmw/mwgui/repair.cpp b/apps/openmw/mwgui/repair.cpp
index 6064fcfd94..119376bbb2 100644
--- a/apps/openmw/mwgui/repair.cpp
+++ b/apps/openmw/mwgui/repair.cpp
@@ -40,7 +40,7 @@ namespace MWGui
 
         mToolIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Repair::onSelectItem);
 
-        mControllerButtons.mA = "#{sRepair}";
+        mControllerButtons.mA = "#{Interface:Repair}";
         mControllerButtons.mB = "#{Interface:Cancel}";
         mControllerButtons.mY = "#{OMWEngine:RepairTool}";
     }
diff --git a/files/data-mw/l10n/Interface/gmst.yaml b/files/data-mw/l10n/Interface/gmst.yaml
index d690b9d457..2873eb3074 100644
--- a/files/data-mw/l10n/Interface/gmst.yaml
+++ b/files/data-mw/l10n/Interface/gmst.yaml
@@ -19,6 +19,7 @@ Off: "sOff"
 OK: "sOK"
 On: "sOn"
 Prev: "sPrev"
+Repair: "sRepair"
 Rest: "sRest"
 ScrollDown: "sScrolldown"
 ScrollUp: "sScrollup"
diff --git a/files/data/l10n/Interface/de.yaml b/files/data/l10n/Interface/de.yaml
index 8b731e3f64..c3e670d1ca 100644
--- a/files/data/l10n/Interface/de.yaml
+++ b/files/data/l10n/Interface/de.yaml
@@ -44,6 +44,7 @@ Off: "Aus"
 OK: "OK"
 On: "An"
 Prev: "Zurück"
+Repair: "Reparieren"
 Reset: "Zurücksetzen"
 Rest: "Rasten"
 ScrollDown: "Nach unten scrollen"
diff --git a/files/data/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml
index a4b3ec21cb..a3621dbfce 100644
--- a/files/data/l10n/Interface/en.yaml
+++ b/files/data/l10n/Interface/en.yaml
@@ -35,6 +35,7 @@ Off: "Off"
 OK: "OK"
 On: "On"
 Prev: "Prev"
+Repair: "Repair"
 Reset: "Reset"
 Rest: "Rest"
 ScrollDown: "Scroll Down"
diff --git a/files/data/l10n/Interface/fr.yaml b/files/data/l10n/Interface/fr.yaml
index c435eec4f1..8ef8036807 100644
--- a/files/data/l10n/Interface/fr.yaml
+++ b/files/data/l10n/Interface/fr.yaml
@@ -35,6 +35,7 @@ Off: "Inactif"
 OK: "Valider"
 On: "Actif"
 Prev: "Précédent"
+Repair: "Réparer"
 Reset: "Réinitialiser"
 Rest: "Repos"
 ScrollDown: "Défilement bas"
diff --git a/files/data/l10n/Interface/pl.yaml b/files/data/l10n/Interface/pl.yaml
index 8c634c247e..f3177ea54c 100644
--- a/files/data/l10n/Interface/pl.yaml
+++ b/files/data/l10n/Interface/pl.yaml
@@ -33,6 +33,7 @@ Off: "Wył."
 OK: "OK"
 On: "Wł."
 Prev: "Poprz."
+Repair: "Naprawa"
 Reset: "Przywróć"
 Rest: "Odpocznij"
 ScrollDown: "Przewiń w dół"
diff --git a/files/data/l10n/Interface/ru.yaml b/files/data/l10n/Interface/ru.yaml
index a8fc333701..9233eb8888 100644
--- a/files/data/l10n/Interface/ru.yaml
+++ b/files/data/l10n/Interface/ru.yaml
@@ -32,6 +32,7 @@ Off: "Выкл"
 OK: "OK"
 On: "Вкл"
 Prev: "Пред"
+Repair: "Ремонт"
 Reset: "Сбросить"
 Rest: "Отдых"
 ScrollDown: "Прокрутить вниз"
diff --git a/files/data/l10n/Interface/sv.yaml b/files/data/l10n/Interface/sv.yaml
index e0bd136b72..95d9aa579c 100644
--- a/files/data/l10n/Interface/sv.yaml
+++ b/files/data/l10n/Interface/sv.yaml
@@ -35,6 +35,7 @@ Off: "Av"
 OK: "Ok"
 On: "På"
 Prev: "Föreg."
+# Repair: "Repair"
 Reset: "Återställ"
 # Rest: "Rest"
 # ScrollDown: "Scroll Down"

From 3159c363a1780dc56feb56d85ca2d2782a983921 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 5 Sep 2025 09:49:05 +0300
Subject: [PATCH 6/9] Use l10n for trading menu offer action

---
 apps/openmw/mwgui/tradewindow.cpp      | 2 +-
 files/data-mw/l10n/Interface/gmst.yaml | 1 +
 files/data/l10n/Interface/de.yaml      | 1 +
 files/data/l10n/Interface/en.yaml      | 1 +
 files/data/l10n/Interface/fr.yaml      | 1 +
 files/data/l10n/Interface/pl.yaml      | 1 +
 files/data/l10n/Interface/ru.yaml      | 1 +
 files/data/l10n/Interface/sv.yaml      | 1 +
 8 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index bc57cb2c08..d238db70c9 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -190,7 +190,7 @@ namespace MWGui
 
             mControllerButtons.mA = "#{Interface:Buy}";
             mControllerButtons.mB = "#{Interface:Cancel}";
-            mControllerButtons.mX = "#{sOffer}";
+            mControllerButtons.mX = "#{Interface:Offer}";
             mControllerButtons.mR3 = "#{Interface:Info}";
             mControllerButtons.mL2 = "#{Interface:Inventory}";
         }
diff --git a/files/data-mw/l10n/Interface/gmst.yaml b/files/data-mw/l10n/Interface/gmst.yaml
index 2873eb3074..0ff365ae60 100644
--- a/files/data-mw/l10n/Interface/gmst.yaml
+++ b/files/data-mw/l10n/Interface/gmst.yaml
@@ -16,6 +16,7 @@ Next: "sNext"
 No: "sNo"
 None: "sNone"
 Off: "sOff"
+Offer: "sOffer"
 OK: "sOK"
 On: "sOn"
 Prev: "sPrev"
diff --git a/files/data/l10n/Interface/de.yaml b/files/data/l10n/Interface/de.yaml
index c3e670d1ca..98a34a1f0b 100644
--- a/files/data/l10n/Interface/de.yaml
+++ b/files/data/l10n/Interface/de.yaml
@@ -41,6 +41,7 @@ No: "Nein"
 None: "Keine"
 NotAvailableShort: "N/A"
 Off: "Aus"
+Offer: "Angebot"
 OK: "OK"
 On: "An"
 Prev: "Zurück"
diff --git a/files/data/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml
index a3621dbfce..10b0793eba 100644
--- a/files/data/l10n/Interface/en.yaml
+++ b/files/data/l10n/Interface/en.yaml
@@ -32,6 +32,7 @@ No: "No"
 None: "None"
 NotAvailableShort: "N/A"
 Off: "Off"
+Offer: "Offer"
 OK: "OK"
 On: "On"
 Prev: "Prev"
diff --git a/files/data/l10n/Interface/fr.yaml b/files/data/l10n/Interface/fr.yaml
index 8ef8036807..7de0a23a27 100644
--- a/files/data/l10n/Interface/fr.yaml
+++ b/files/data/l10n/Interface/fr.yaml
@@ -32,6 +32,7 @@ No: "Non"
 None: "Aucun"
 NotAvailableShort: "N/A"
 Off: "Inactif"
+Offer: "Proposer"
 OK: "Valider"
 On: "Actif"
 Prev: "Précédent"
diff --git a/files/data/l10n/Interface/pl.yaml b/files/data/l10n/Interface/pl.yaml
index f3177ea54c..07f7480146 100644
--- a/files/data/l10n/Interface/pl.yaml
+++ b/files/data/l10n/Interface/pl.yaml
@@ -30,6 +30,7 @@ No: "Nie"
 None: "Brak"
 NotAvailableShort: "N/D"
 Off: "Wył."
+Offer: "Zaoferuj"
 OK: "OK"
 On: "Wł."
 Prev: "Poprz."
diff --git a/files/data/l10n/Interface/ru.yaml b/files/data/l10n/Interface/ru.yaml
index 9233eb8888..7281635aac 100644
--- a/files/data/l10n/Interface/ru.yaml
+++ b/files/data/l10n/Interface/ru.yaml
@@ -29,6 +29,7 @@ No: "Нет"
 None: "Нет"
 NotAvailableShort: "Н/Д"
 Off: "Выкл"
+Offer: "Предложить"
 OK: "OK"
 On: "Вкл"
 Prev: "Пред"
diff --git a/files/data/l10n/Interface/sv.yaml b/files/data/l10n/Interface/sv.yaml
index 95d9aa579c..192dca7599 100644
--- a/files/data/l10n/Interface/sv.yaml
+++ b/files/data/l10n/Interface/sv.yaml
@@ -32,6 +32,7 @@ No: "Nej"
 None: "Inget"
 NotAvailableShort: "N/A"
 Off: "Av"
+# Offer: "Offer"
 OK: "Ok"
 On: "På"
 Prev: "Föreg."

From 1740e6bac4e4bd8abec05b2c4a31f12b67881c22 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 5 Sep 2025 10:00:15 +0300
Subject: [PATCH 7/9] Use l10n for stats window scroll down action

---
 apps/openmw/mwgui/statswindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index 73b526a44b..656adcb4b7 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -85,7 +85,7 @@ namespace MWGui
         {
             setPinButtonVisible(false);
             mControllerButtons.mLStick = "#{Interface:Mouse}";
-            mControllerButtons.mRStick = "#{sScrolldown}";
+            mControllerButtons.mRStick = "#{Interface:ScrollDown}";
             mControllerButtons.mB = "#{Interface:Back}";
         }
 

From 9a92904f11b5c876062a80aa0e9aad87a5d98b89 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 5 Sep 2025 10:11:10 +0300
Subject: [PATCH 8/9] Use l10n for inventory offer action

---
 apps/openmw/mwgui/inventorywindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 5fde06f75d..64d45f1447 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -979,7 +979,7 @@ namespace MWGui
             case MWGui::GM_Barter:
                 mControllerButtons.mA = "#{sSell}";
                 mControllerButtons.mB = "#{Interface:Cancel}";
-                mControllerButtons.mX = "#{sOffer}";
+                mControllerButtons.mX = "#{Interface:Offer}";
                 mControllerButtons.mR2 = "#{sBarter}";
                 break;
             case MWGui::GM_Inventory:

From b3f4287bca7627207ea722c2271168830de5f7a6 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 5 Sep 2025 11:21:15 +0300
Subject: [PATCH 9/9] Update Swedish Interface lines

---
 files/data/l10n/Interface/sv.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/files/data/l10n/Interface/sv.yaml b/files/data/l10n/Interface/sv.yaml
index 192dca7599..f33d9a7947 100644
--- a/files/data/l10n/Interface/sv.yaml
+++ b/files/data/l10n/Interface/sv.yaml
@@ -32,21 +32,21 @@ No: "Nej"
 None: "Inget"
 NotAvailableShort: "N/A"
 Off: "Av"
-# Offer: "Offer"
+Offer: "Föreslå"
 OK: "Ok"
 On: "På"
 Prev: "Föreg."
-# Repair: "Repair"
+Repair: "Laga"
 Reset: "Återställ"
-# Rest: "Rest"
-# ScrollDown: "Scroll Down"
+Rest: "Vila"
+ScrollDown: "Scrolla ner"
 ScrollUp: "Scrolla upp"
 Select: "Välj"
 Soul: "Själ"
 Take: "Ta"
 TakeAll: "Ta allt"
-# Topics: "Topics"
-# Travel: "Travel"
-# UntilHealed: "Until Healed"
-# Wait: "Wait"
+Topics: "Ämnen"
+Travel: "Res"
+UntilHealed: "Tills återställd"
+Wait: "Vänta"
 Yes: "Ja"