diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp index f80871d3ef..c6dc54c886 100644 --- a/apps/openmw/mwgui/mapwindow.cpp +++ b/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; } diff --git a/files/data-mw/l10n/Interface/gmst.yaml b/files/data-mw/l10n/Interface/gmst.yaml index cb3f337bcc..e409d2e61d 100644 --- a/files/data-mw/l10n/Interface/gmst.yaml +++ b/files/data-mw/l10n/Interface/gmst.yaml @@ -2,8 +2,10 @@ Ask: "sAsk" Back: "sBack" Buy: "sBuy" Cancel: "sCancel" +Center: "sCenter" # NB: in Russian and French localisations this has a trailing space Close: "sClose" Create: "sCreate" +Delete: "sDelete" DisposeOfCorpse: "sDisposeofCorpse" Done: "sDone" Face: "sFace" @@ -12,8 +14,9 @@ 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 +# NB: sMouse and sMove exist but they are not localised in the Russian game and should not be used Next: "sNext" No: "sNo" None: "sNone" @@ -35,4 +38,5 @@ Topics: "sTopics" Travel: "sTravel" UntilHealed: "sUntilHealed" Wait: "sWait" +World: "sWorld" Yes: "sYes" diff --git a/files/data/l10n/Interface/de.yaml b/files/data/l10n/Interface/de.yaml index 3922e5414d..cd1797edf0 100644 --- a/files/data/l10n/Interface/de.yaml +++ b/files/data/l10n/Interface/de.yaml @@ -2,9 +2,11 @@ Ask: "Fragen" Back: "Zurück" Buy: "Kaufen" Cancel: "Abbruch" +Center: "Zentrieren" Close: "Schließen" Copy: "Kopieren" Create: "Herstellen" +Delete: "Entfernen" DisposeOfCorpse: "Leiche beseitigen" Done: "Fertig" DurationDay: "{days} d " @@ -32,8 +34,10 @@ 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 @@ -61,4 +65,5 @@ Topics: "Themen" Travel: "Reisen" UntilHealed: "Bis geheilt" Wait: "Warten" +World: "Welt" Yes: "Ja" diff --git a/files/data/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml index 71a0fcaea2..0930546fd5 100644 --- a/files/data/l10n/Interface/en.yaml +++ b/files/data/l10n/Interface/en.yaml @@ -2,9 +2,11 @@ Ask: "Ask" Back: "Back" Buy: "Buy" Cancel: "Cancel" +Center: "Center" Close: "Close" Copy: "Copy" Create: "Create" +Delete: "Delete" DisposeOfCorpse: "Dispose of Corpse" Done: "Done" DurationDay: "{days} d " @@ -27,8 +29,10 @@ Hair: "Hair" Info: "Info" Inventory: "Inventory" Item: "Item" +Local: "Local" MagicEffects: "Magic Effects" Mouse: "Mouse" +Move: "Move" Next: "Next" No: "No" None: "None" @@ -52,4 +56,5 @@ Topics: "Topics" Travel: "Travel" UntilHealed: "Until Healed" Wait: "Wait" +World: "World" Yes: "Yes" diff --git a/files/data/l10n/Interface/fr.yaml b/files/data/l10n/Interface/fr.yaml index 24e474fd56..df3f7965e5 100644 --- a/files/data/l10n/Interface/fr.yaml +++ b/files/data/l10n/Interface/fr.yaml @@ -2,10 +2,12 @@ Ask: "Demander" Back: "En arrière" Buy: "Acheter" Cancel: "Annuler" +Center: "Centrer" Close: "Fermer" Copy: "Copier" Create: "Créer" DisposeOfCorpse: "Supprimer cadavre" +Delete: "Effacer" Done: "Fait" DurationDay: |- {days, plural, @@ -27,8 +29,10 @@ Hair: "Cheveux" Info: "Info" Inventory: "Inventaire" Item: "Objet" +Local: "Local" MagicEffects: "Effets magiques" Mouse: "Souris" +Move: "Déplacement" Next: "Suivant" No: "Non" None: "Aucun" @@ -52,4 +56,5 @@ Topics: "Sujets" Travel: "Voyager" UntilHealed: "Récup. totale" Wait: "Attendre" +World: "Monde" Yes: "Oui" diff --git a/files/data/l10n/Interface/pl.yaml b/files/data/l10n/Interface/pl.yaml index 41b3600577..cc8220db23 100644 --- a/files/data/l10n/Interface/pl.yaml +++ b/files/data/l10n/Interface/pl.yaml @@ -2,9 +2,11 @@ Ask: "Zapytaj" Back: "Wstecz" Buy: "Kup" Cancel: "Anuluj" +Center: "Centruj" Close: "Zamknij" Copy: "Kopiuj" Create: "Utwórz" +Delete: "Usuń" DisposeOfCorpse: "Usuń zwłoki" Done: "Koniec" DurationDay: "{days} d. " @@ -25,8 +27,10 @@ Hair: "Włosy" Info: "Info" Inventory: "Ekwipunek" Item: "Przedmiot" +Local: "Okolica" MagicEffects: "Magiczne efekty" Mouse: "Mysz" +Move: "Przenieś" Next: "Nast." No: "Nie" None: "Brak" @@ -50,4 +54,5 @@ Topics: "Tematy" Travel: "Podróż" UntilHealed: "Do wyzdr." Wait: "Czekaj" +World: "Świat" Yes: "Tak" diff --git a/files/data/l10n/Interface/ru.yaml b/files/data/l10n/Interface/ru.yaml index 80f5574403..de1981dcf4 100644 --- a/files/data/l10n/Interface/ru.yaml +++ b/files/data/l10n/Interface/ru.yaml @@ -2,9 +2,11 @@ Ask: "Спросить" Back: "Назад" Buy: "Купить" Cancel: "Отмена" +Center: "Центр" Close: "Закрыть" Copy: "Скопировать" Create: "Создать" +Delete: "Удалить" DisposeOfCorpse: "Убрать тело" Done: "Готово" DurationDay: "{days} д " @@ -24,8 +26,10 @@ Hair: "Прическа" Info: "Инфо" Inventory: "Инвентарь" Item: "Предмет" +Local: "Местность" MagicEffects: "Маг. эффекты" Mouse: "Мышь" +Move: "Переместить" Next: "След" No: "Нет" None: "Нет" @@ -49,4 +53,5 @@ Topics: "Темы" Travel: "Путешествие" UntilHealed: "Выздороветь" Wait: "Ждать" +World: "Мир" Yes: "Да" diff --git a/files/data/l10n/Interface/sv.yaml b/files/data/l10n/Interface/sv.yaml index ff0d9a988e..ed22ff2dcf 100644 --- a/files/data/l10n/Interface/sv.yaml +++ b/files/data/l10n/Interface/sv.yaml @@ -2,9 +2,11 @@ Ask: "Fråga" Back: "Bakåt" Buy: "Köp" Cancel: "Avbryt" +Center: "Centrera" Close: "Stäng" Copy: "Kopiera" Create: "Skapa" +Delete: "Radera" DisposeOfCorpse: "Undanröj liket" Done: "Klar" DurationDay: "{days} d " @@ -27,8 +29,10 @@ 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" @@ -52,4 +56,5 @@ Topics: "Ämnen" Travel: "Res" UntilHealed: "Tills återställd" Wait: "Vänta" +World: "Värld" Yes: "Ja"