From 8c7d34717974e0ee66b5c05c5ca884895c46ed92 Mon Sep 17 00:00:00 2001 From: Petr Mikheev Date: Thu, 22 Dec 2022 18:53:49 +0100 Subject: [PATCH] Reorganize l10n files --- apps/openmw/mwgui/debugwindow.cpp | 6 +- apps/openmw/mwgui/postprocessorhud.cpp | 28 ++--- apps/openmw/mwgui/savegamedialog.cpp | 4 +- apps/openmw/mwgui/settingswindow.cpp | 20 ++-- apps/openmw/mwinput/bindingsmanager.cpp | 10 +- .../detournavigator/asyncnavmeshupdater.cpp | 2 +- files/data/CMakeLists.txt | 49 +++----- files/data/l10n/BuiltInShaders/de.yaml | 7 -- files/data/l10n/DebugMenu/de.yaml | 4 - files/data/l10n/DebugMenu/en.yaml | 4 - files/data/l10n/DebugMenu/fr.yaml | 3 - files/data/l10n/DebugMenu/ru.yaml | 4 - files/data/l10n/DebugMenu/sv.yaml | 3 - files/data/l10n/Navigation/de.yaml | 1 - files/data/l10n/Navigation/en.yaml | 1 - files/data/l10n/Navigation/fr.yaml | 1 - files/data/l10n/Navigation/ru.yaml | 1 - files/data/l10n/Navigation/sv.yaml | 1 - .../l10n/{SettingsMenu => OMWEngine}/de.yaml | 21 ++++ .../l10n/{SettingsMenu => OMWEngine}/en.yaml | 21 ++++ .../l10n/{SettingsMenu => OMWEngine}/fr.yaml | 20 ++++ .../l10n/{SettingsMenu => OMWEngine}/ru.yaml | 21 ++++ .../l10n/{SettingsMenu => OMWEngine}/sv.yaml | 20 ++++ .../{PostProcessing => OMWShaders}/de.yaml | 13 ++ .../{BuiltInShaders => OMWShaders}/en.yaml | 27 +++++ .../{BuiltInShaders => OMWShaders}/fr.yaml | 27 +++++ .../{BuiltInShaders => OMWShaders}/ru.yaml | 27 +++++ .../{BuiltInShaders => OMWShaders}/sv.yaml | 29 ++++- files/data/l10n/PostProcessing/en.yaml | 21 ---- files/data/l10n/PostProcessing/fr.yaml | 21 ---- files/data/l10n/PostProcessing/ru.yaml | 21 ---- files/data/l10n/PostProcessing/sv.yaml | 22 ---- files/data/l10n/SavegameMenu/de.yaml | 2 - files/data/l10n/SavegameMenu/en.yaml | 2 - files/data/l10n/SavegameMenu/fr.yaml | 2 - files/data/l10n/SavegameMenu/ru.yaml | 2 - files/data/l10n/SavegameMenu/sv.yaml | 2 - files/data/mygui/openmw_debug_window.layout | 2 +- .../mygui/openmw_postprocessor_hud.layout | 8 +- .../mygui/openmw_postprocessor_hud.skin.xml | 2 +- .../data/mygui/openmw_savegame_dialog.layout | 2 +- .../data/mygui/openmw_settings_window.layout | 112 +++++++++--------- files/data/shaders/adjustments.omwfx | 10 +- files/data/shaders/bloomlinear.omwfx | 26 ++-- files/data/shaders/debug.omwfx | 14 +-- 45 files changed, 365 insertions(+), 281 deletions(-) delete mode 100644 files/data/l10n/BuiltInShaders/de.yaml delete mode 100644 files/data/l10n/DebugMenu/de.yaml delete mode 100644 files/data/l10n/DebugMenu/en.yaml delete mode 100644 files/data/l10n/DebugMenu/fr.yaml delete mode 100644 files/data/l10n/DebugMenu/ru.yaml delete mode 100644 files/data/l10n/DebugMenu/sv.yaml delete mode 100644 files/data/l10n/Navigation/de.yaml delete mode 100644 files/data/l10n/Navigation/en.yaml delete mode 100644 files/data/l10n/Navigation/fr.yaml delete mode 100644 files/data/l10n/Navigation/ru.yaml delete mode 100644 files/data/l10n/Navigation/sv.yaml rename files/data/l10n/{SettingsMenu => OMWEngine}/de.yaml (92%) rename files/data/l10n/{SettingsMenu => OMWEngine}/en.yaml (92%) rename files/data/l10n/{SettingsMenu => OMWEngine}/fr.yaml (93%) rename files/data/l10n/{SettingsMenu => OMWEngine}/ru.yaml (93%) rename files/data/l10n/{SettingsMenu => OMWEngine}/sv.yaml (93%) rename files/data/l10n/{PostProcessing => OMWShaders}/de.yaml (62%) rename files/data/l10n/{BuiltInShaders => OMWShaders}/en.yaml (63%) rename files/data/l10n/{BuiltInShaders => OMWShaders}/fr.yaml (64%) rename files/data/l10n/{BuiltInShaders => OMWShaders}/ru.yaml (62%) rename files/data/l10n/{BuiltInShaders => OMWShaders}/sv.yaml (59%) delete mode 100644 files/data/l10n/PostProcessing/en.yaml delete mode 100644 files/data/l10n/PostProcessing/fr.yaml delete mode 100644 files/data/l10n/PostProcessing/ru.yaml delete mode 100644 files/data/l10n/PostProcessing/sv.yaml delete mode 100644 files/data/l10n/SavegameMenu/de.yaml delete mode 100644 files/data/l10n/SavegameMenu/en.yaml delete mode 100644 files/data/l10n/SavegameMenu/fr.yaml delete mode 100644 files/data/l10n/SavegameMenu/ru.yaml delete mode 100644 files/data/l10n/SavegameMenu/sv.yaml diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp index fe2fed02bb..2a9ae25664 100644 --- a/apps/openmw/mwgui/debugwindow.cpp +++ b/apps/openmw/mwgui/debugwindow.cpp @@ -104,20 +104,20 @@ namespace MWGui // - Shader editor MyGUI::TabItem* itemLV = mTabControl->addItem("Log Viewer"); - itemLV->setCaptionWithReplacing(" #{DebugMenu:LogViewer} "); + itemLV->setCaptionWithReplacing(" #{OMWEngine:LogViewer} "); mLogView = itemLV->createWidgetReal("LogEdit", MyGUI::FloatCoord(0, 0, 1, 1), MyGUI::Align::Stretch); mLogView->setEditReadOnly(true); MyGUI::TabItem* itemLuaProfiler = mTabControl->addItem("Lua Profiler"); - itemLuaProfiler->setCaptionWithReplacing(" #{DebugMenu:LuaProfiler} "); + itemLuaProfiler->setCaptionWithReplacing(" #{OMWEngine:LuaProfiler} "); mLuaProfiler = itemLuaProfiler->createWidgetReal( "LogEdit", MyGUI::FloatCoord(0, 0, 1, 1), MyGUI::Align::Stretch); mLuaProfiler->setEditReadOnly(true); #ifndef BT_NO_PROFILE MyGUI::TabItem* item = mTabControl->addItem("Physics Profiler"); - item->setCaptionWithReplacing(" #{DebugMenu:PhysicsProfiler} "); + item->setCaptionWithReplacing(" #{OMWEngine:PhysicsProfiler} "); mBulletProfilerEdit = item->createWidgetReal("LogEdit", MyGUI::FloatCoord(0, 0, 1, 1), MyGUI::Align::Stretch); #else diff --git a/apps/openmw/mwgui/postprocessorhud.cpp b/apps/openmw/mwgui/postprocessorhud.cpp index 5f58cb3032..9e05c180ca 100644 --- a/apps/openmw/mwgui/postprocessorhud.cpp +++ b/apps/openmw/mwgui/postprocessorhud.cpp @@ -329,26 +329,22 @@ namespace MWGui case fx::Technique::Status::Uncompiled: { if (technique->getDynamic()) - ss << "#{fontcolourhtml=header}#{PostProcessing:ShaderLocked}: #{fontcolourhtml=normal} " - "#{PostProcessing:ShaderLockedDescription}" + ss << "#{fontcolourhtml=header}#{OMWShaders:ShaderLocked}: #{fontcolourhtml=normal} " + "#{OMWShaders:ShaderLockedDescription}" << endl << endl; - ss << "#{fontcolourhtml=header}#{PostProcessing:Author}: #{fontcolourhtml=normal} " << author + ss << "#{fontcolourhtml=header}#{OMWShaders:Author}: #{fontcolourhtml=normal} " << author << endl + << endl + << "#{fontcolourhtml=header}#{OMWShaders:Version}: #{fontcolourhtml=normal} " << version << endl + << endl + << "#{fontcolourhtml=header}#{OMWShaders:Description}: #{fontcolourhtml=normal} " << description << endl << endl - << "#{fontcolourhtml=header}#{PostProcessing:Version}: #{fontcolourhtml=normal} " << version - << endl - << endl - << "#{fontcolourhtml=header}#{PostProcessing:Description}: #{fontcolourhtml=normal} " << description - << endl - << endl - << "#{fontcolourhtml=header}#{PostProcessing:InInteriors}: #{fontcolourhtml=normal} " - << flag_interior - << "#{fontcolourhtml=header} #{PostProcessing:InExteriors}: #{fontcolourhtml=normal} " - << flag_exterior - << "#{fontcolourhtml=header} #{PostProcessing:Underwater}: #{fontcolourhtml=normal} " + << "#{fontcolourhtml=header}#{OMWShaders:InInteriors}: #{fontcolourhtml=normal} " << flag_interior + << "#{fontcolourhtml=header} #{OMWShaders:InExteriors}: #{fontcolourhtml=normal} " << flag_exterior + << "#{fontcolourhtml=header} #{OMWShaders:Underwater}: #{fontcolourhtml=normal} " << flag_underwater - << "#{fontcolourhtml=header} #{PostProcessing:Abovewater}: #{fontcolourhtml=normal} " + << "#{fontcolourhtml=header} #{OMWShaders:Abovewater}: #{fontcolourhtml=normal} " << flag_abovewater; break; } @@ -370,7 +366,7 @@ namespace MWGui { MyGUI::Button* resetButton = mConfigArea->createWidget("MW_Button", { 0, 0, 0, 24 }, MyGUI::Align::Default); - resetButton->setCaptionWithReplacing("#{PostProcessing:ResetShader}"); + resetButton->setCaptionWithReplacing("#{OMWShaders:ResetShader}"); resetButton->setTextAlign(MyGUI::Align::Center); resetButton->eventMouseWheel += MyGUI::newDelegate(this, &PostProcessorHud::notifyMouseWheel); resetButton->eventMouseButtonClick diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp index 462fab75e0..ae5b8d53f2 100644 --- a/apps/openmw/mwgui/savegamedialog.cpp +++ b/apps/openmw/mwgui/savegamedialog.cpp @@ -216,7 +216,7 @@ namespace MWGui mCharacterSelection->setIndexSelected(selectedIndex); if (selectedIndex == MyGUI::ITEM_NONE) - mCharacterSelection->setCaptionWithReplacing("#{SavegameMenu:SelectCharacter}"); + mCharacterSelection->setCaptionWithReplacing("#{OMWEngine:SelectCharacter}"); fillSaveList(); } @@ -430,7 +430,7 @@ namespace MWGui if (Settings::Manager::getBool("timeplayed", "Saves")) { text << "\n" - << "#{SavegameMenu:TimePlayed}: " << formatTimeplayed(mCurrentSlot->mProfile.mTimePlayed); + << "#{OMWEngine:TimePlayed}: " << formatTimeplayed(mCurrentSlot->mProfile.mTimePlayed); } mInfoText->setCaptionWithReplacing(text.str()); diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp index c06eb7ef7e..d7031fffef 100644 --- a/apps/openmw/mwgui/settingswindow.cpp +++ b/apps/openmw/mwgui/settingswindow.cpp @@ -45,14 +45,14 @@ namespace std::string textureMipmappingToStr(const std::string& val) { if (val == "linear") - return "#{SettingsMenu:TextureFilteringTrilinear}"; + return "#{OMWEngine:TextureFilteringTrilinear}"; if (val == "nearest") - return "#{SettingsMenu:TextureFilteringBilinear}"; + return "#{OMWEngine:TextureFilteringBilinear}"; if (val == "none") - return "#{SettingsMenu:TextureFilteringDisabled}"; + return "#{OMWEngine:TextureFilteringDisabled}"; Log(Debug::Warning) << "Warning: Invalid texture mipmap option: " << val; - return "#{SettingsMenu:TextureFilteringOther}"; + return "#{OMWEngine:TextureFilteringOther}"; } std::string lightingMethodToStr(SceneUtil::LightingMethod method) @@ -61,14 +61,14 @@ namespace switch (method) { case SceneUtil::LightingMethod::FFP: - result = "#{SettingsMenu:LightingMethodLegacy}"; + result = "#{OMWEngine:LightingMethodLegacy}"; break; case SceneUtil::LightingMethod::PerObjectUniform: - result = "#{SettingsMenu:LightingMethodShadersCompatibility}"; + result = "#{OMWEngine:LightingMethodShadersCompatibility}"; break; case SceneUtil::LightingMethod::SingleUBO: default: - result = "#{SettingsMenu:LightingMethodShaders}"; + result = "#{OMWEngine:LightingMethodShaders}"; break; } @@ -533,7 +533,7 @@ namespace MWGui _sender->setCaptionWithReplacing(_sender->getItemNameAt(_sender->getIndexSelected())); MWBase::Environment::get().getWindowManager()->interactiveMessageBox( - "#{SettingsMenu:ChangeRequiresRestart}", { "#{sOK}" }, true); + "#{OMWEngine:ChangeRequiresRestart}", { "#{sOK}" }, true); Settings::Manager::setString("lighting method", "Shaders", *_sender->getItemDataAt(pos)); apply(); @@ -547,7 +547,7 @@ namespace MWGui _sender->setCaptionWithReplacing(_sender->getItemNameAt(_sender->getIndexSelected())); MWBase::Environment::get().getWindowManager()->interactiveMessageBox( - "#{SettingsMenu:ChangeRequiresRestart}", { "#{sOK}" }, true); + "#{OMWEngine:ChangeRequiresRestart}", { "#{sOK}" }, true); std::vector currentLocales = Settings::Manager::getStringArray("preferred locales", "General"); if (currentLocales.size() <= langPriority) @@ -601,7 +601,7 @@ namespace MWGui { std::vector buttons = { "#{sYes}", "#{sNo}" }; MWBase::Environment::get().getWindowManager()->interactiveMessageBox( - "#{SettingsMenu:LightingResetToDefaults}", buttons, true); + "#{OMWEngine:LightingResetToDefaults}", buttons, true); int selectedButton = MWBase::Environment::get().getWindowManager()->readPressedButton(); if (selectedButton == 1 || selectedButton == -1) return; diff --git a/apps/openmw/mwinput/bindingsmanager.cpp b/apps/openmw/mwinput/bindingsmanager.cpp index a010b4e745..9eac57e830 100644 --- a/apps/openmw/mwinput/bindingsmanager.cpp +++ b/apps/openmw/mwinput/bindingsmanager.cpp @@ -441,13 +441,13 @@ namespace MWInput switch (action) { case A_Screenshot: - return "#{SettingsMenu:Screenshot}"; + return "#{OMWEngine:Screenshot}"; case A_ZoomIn: - return "#{SettingsMenu:CameraZoomIn}"; + return "#{OMWEngine:CameraZoomIn}"; case A_ZoomOut: - return "#{SettingsMenu:CameraZoomOut}"; + return "#{OMWEngine:CameraZoomOut}"; case A_ToggleHUD: - return "#{SettingsMenu:ToggleHUD}"; + return "#{OMWEngine:ToggleHUD}"; case A_Use: return "#{sUse}"; case A_Activate: @@ -519,7 +519,7 @@ namespace MWInput case A_QuickLoad: return "#{sQuickLoadCmd}"; case A_TogglePostProcessorHUD: - return "#{SettingsMenu:TogglePostProcessorHUD}"; + return "#{OMWEngine:TogglePostProcessorHUD}"; default: return {}; // not configurable } diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp index 7df9d5d59b..ce6df7f1a4 100644 --- a/components/detournavigator/asyncnavmeshupdater.cpp +++ b/components/detournavigator/asyncnavmeshupdater.cpp @@ -276,7 +276,7 @@ namespace DetourNavigator const Loading::ScopedLoad load(listener); if (listener != nullptr) { - listener->setLabel("#{Navigation:BuildingNavigationMesh}"); + listener->setLabel("#{OMWEngine:BuildingNavigationMesh}"); listener->setProgressRange(maxProgress); } while (!mDone.wait_for(lock, std::chrono::milliseconds(20), isDone)) diff --git a/files/data/CMakeLists.txt b/files/data/CMakeLists.txt index a4df9aa966..f7a703e33a 100644 --- a/files/data/CMakeLists.txt +++ b/files/data/CMakeLists.txt @@ -20,31 +20,21 @@ set(BUILTIN_DATA_FILES fonts/MysticCards.omwfont fonts/MysticCardsFontLicense.txt - l10n/BuiltInShaders/de.yaml - l10n/BuiltInShaders/en.yaml - l10n/BuiltInShaders/ru.yaml - l10n/BuiltInShaders/sv.yaml - l10n/BuiltInShaders/fr.yaml + # Month names and date formatting l10n/Calendar/de.yaml l10n/Calendar/en.yaml l10n/Calendar/ru.yaml l10n/Calendar/sv.yaml l10n/Calendar/fr.yaml - l10n/DebugMenu/de.yaml - l10n/DebugMenu/en.yaml - l10n/DebugMenu/ru.yaml - l10n/DebugMenu/sv.yaml - l10n/DebugMenu/fr.yaml + + # Generic UI messages that can be reused by mods l10n/Interface/de.yaml l10n/Interface/en.yaml l10n/Interface/ru.yaml l10n/Interface/sv.yaml l10n/Interface/fr.yaml - l10n/Navigation/de.yaml - l10n/Navigation/en.yaml - l10n/Navigation/ru.yaml - l10n/Navigation/sv.yaml - l10n/Navigation/fr.yaml + + # L10n for scripts/omw l10n/OMWCamera/de.yaml l10n/OMWCamera/en.yaml l10n/OMWCamera/ru.yaml @@ -52,21 +42,20 @@ set(BUILTIN_DATA_FILES l10n/OMWCamera/fr.yaml l10n/OMWControls/en.yaml l10n/OMWControls/sv.yaml - l10n/PostProcessing/de.yaml - l10n/PostProcessing/en.yaml - l10n/PostProcessing/ru.yaml - l10n/PostProcessing/sv.yaml - l10n/PostProcessing/fr.yaml - l10n/SavegameMenu/de.yaml - l10n/SavegameMenu/en.yaml - l10n/SavegameMenu/ru.yaml - l10n/SavegameMenu/sv.yaml - l10n/SavegameMenu/fr.yaml - l10n/SettingsMenu/de.yaml - l10n/SettingsMenu/en.yaml - l10n/SettingsMenu/ru.yaml - l10n/SettingsMenu/sv.yaml - l10n/SettingsMenu/fr.yaml + + # L10n for OpenMW menus and non-game-specific messages + l10n/OMWEngine/de.yaml + l10n/OMWEngine/en.yaml + l10n/OMWEngine/ru.yaml + l10n/OMWEngine/sv.yaml + l10n/OMWEngine/fr.yaml + + # L10n for post-processing HUD and built-in shaders + l10n/OMWShaders/de.yaml + l10n/OMWShaders/en.yaml + l10n/OMWShaders/ru.yaml + l10n/OMWShaders/sv.yaml + l10n/OMWShaders/fr.yaml openmw_aux/util.lua openmw_aux/time.lua diff --git a/files/data/l10n/BuiltInShaders/de.yaml b/files/data/l10n/BuiltInShaders/de.yaml deleted file mode 100644 index 5886356782..0000000000 --- a/files/data/l10n/BuiltInShaders/de.yaml +++ /dev/null @@ -1,7 +0,0 @@ -DisplayDepthName: "Visualisiert den Tiefenpuffer." -DisplayDepthFactorDescription: "Bestimmt die Korrelation zwischen dem Pixeltiefenwert und seiner Ausgabefarbe. Hohe Werte führen zu einem helleren Bild." -DisplayDepthFactorName: "Farbfaktor" -ContrastLevelDescription: "Kontraststufe" -ContrastLevelName: "Kontrast" -GammaLevelDescription: "Gamma-Level" -GammaLevelName: "Gamma" \ No newline at end of file diff --git a/files/data/l10n/DebugMenu/de.yaml b/files/data/l10n/DebugMenu/de.yaml deleted file mode 100644 index 2ff4abd89f..0000000000 --- a/files/data/l10n/DebugMenu/de.yaml +++ /dev/null @@ -1,4 +0,0 @@ -DebugWindow: "Debug" -LogViewer: "Protokollansicht" -LuaProfiler: "Lua-Profiler" -PhysicsProfiler: "Physik-Profiler" diff --git a/files/data/l10n/DebugMenu/en.yaml b/files/data/l10n/DebugMenu/en.yaml deleted file mode 100644 index 6f76d147c6..0000000000 --- a/files/data/l10n/DebugMenu/en.yaml +++ /dev/null @@ -1,4 +0,0 @@ -DebugWindow: "Debug" -LogViewer: "Log Viewer" -LuaProfiler: "Lua Profiler" -PhysicsProfiler: "Physics Profiler" diff --git a/files/data/l10n/DebugMenu/fr.yaml b/files/data/l10n/DebugMenu/fr.yaml deleted file mode 100644 index 8b6716e5c6..0000000000 --- a/files/data/l10n/DebugMenu/fr.yaml +++ /dev/null @@ -1,3 +0,0 @@ -DebugWindow: "Fenêtre de débogage" -LogViewer: "Journal" -PhysicsProfiler: "Profileur des performances de la physique" diff --git a/files/data/l10n/DebugMenu/ru.yaml b/files/data/l10n/DebugMenu/ru.yaml deleted file mode 100644 index 0cd7131705..0000000000 --- a/files/data/l10n/DebugMenu/ru.yaml +++ /dev/null @@ -1,4 +0,0 @@ -DebugWindow: "Меню отладки" -LogViewer: "Журнал логов" -LuaProfiler: "Профилировщик Луа" -PhysicsProfiler: "Профилировщик физики" diff --git a/files/data/l10n/DebugMenu/sv.yaml b/files/data/l10n/DebugMenu/sv.yaml deleted file mode 100644 index 07807782de..0000000000 --- a/files/data/l10n/DebugMenu/sv.yaml +++ /dev/null @@ -1,3 +0,0 @@ -DebugWindow: "Felsökning" -LogViewer: "Loggvisare" -PhysicsProfiler: "Fysikprofilerare" diff --git a/files/data/l10n/Navigation/de.yaml b/files/data/l10n/Navigation/de.yaml deleted file mode 100644 index c63a9aeb25..0000000000 --- a/files/data/l10n/Navigation/de.yaml +++ /dev/null @@ -1 +0,0 @@ -BuildingNavigationMesh: "Baue Navigationsgitter" diff --git a/files/data/l10n/Navigation/en.yaml b/files/data/l10n/Navigation/en.yaml deleted file mode 100644 index 06fb8c26ba..0000000000 --- a/files/data/l10n/Navigation/en.yaml +++ /dev/null @@ -1 +0,0 @@ -BuildingNavigationMesh: "Building navigation mesh" diff --git a/files/data/l10n/Navigation/fr.yaml b/files/data/l10n/Navigation/fr.yaml deleted file mode 100644 index e7a6f9aecc..0000000000 --- a/files/data/l10n/Navigation/fr.yaml +++ /dev/null @@ -1 +0,0 @@ -BuildingNavigationMesh: "Construction du mesh de navigation" diff --git a/files/data/l10n/Navigation/ru.yaml b/files/data/l10n/Navigation/ru.yaml deleted file mode 100644 index 509c178dea..0000000000 --- a/files/data/l10n/Navigation/ru.yaml +++ /dev/null @@ -1 +0,0 @@ -BuildingNavigationMesh: "Построение навигационной сетки" diff --git a/files/data/l10n/Navigation/sv.yaml b/files/data/l10n/Navigation/sv.yaml deleted file mode 100644 index d7c4780f94..0000000000 --- a/files/data/l10n/Navigation/sv.yaml +++ /dev/null @@ -1 +0,0 @@ -BuildingNavigationMesh: "Bygger navigeringsmesh" diff --git a/files/data/l10n/SettingsMenu/de.yaml b/files/data/l10n/OMWEngine/de.yaml similarity index 92% rename from files/data/l10n/SettingsMenu/de.yaml rename to files/data/l10n/OMWEngine/de.yaml index 80c02597e2..6b9018b5a6 100644 --- a/files/data/l10n/SettingsMenu/de.yaml +++ b/files/data/l10n/OMWEngine/de.yaml @@ -1,3 +1,24 @@ +# Debug window + +DebugWindow: "Debug" +LogViewer: "Protokollansicht" +LuaProfiler: "Lua-Profiler" +PhysicsProfiler: "Physik-Profiler" + + +# Messages + +BuildingNavigationMesh: "Baue Navigationsgitter" + + +# Save game menu + +SelectCharacter: "Charakterauswahl..." +TimePlayed: "Spielzeit" + + +# Settings menu + ActorsProcessingRange: "Akteur-Verarbeitungsreichweite" Anisotropy: "Anisotropie" CameraSensitivity: "Kameraempfindlichkeit" diff --git a/files/data/l10n/SettingsMenu/en.yaml b/files/data/l10n/OMWEngine/en.yaml similarity index 92% rename from files/data/l10n/SettingsMenu/en.yaml rename to files/data/l10n/OMWEngine/en.yaml index fea8ae78b7..e659e69332 100644 --- a/files/data/l10n/SettingsMenu/en.yaml +++ b/files/data/l10n/OMWEngine/en.yaml @@ -1,3 +1,24 @@ +# Debug window + +DebugWindow: "Debug" +LogViewer: "Log Viewer" +LuaProfiler: "Lua Profiler" +PhysicsProfiler: "Physics Profiler" + + +# Messages + +BuildingNavigationMesh: "Building navigation mesh" + + +# Save game menu + +SelectCharacter: "Select Character..." +TimePlayed: "Time played" + + +# Settings menu + ActorsProcessingRange: "Actors Processing Range" Anisotropy: "Anisotropy" CameraSensitivity: "Camera Sensitivity" diff --git a/files/data/l10n/SettingsMenu/fr.yaml b/files/data/l10n/OMWEngine/fr.yaml similarity index 93% rename from files/data/l10n/SettingsMenu/fr.yaml rename to files/data/l10n/OMWEngine/fr.yaml index 29b1a4ec71..b2f4197a64 100644 --- a/files/data/l10n/SettingsMenu/fr.yaml +++ b/files/data/l10n/OMWEngine/fr.yaml @@ -1,3 +1,23 @@ +# Debug window + +DebugWindow: "Fenêtre de débogage" +LogViewer: "Journal" +PhysicsProfiler: "Profileur des performances de la physique" + + +# Messages + +BuildingNavigationMesh: "Construction du mesh de navigation" + + +# Save game menu + +SelectCharacter: "Sélection du personnage..." +TimePlayed: "Temps de jeu" + + +# Settings menu + ActorsProcessingRange: "Distance de traitement pour les personnages" Anisotropy: "Anisotropie" CameraSensitivity: "Sensibilité de la caméra" diff --git a/files/data/l10n/SettingsMenu/ru.yaml b/files/data/l10n/OMWEngine/ru.yaml similarity index 93% rename from files/data/l10n/SettingsMenu/ru.yaml rename to files/data/l10n/OMWEngine/ru.yaml index fc9760c3d6..35beec7f32 100644 --- a/files/data/l10n/SettingsMenu/ru.yaml +++ b/files/data/l10n/OMWEngine/ru.yaml @@ -1,3 +1,24 @@ +# Debug window + +DebugWindow: "Меню отладки" +LogViewer: "Журнал логов" +LuaProfiler: "Профилировщик Луа" +PhysicsProfiler: "Профилировщик физики" + + +# Messages + +BuildingNavigationMesh: "Построение навигационной сетки" + + +# Save game menu + +SelectCharacter: "Выберите персонажа..." +TimePlayed: "Время в игре" + + +# Settings menu + ActorsProcessingRange: "Дальность обработки персонажей" Anisotropy: "Анизотропная фильтрация" CameraSensitivity: "Чувствительность камеры" diff --git a/files/data/l10n/SettingsMenu/sv.yaml b/files/data/l10n/OMWEngine/sv.yaml similarity index 93% rename from files/data/l10n/SettingsMenu/sv.yaml rename to files/data/l10n/OMWEngine/sv.yaml index 865582b76f..704d1f719b 100644 --- a/files/data/l10n/SettingsMenu/sv.yaml +++ b/files/data/l10n/OMWEngine/sv.yaml @@ -1,3 +1,23 @@ +# Debug window + +DebugWindow: "Felsökning" +LogViewer: "Loggvisare" +PhysicsProfiler: "Fysikprofilerare" + + +# Messages + +BuildingNavigationMesh: "Bygger navigeringsmesh" + + +# Save game menu + +SelectCharacter: "Välj spelfigur..." +TimePlayed: "Speltid" + + +# Settings menu + ActorsProcessingRange: "Processavstånd för figurer" Anisotropy: "Anisotropi" CameraSensitivity: "Kamerakänslighet" diff --git a/files/data/l10n/PostProcessing/de.yaml b/files/data/l10n/OMWShaders/de.yaml similarity index 62% rename from files/data/l10n/PostProcessing/de.yaml rename to files/data/l10n/OMWShaders/de.yaml index fb0846555b..7d17199dd9 100644 --- a/files/data/l10n/PostProcessing/de.yaml +++ b/files/data/l10n/OMWShaders/de.yaml @@ -1,3 +1,5 @@ +# Post-processing HUD + Abovewater: "Überwasser" ActiveShaders: "Aktive Shader" Author: "Autor" @@ -19,3 +21,14 @@ ShaderLockedDescription: "Kann nicht umgeschaltet oder verschoben werden, gesteu ShaderResetUniform: "r" Underwater: "Unterwasser" Version: "Version" + + +# Built-in post-processing shaders + +DisplayDepthName: "Visualisiert den Tiefenpuffer." +DisplayDepthFactorDescription: "Bestimmt die Korrelation zwischen dem Pixeltiefenwert und seiner Ausgabefarbe. Hohe Werte führen zu einem helleren Bild." +DisplayDepthFactorName: "Farbfaktor" +ContrastLevelDescription: "Kontraststufe" +ContrastLevelName: "Kontrast" +GammaLevelDescription: "Gamma-Level" +GammaLevelName: "Gamma" diff --git a/files/data/l10n/BuiltInShaders/en.yaml b/files/data/l10n/OMWShaders/en.yaml similarity index 63% rename from files/data/l10n/BuiltInShaders/en.yaml rename to files/data/l10n/OMWShaders/en.yaml index 00354a45ff..8221be933f 100644 --- a/files/data/l10n/BuiltInShaders/en.yaml +++ b/files/data/l10n/OMWShaders/en.yaml @@ -1,3 +1,30 @@ +# Post-processing HUD + +Abovewater: "Abovewater" +ActiveShaders: "Active Shaders" +Author: "Author" +Description: "Description" +InactiveShaders: "Inactive Shaders" +InExteriors: "Exteriors" +InInteriors: "Interiors" +KeyboardControls: | + Keyboard controls: + + Shift+Right-Arrow > Activate shader + Shift+Left-Arrow > Deactive shader + Shift+Up-Arrow > Move shader up + Shift+Down-Arrow > Move shader down +PostProcessHUD: "Postprocess HUD" +ResetShader: "Reset shader to default state" +ShaderLocked: "Locked" +ShaderLockedDescription: "Cannot be toggled or moved, controlled by external Lua script" +ShaderResetUniform: "r" +Underwater: "Underwater" +Version: "Version" + + +# Built-in post-processing shaders + AdjustmentsDescription: "Colour adjustments." BloomDescription: "Bloom shader performing its calculations in (approximately) linear light." DebugDescription: "Debug shader." diff --git a/files/data/l10n/BuiltInShaders/fr.yaml b/files/data/l10n/OMWShaders/fr.yaml similarity index 64% rename from files/data/l10n/BuiltInShaders/fr.yaml rename to files/data/l10n/OMWShaders/fr.yaml index 8e43bd848a..3b4e47370e 100644 --- a/files/data/l10n/BuiltInShaders/fr.yaml +++ b/files/data/l10n/OMWShaders/fr.yaml @@ -1,3 +1,30 @@ +# Post-processing HUD + +Abovewater: "Hors de l'eau" +ActiveShaders: "Shaders actifs" +Author: "Auteur(e)" +Description: "Description" +InactiveShaders: "Shaders inactifs" +InExteriors: "À l'extérieur" +InInteriors: "En intérieur" +KeyboardControls: | + Raccourcis clavier: + + Majuscule+Flèche droite > Active le shader + Majuscule+Flèche gauche > Désactive le shader + Majuscule+Flèche haut > Monte le shader dans la liste + Majuscule+Flèche bas > Descend le shader dans la liste +MainPassDescription: "Transmet les données de la scène aux shaders de post-traitement. Ne peut être déplacé ou supprimé." +PostProcessHUD: "HUD de post-traitement" +ResetShader: "Restaure le shader dans sa configuration par défaut" +ShaderLocked: "Verrouillé" +ShaderResetUniform: "r" +Underwater: "Sous l'eau" +Version: "Version" + + +# Built-in post-processing shaders + AdjustmentsDescription: "Ajustements de l'image (couleurs, luminosité, contrastes...)." BloomDescription: "Flou lumineux, calculé (approximativement) de façon linéaire suivant l'intensité de la lumière." DebugDescription: "Shader de débogage." diff --git a/files/data/l10n/BuiltInShaders/ru.yaml b/files/data/l10n/OMWShaders/ru.yaml similarity index 62% rename from files/data/l10n/BuiltInShaders/ru.yaml rename to files/data/l10n/OMWShaders/ru.yaml index b61c61c29b..b886f72b54 100644 --- a/files/data/l10n/BuiltInShaders/ru.yaml +++ b/files/data/l10n/OMWShaders/ru.yaml @@ -1,3 +1,30 @@ +# Post-processing HUD + +Abovewater: "Над водой" +ActiveShaders: "Включенные шейдеры" +Author: "Автор" +Description: "Описание" +InactiveShaders: "Выключенные шейдеры" +InExteriors: "Вне помещений" +InInteriors: "В помещениях" +KeyboardControls: | + Управление с помощью клавиатуры: + + Shift+Right-Arrow > Включить шейдер + Shift+Left-Arrow > Выключить шейдер + Shift+Up-Arrow > Передвинуть шейдер выше + Shift+Down-Arrow > Передвинуть шейдер ниже +PostProcessHUD: "Настройки постобработки" +ResetShader: "Обнулить настройки этого шейдера" +ShaderLocked: "Заблокирован" +ShaderLockedDescription: "Не может быть выключен или передвинут, управляется внешним Lua-скриптом" +ShaderResetUniform: "x" +Underwater: "Под водой" +Version: "Версия" + + +# Built-in post-processing shaders + AdjustmentsDescription: "Коррекция цвета." DebugDescription: "Отладочный шейдер." DebugHeaderDepth: "Буфер глубины" diff --git a/files/data/l10n/BuiltInShaders/sv.yaml b/files/data/l10n/OMWShaders/sv.yaml similarity index 59% rename from files/data/l10n/BuiltInShaders/sv.yaml rename to files/data/l10n/OMWShaders/sv.yaml index fe9bfc8350..c1f1a5a333 100644 --- a/files/data/l10n/BuiltInShaders/sv.yaml +++ b/files/data/l10n/OMWShaders/sv.yaml @@ -1,3 +1,30 @@ +# Post-processing HUD + +Abovewater: "Ovan vatten" +ActiveShaders: "Aktiva shaders" +Author: "Skapare" # Author = Författare, but författare sounds very book-author-ish. Skapare, meaning "creator", sounds better in Swedish in this case. Ok? +Description: "Beskrivning" +ActiveShaders: "Inaktiva shaders" +InExteriors: "Exteriörer" +InInteriors: "Interiörer" +KeyboardControls: | + Tangentbordskontroller: + + Shift+Högerpil > Aktivera shader + Shift+Vänsterpil > Avaktivera shader + Shift+Pil upp > Flytta shader upp + Shift+Pil ner > Flytta shader ner +PostProcessHUD: "Postprocess HUD" +ResetShader: "Återställ shader to ursprungligt läge" +ShaderLocked: "Låst" +ShaderLockedDescription: "Kan ej aktiveras/inaktiveras eller flyttas. Kontrolleras av externt Lua-skript" +ShaderResetUniform: "r" +Underwater: "Under vatten" +Version: "Version" + + +# Built-in post-processing shaders + AdjustmentsDescription: "Färgjusteringar." BloomDescription: "Bloomshader som utför sina beräkningar i (ungefärligt) linjärt ljus." DebugDescription: "Felsökningsshader." @@ -10,7 +37,7 @@ DisplayNormalsName: "Visualisera normalvektorer" # på engelska står det "pass ContrastLevelDescription: "Kontrastnivå" ContrastLevelName: "Kontrast" GammaLevelDescription: "Gammanivå" -# GammaLevelName: "Gamma" samma som engelska +GammaLevelName: "Gamma" # samma som engelska StrengthLevelName: "Styrka" StrengthLevelDescription: "Effektens styrka." RadiusLevelName: "Radie" diff --git a/files/data/l10n/PostProcessing/en.yaml b/files/data/l10n/PostProcessing/en.yaml deleted file mode 100644 index 5416cd723f..0000000000 --- a/files/data/l10n/PostProcessing/en.yaml +++ /dev/null @@ -1,21 +0,0 @@ -Abovewater: "Abovewater" -ActiveShaders: "Active Shaders" -Author: "Author" -Description: "Description" -InactiveShaders: "Inactive Shaders" -InExteriors: "Exteriors" -InInteriors: "Interiors" -KeyboardControls: | - Keyboard controls: - - Shift+Right-Arrow > Activate shader - Shift+Left-Arrow > Deactive shader - Shift+Up-Arrow > Move shader up - Shift+Down-Arrow > Move shader down -PostProcessHUD: "Postprocess HUD" -ResetShader: "Reset shader to default state" -ShaderLocked: "Locked" -ShaderLockedDescription: "Cannot be toggled or moved, controlled by external Lua script" -ShaderResetUniform: "r" -Underwater: "Underwater" -Version: "Version" diff --git a/files/data/l10n/PostProcessing/fr.yaml b/files/data/l10n/PostProcessing/fr.yaml deleted file mode 100644 index c5500ac09d..0000000000 --- a/files/data/l10n/PostProcessing/fr.yaml +++ /dev/null @@ -1,21 +0,0 @@ -Abovewater: "Hors de l'eau" -ActiveShaders: "Shaders actifs" -Author: "Auteur(e)" -Description: "Description" -InactiveShaders: "Shaders inactifs" -InExteriors: "À l'extérieur" -InInteriors: "En intérieur" -KeyboardControls: | - Raccourcis clavier: - - Majuscule+Flèche droite > Active le shader - Majuscule+Flèche gauche > Désactive le shader - Majuscule+Flèche haut > Monte le shader dans la liste - Majuscule+Flèche bas > Descend le shader dans la liste -MainPassDescription: "Transmet les données de la scène aux shaders de post-traitement. Ne peut être déplacé ou supprimé." -PostProcessHUD: "HUD de post-traitement" -ResetShader: "Restaure le shader dans sa configuration par défaut" -ShaderLocked: "Verrouillé" -ShaderResetUniform: "r" -Underwater: "Sous l'eau" -Version: "Version" diff --git a/files/data/l10n/PostProcessing/ru.yaml b/files/data/l10n/PostProcessing/ru.yaml deleted file mode 100644 index d0a137bb9a..0000000000 --- a/files/data/l10n/PostProcessing/ru.yaml +++ /dev/null @@ -1,21 +0,0 @@ -Abovewater: "Над водой" -ActiveShaders: "Включенные шейдеры" -Author: "Автор" -Description: "Описание" -InactiveShaders: "Выключенные шейдеры" -InExteriors: "Вне помещений" -InInteriors: "В помещениях" -KeyboardControls: | - Управление с помощью клавиатуры: - - Shift+Right-Arrow > Включить шейдер - Shift+Left-Arrow > Выключить шейдер - Shift+Up-Arrow > Передвинуть шейдер выше - Shift+Down-Arrow > Передвинуть шейдер ниже -PostProcessHUD: "Настройки постобработки" -ResetShader: "Обнулить настройки этого шейдера" -ShaderLocked: "Заблокирован" -ShaderLockedDescription: "Не может быть выключен или передвинут, управляется внешним Lua-скриптом" -ShaderResetUniform: "x" -Underwater: "Под водой" -Version: "Версия" diff --git a/files/data/l10n/PostProcessing/sv.yaml b/files/data/l10n/PostProcessing/sv.yaml deleted file mode 100644 index 5c2e11a011..0000000000 --- a/files/data/l10n/PostProcessing/sv.yaml +++ /dev/null @@ -1,22 +0,0 @@ -Abovewater: "Ovan vatten" -ActiveShaders: "Aktiva shaders" -Author: "Skapare" # Author = Författare, but författare sounds very book-author-ish. Skapare, meaning "creator", sounds better in Swedish in this case. Ok? -Description: "Beskrivning" -ActiveShaders: "Inaktiva shaders" -InExteriors: "Exteriörer" -InInteriors: "Interiörer" -KeyboardControls: | - Tangentbordskontroller: - - Shift+Högerpil > Aktivera shader - Shift+Vänsterpil > Avaktivera shader - Shift+Pil upp > Flytta shader upp - Shift+Pil ner > Flytta shader ner -PostProcessHUD: "Postprocess HUD" -ResetShader: "Återställ shader to ursprungligt läge" -ShaderLocked: "Låst" -ShaderLockedDescription: "Kan ej aktiveras/inaktiveras eller flyttas. Kontrolleras av externt Lua-skript" -ShaderResetUniform: "r" -Underwater: "Under vatten" -Version: "Version" - diff --git a/files/data/l10n/SavegameMenu/de.yaml b/files/data/l10n/SavegameMenu/de.yaml deleted file mode 100644 index 225b6c3a07..0000000000 --- a/files/data/l10n/SavegameMenu/de.yaml +++ /dev/null @@ -1,2 +0,0 @@ -SelectCharacter: "Charakterauswahl..." -TimePlayed: "Spielzeit" diff --git a/files/data/l10n/SavegameMenu/en.yaml b/files/data/l10n/SavegameMenu/en.yaml deleted file mode 100644 index b7e3c60a5f..0000000000 --- a/files/data/l10n/SavegameMenu/en.yaml +++ /dev/null @@ -1,2 +0,0 @@ -SelectCharacter: "Select Character..." -TimePlayed: "Time played" diff --git a/files/data/l10n/SavegameMenu/fr.yaml b/files/data/l10n/SavegameMenu/fr.yaml deleted file mode 100644 index 15bc37b4a7..0000000000 --- a/files/data/l10n/SavegameMenu/fr.yaml +++ /dev/null @@ -1,2 +0,0 @@ -SelectCharacter: "Sélection du personnage..." -TimePlayed: "Temps de jeu" diff --git a/files/data/l10n/SavegameMenu/ru.yaml b/files/data/l10n/SavegameMenu/ru.yaml deleted file mode 100644 index 8b87500bd3..0000000000 --- a/files/data/l10n/SavegameMenu/ru.yaml +++ /dev/null @@ -1,2 +0,0 @@ -SelectCharacter: "Выберите персонажа..." -TimePlayed: "Время в игре" diff --git a/files/data/l10n/SavegameMenu/sv.yaml b/files/data/l10n/SavegameMenu/sv.yaml deleted file mode 100644 index ef23465f6c..0000000000 --- a/files/data/l10n/SavegameMenu/sv.yaml +++ /dev/null @@ -1,2 +0,0 @@ -SelectCharacter: "Välj spelfigur..." -TimePlayed: "Speltid" diff --git a/files/data/mygui/openmw_debug_window.layout b/files/data/mygui/openmw_debug_window.layout index a2635c3c46..7019c5292d 100644 --- a/files/data/mygui/openmw_debug_window.layout +++ b/files/data/mygui/openmw_debug_window.layout @@ -1,7 +1,7 @@ - + diff --git a/files/data/mygui/openmw_postprocessor_hud.layout b/files/data/mygui/openmw_postprocessor_hud.layout index 0c2868435a..4ed8ecdb36 100644 --- a/files/data/mygui/openmw_postprocessor_hud.layout +++ b/files/data/mygui/openmw_postprocessor_hud.layout @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -80,7 +80,7 @@ - + diff --git a/files/data/mygui/openmw_postprocessor_hud.skin.xml b/files/data/mygui/openmw_postprocessor_hud.skin.xml index b25b7f1372..35ab652f2c 100644 --- a/files/data/mygui/openmw_postprocessor_hud.skin.xml +++ b/files/data/mygui/openmw_postprocessor_hud.skin.xml @@ -59,7 +59,7 @@ - + diff --git a/files/data/mygui/openmw_savegame_dialog.layout b/files/data/mygui/openmw_savegame_dialog.layout index d2d8df295f..a1cdba89ab 100644 --- a/files/data/mygui/openmw_savegame_dialog.layout +++ b/files/data/mygui/openmw_savegame_dialog.layout @@ -6,7 +6,7 @@ - + diff --git a/files/data/mygui/openmw_settings_window.layout b/files/data/mygui/openmw_settings_window.layout index 0569751191..59e9d44ecc 100644 --- a/files/data/mygui/openmw_settings_window.layout +++ b/files/data/mygui/openmw_settings_window.layout @@ -75,7 +75,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -204,10 +204,10 @@ - + - + @@ -226,7 +226,7 @@ - + @@ -238,7 +238,7 @@ - + @@ -277,13 +277,13 @@ - + - - - + + + @@ -293,7 +293,7 @@ - + @@ -303,7 +303,7 @@ - + @@ -313,15 +313,15 @@ - + - + - + @@ -339,7 +339,7 @@ - + @@ -375,17 +375,17 @@ - + - - + + - + @@ -394,7 +394,7 @@ - + @@ -435,7 +435,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -463,14 +463,14 @@ - + - + @@ -489,7 +489,7 @@ - + @@ -498,12 +498,12 @@ - - - - - - + + + + + + @@ -511,7 +511,7 @@ - + @@ -521,9 +521,9 @@ - - - + + + @@ -532,10 +532,10 @@ - + - + @@ -546,7 +546,7 @@ - + @@ -554,7 +554,7 @@ - + @@ -567,7 +567,7 @@ - + @@ -579,13 +579,13 @@ - + - + @@ -597,13 +597,13 @@ - + - + @@ -615,13 +615,13 @@ - + - + @@ -631,7 +631,7 @@ - + @@ -640,10 +640,10 @@ - + - + @@ -681,24 +681,24 @@ - + - + - + - + - + - + diff --git a/files/data/shaders/adjustments.omwfx b/files/data/shaders/adjustments.omwfx index dff182d422..4a9d8ab73b 100644 --- a/files/data/shaders/adjustments.omwfx +++ b/files/data/shaders/adjustments.omwfx @@ -3,8 +3,8 @@ uniform_float uGamma { step = 0.01; min = 0.0; max = 5.0; - display_name = "#{BuiltInShaders:GammaLevelName}"; - description = "#{BuiltInShaders:GammaLevelDescription}"; + display_name = "#{OMWShaders:GammaLevelName}"; + description = "#{OMWShaders:GammaLevelDescription}"; } uniform_float uContrast { @@ -12,8 +12,8 @@ uniform_float uContrast { step = 0.01; min = 0.0; max = 5.0; - display_name = "#{BuiltInShaders:ContrastLevelName}"; - description = "#{BuiltInShaders:ContrastLevelDescription}"; + display_name = "#{OMWShaders:ContrastLevelName}"; + description = "#{OMWShaders:ContrastLevelDescription}"; } fragment main { @@ -31,7 +31,7 @@ fragment main { } technique { - description = "#{BuiltInShaders:AdjustmentsDescription}"; + description = "#{OMWShaders:AdjustmentsDescription}"; version = "1.0"; author = "OpenMW"; passes = main; diff --git a/files/data/shaders/bloomlinear.omwfx b/files/data/shaders/bloomlinear.omwfx index a0b78e4026..3de7139f39 100644 --- a/files/data/shaders/bloomlinear.omwfx +++ b/files/data/shaders/bloomlinear.omwfx @@ -3,48 +3,48 @@ uniform_float uGamma { min = 0.1; max = 4.0; step = 0.01; - display_name = "#{BuiltInShaders:GammaLevelName}"; - description = "#{BuiltInShaders:GammaLevelDescription}"; + display_name = "#{OMWShaders:GammaLevelName}"; + description = "#{OMWShaders:GammaLevelDescription}"; } uniform_float uThreshold { default = 0.35; min = 0.0; max = 1.0; step = 0.01; - display_name = "#{BuiltInShaders:BloomThresholdLevelName}"; - description = "#{BuiltInShaders:BloomThresholdLevelDescription}"; + display_name = "#{OMWShaders:BloomThresholdLevelName}"; + description = "#{OMWShaders:BloomThresholdLevelDescription}"; } uniform_float uClamp { default = 1.0; min = 0.0; max = 1.0; step = 0.01; - display_name = "#{BuiltInShaders:BloomClampLevelName}"; - description = "#{BuiltInShaders:BloomClampLevelDescription}"; + display_name = "#{OMWShaders:BloomClampLevelName}"; + description = "#{OMWShaders:BloomClampLevelDescription}"; } uniform_float uSkyFactor { default = 0.5; min = 0.0; max = 2.0; step = 0.01; - display_name = "#{BuiltInShaders:SkyFactorLevelName}"; - description = "#{BuiltInShaders:SkyFactorLevelDescription}"; + display_name = "#{OMWShaders:SkyFactorLevelName}"; + description = "#{OMWShaders:SkyFactorLevelDescription}"; } uniform_float uRadius { default = 0.5; min = 0.0; max = 1.0; step = 0.01; - display_name = "#{BuiltInShaders:RadiusLevelName}"; - description = "#{BuiltInShaders:RadiusLevelDescription}"; + display_name = "#{OMWShaders:RadiusLevelName}"; + description = "#{OMWShaders:RadiusLevelDescription}"; } uniform_float uStrength { default = 0.25; min = 0.0; max = 1.0; step = 0.01; - display_name = "#{BuiltInShaders:StrengthLevelName}"; - description = "#{BuiltInShaders:StrengthLevelDescription}"; + display_name = "#{OMWShaders:StrengthLevelName}"; + description = "#{OMWShaders:StrengthLevelDescription}"; } shared { @@ -215,7 +215,7 @@ fragment final(rt1=RT_Vertical) { technique { passes = nomipmap, horizontal, vertical, final; - description = "#{BuiltInShaders:BloomDescription}"; + description = "#{OMWShaders:BloomDescription}"; author = "OpenMW"; version = "1.0"; } diff --git a/files/data/shaders/debug.omwfx b/files/data/shaders/debug.omwfx index addcbf6c38..4bfeea2499 100644 --- a/files/data/shaders/debug.omwfx +++ b/files/data/shaders/debug.omwfx @@ -1,7 +1,7 @@ uniform_bool uDisplayDepth { - header = "#{BuiltInShaders:DebugHeaderDepth}"; + header = "#{OMWShaders:DebugHeaderDepth}"; default = true; - display_name = "#{BuiltInShaders:DisplayDepthName}"; + display_name = "#{OMWShaders:DisplayDepthName}"; } uniform_float uDepthFactor { @@ -9,14 +9,14 @@ uniform_float uDepthFactor { min = 0.01; max = 20.0; default = 1.0; - display_name = "#{BuiltInShaders:DisplayDepthFactorName}"; - description = "#{BuiltInShaders:DisplayDepthFactorDescription}"; + display_name = "#{OMWShaders:DisplayDepthFactorName}"; + description = "#{OMWShaders:DisplayDepthFactorDescription}"; } uniform_bool uDisplayNormals { - header = "#{BuiltInShaders:DebugHeaderNormals}"; + header = "#{OMWShaders:DebugHeaderNormals}"; default = true; - display_name = "#{BuiltInShaders:DisplayNormalsName}"; + display_name = "#{OMWShaders:DisplayNormalsName}"; } fragment main { @@ -38,7 +38,7 @@ fragment main { technique { passes = main; - description = "#{BuiltInShaders:DebugDescription}"; + description = "#{OMWShaders:DebugDescription}"; author = "OpenMW"; version = "1.0"; pass_normals = true;