From 536ffb3f31a88532d1091faaab768879b536afcc Mon Sep 17 00:00:00 2001 From: test1232156 <126501603+test1232156@users.noreply.github.com> Date: Sat, 17 Aug 2024 09:57:06 +0300 Subject: [PATCH] Fix spelling errors and add naming consistency to translation keys Co-Authored-By: Gustas <37534529+punkpun@users.noreply.github.com> --- mods/cnc/chrome/editor.yaml | 2 +- mods/cnc/chrome/ingame.yaml | 2 +- mods/cnc/chrome/lobby-music.yaml | 4 ++-- mods/cnc/chrome/mainmenu-prompts.yaml | 4 ++-- mods/cnc/chrome/music.yaml | 4 ++-- mods/cnc/chrome/settings-input.yaml | 4 ++-- mods/cnc/languages/chrome/en.ftl | 18 +++++++-------- mods/cnc/languages/lua/en.ftl | 6 ++--- mods/cnc/languages/rules/en.ftl | 10 ++++----- .../eviction-notice/eviction-notice-AI.lua | 2 +- .../maps/eviction-notice/eviction-notice.lua | 2 +- mods/cnc/maps/nod07c/nod07c.lua | 2 +- mods/cnc/rules/defaults.yaml | 10 ++++----- mods/common/chrome/editor.yaml | 2 +- .../common/chrome/ingame-infoscripterror.yaml | 6 ++--- mods/common/chrome/lobby-music.yaml | 4 ++-- mods/common/chrome/mainmenu-prompts.yaml | 6 ++--- mods/common/chrome/musicplayer.yaml | 4 ++-- mods/common/chrome/settings-input.yaml | 4 ++-- mods/common/languages/chrome/en.ftl | 16 +++++++------- mods/d2k/chrome/ingame-observer.yaml | 2 +- mods/d2k/languages/campaign/en.ftl | 2 +- mods/d2k/languages/chrome/en.ftl | 2 +- mods/d2k/languages/lua/en.ftl | 2 +- mods/d2k/languages/rules/en.ftl | 8 +++---- mods/d2k/maps/harkonnen-04/harkonnen04.lua | 2 +- mods/d2k/maps/harkonnen-05/rules.yaml | 2 +- mods/d2k/maps/ordos-04/rules.yaml | 2 +- mods/d2k/rules/player.yaml | 14 ++++++------ mods/d2k/rules/structures.yaml | 12 +++++----- mods/ra/languages/lua/en.ftl | 22 +++++++++---------- mods/ra/languages/rules/en.ftl | 6 ++--- mods/ra/maps/allies-05a/allies05a.lua | 2 +- mods/ra/maps/allies-05b/allies05b.lua | 2 +- mods/ra/maps/allies-05c/allies05c.lua | 2 +- mods/ra/maps/allies-06a/allies06a.lua | 2 +- mods/ra/maps/allies-06b/allies06b.lua | 2 +- mods/ra/maps/allies-08a/allies08a.lua | 2 +- mods/ra/maps/allies-08b/allies08b.lua | 2 +- .../personal-war.lua | 2 +- .../evacuation.lua | 6 ++--- mods/ra/maps/soviet-09/soviet09.lua | 2 +- mods/ra/maps/survival01/survival01.lua | 2 +- mods/ra/maps/top-o-the-world/rules.yaml | 2 +- .../maps/top-o-the-world/top-o-the-world.lua | 2 +- mods/ra/rules/defaults.yaml | 4 ++-- mods/ra/rules/structures.yaml | 2 +- mods/ts/chrome/ingame-observer.yaml | 2 +- mods/ts/languages/chrome/en.ftl | 2 +- mods/ts/languages/rules/en.ftl | 20 +++++++---------- mods/ts/rules/bridges.yaml | 12 +++++----- mods/ts/rules/gdi-vehicles.yaml | 2 +- mods/ts/rules/nod-structures.yaml | 2 +- mods/ts/rules/nod-vehicles.yaml | 6 ++--- mods/ts/rules/shared-vehicles.yaml | 2 +- 55 files changed, 134 insertions(+), 138 deletions(-) diff --git a/mods/cnc/chrome/editor.yaml b/mods/cnc/chrome/editor.yaml index e4bf279f02..9d5ad2014c 100644 --- a/mods/cnc/chrome/editor.yaml +++ b/mods/cnc/chrome/editor.yaml @@ -389,7 +389,7 @@ Container@EDITOR_WORLD_ROOT: Y: 49 Width: PARENT_RIGHT - 5 Height: 25 - Text: label-actors-bg-owners + Text: label-actor-bg-owner Align: Right Font: TinyBold TextField@SEARCH_TEXTFIELD: diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index 57877997de..7c40258437 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/mods/cnc/chrome/ingame.yaml @@ -144,7 +144,7 @@ Container@OBSERVER_WIDGETS: Y: 5 Width: 30 Height: 25 - TooltipText: button-observer-widgets-options-tooltip + TooltipText: button-observer-widget-options-tooltip TooltipContainer: TOOLTIP_CONTAINER DisableWorldSounds: true Children: diff --git a/mods/cnc/chrome/lobby-music.yaml b/mods/cnc/chrome/lobby-music.yaml index d79be24d94..b121c0a256 100644 --- a/mods/cnc/chrome/lobby-music.yaml +++ b/mods/cnc/chrome/lobby-music.yaml @@ -185,11 +185,11 @@ Container@LOBBY_MUSIC_BIN: Width: PARENT_RIGHT - 24 Height: 25 Align: Center - Text: label-no-music-desca + Text: label-no-music-desc-a Label@DESCB: Y: 115 Width: PARENT_RIGHT - 24 Height: 25 Align: Center - Text: label-no-music-descb + Text: label-no-music-desc-b diff --git a/mods/cnc/chrome/mainmenu-prompts.yaml b/mods/cnc/chrome/mainmenu-prompts.yaml index 4e9625cfec..f8fb53fa37 100644 --- a/mods/cnc/chrome/mainmenu-prompts.yaml +++ b/mods/cnc/chrome/mainmenu-prompts.yaml @@ -145,7 +145,7 @@ Container@MAINMENU_INTRODUCTION_PROMPT: Width: PARENT_RIGHT Height: 16 Font: Small - Text: label-mouse-control-desc-classic-buildigs + Text: label-mouse-control-desc-classic-buildings LabelWithHighlight@DESC_SUPPORT: Y: 51 Width: PARENT_RIGHT @@ -203,7 +203,7 @@ Container@MAINMENU_INTRODUCTION_PROMPT: Width: PARENT_RIGHT Height: 16 Font: Small - Text: label-mouse-control-desc-modern-buildigs + Text: label-mouse-control-desc-modern-buildings LabelWithHighlight@DESC_SUPPORT: Y: 51 Width: PARENT_RIGHT diff --git a/mods/cnc/chrome/music.yaml b/mods/cnc/chrome/music.yaml index 76e4399d90..3bd660351c 100644 --- a/mods/cnc/chrome/music.yaml +++ b/mods/cnc/chrome/music.yaml @@ -176,13 +176,13 @@ Container@MUSIC_PANEL: Width: PARENT_RIGHT - 24 Height: 25 Align: Center - Text: label-no-music-desca + Text: label-no-music-desc-a Label@DESCB: Y: 40 Width: PARENT_RIGHT - 24 Height: 25 Align: Center - Text: label-no-music-descb + Text: label-no-music-desc-b Button@BACK_BUTTON: Key: escape X: 0 diff --git a/mods/cnc/chrome/settings-input.yaml b/mods/cnc/chrome/settings-input.yaml index 7dcc880fce..b75fd03ec5 100644 --- a/mods/cnc/chrome/settings-input.yaml +++ b/mods/cnc/chrome/settings-input.yaml @@ -76,7 +76,7 @@ Container@INPUT_PANEL: Width: PARENT_RIGHT Height: 16 Font: Small - Text: label-mouse-control-desc-classic-buildigs + Text: label-mouse-control-desc-classic-buildings LabelWithHighlight@DESC_SUPPORT: Y: 51 Width: PARENT_RIGHT @@ -135,7 +135,7 @@ Container@INPUT_PANEL: Width: PARENT_RIGHT Height: 16 Font: Small - Text: label-mouse-control-desc-modern-buildigs + Text: label-mouse-control-desc-modern-buildings LabelWithHighlight@DESC_SUPPORT: Y: 51 Width: PARENT_RIGHT diff --git a/mods/cnc/languages/chrome/en.ftl b/mods/cnc/languages/chrome/en.ftl index 15df182d41..d0c264886a 100644 --- a/mods/cnc/languages/chrome/en.ftl +++ b/mods/cnc/languages/chrome/en.ftl @@ -61,7 +61,7 @@ button-editor-world-root-options-tooltip = Menu label-tiles-bg-search = Search: label-bg-filter = Filter: label-actors-bg-search = Search: -label-actors-bg-owners = Owner: +label-actor-bg-owner = Owner: label-area-selection = Area Selection label-area-info = Area Info label-selected-area-diagonal = Diagonal: @@ -158,9 +158,9 @@ label-game-info-panel-title = Game Information label-mission-objectives = Mission: ## ingame-infoscripterror.yaml -label-script-error-panel-desca = The map script has encountered a fatal error -label-script-error-panel-descb = The details of the error have been saved to lua.log in the logs directory. -label-script-error-panel-descc = Please send this file to the map author so that they can fix this issue. +label-script-error-panel-desc-a = The map script has encountered a fatal error +label-script-error-panel-desc-b = The details of the error have been saved to lua.log in the logs directory. +label-script-error-panel-desc-c = Please send this file to the map author so that they can fix this issue. ## ingame-infostats.yaml label-objective-mission = Mission: @@ -171,7 +171,7 @@ label-stats-score = Score label-stats-actions = Actions ## ingame.yaml -button-observer-widgets-options-tooltip = Menu +button-observer-widget-options-tooltip = Menu button-replay-player-pause-tooltip = Pause button-replay-player-play-tooltip = Play @@ -379,8 +379,8 @@ checkbox-music-controls-shuffle = Shuffle checkbox-music-controls-loop = Loop label-container-title = Track label-no-music-title = Music Not Installed -label-no-music-desca = The game music can be installed -label-no-music-descb = from the "Manage Content" menu. +label-no-music-desc-a = The game music can be installed +label-no-music-desc-b = from the "Manage Content" menu. ## lobby-options.yaml label-lobby-options-bin-title = Map Options @@ -445,7 +445,7 @@ label-input-section-header = Input label-mouse-control-container = Control Scheme: label-mouse-control-desc-classic-selection = - Select units using the mouse button label-mouse-control-desc-classic-commands = - Command units using the mouse button -label-mouse-control-desc-classic-buildigs = - Place structures using the mouse button +label-mouse-control-desc-classic-buildings = - Place structures using the mouse button label-mouse-control-desc-classic-support = - Target support powers using the mouse button label-mouse-control-desc-classic-zoom = - Zoom the battlefield using the label-mouse-control-desc-classic-zoom-modifier = - Zoom the battlefield using @@ -454,7 +454,7 @@ label-mouse-control-desc-classic-scroll-middle = - Pan the battlefield using the label-mouse-control-desc-classic-edgescroll = or by moving the cursor to the edge of the screen label-mouse-control-desc-modern-selection = - Select units using the mouse button label-mouse-control-desc-modern-commands = - Command units using the mouse button -label-mouse-control-desc-modern-buildigs = - Place structures using the mouse button +label-mouse-control-desc-modern-buildings = - Place structures using the mouse button label-mouse-control-desc-modern-support = - Target support powers using the mouse button label-mouse-control-desc-modern-zoom = - Zoom the battlefield using the label-mouse-control-desc-modern-zoom-modifier = - Zoom the battlefield using diff --git a/mods/cnc/languages/lua/en.ftl b/mods/cnc/languages/lua/en.ftl index 4d02df461e..961794e71b 100644 --- a/mods/cnc/languages/lua/en.ftl +++ b/mods/cnc/languages/lua/en.ftl @@ -116,7 +116,7 @@ eliminate-gdi-forces = Eliminate all GDI forces in the area. ## nod07c capture-gdi-helipad = Capture the GDI helipad. -dont-capture-or-destroy = Don't capture or destroy any other +do-not-capture-or-destroy = Don't capture or destroy any other GDI main building. orca-wreak-havoc = Use the GDI orca to wreak havoc at the village. distract-guards = Distract the guards by attacking the @@ -147,8 +147,8 @@ take-civilians-money-crates = Find all the civilians' money. quickly-destroy-ion-cannon = Disable GDI Ion Cannon before it fires two times. nod-soldier = Nod Soldier -civilians-runs = Hey, those civilians... where are they going? -destroy-ion-cannon-advise = The GDI are preparing their ion cannon. Don't let them get used to it. +civilians-running = Hey, those civilians... where are they going? +destroy-ion-cannon-advice = The GDI are preparing their ion cannon. Don't let them get used to it. village-destruction-warning = Be careful, commander. The GDI won't stand still while we burn the entire village. ## twist-of-fate diff --git a/mods/cnc/languages/rules/en.ftl b/mods/cnc/languages/rules/en.ftl index 63c5a290e2..f1188af8b1 100644 --- a/mods/cnc/languages/rules/en.ftl +++ b/mods/cnc/languages/rules/en.ftl @@ -55,7 +55,7 @@ faction-nod = notification-unit-lost = Unit lost. notification-unit-promoted = Unit promoted. notification-building-captured = Building captured. -notification-civilian-building-captured = Civilian Building captured. +notification-civ-building-captured = Civilian Building captured. notification-structure-lost = Structure lost. ## aircraft.yaml @@ -176,12 +176,12 @@ meta-civbuildinghusk-generic-name = Civilian Building (Destroyed) meta-civfield-generic-name = Field meta-civhaystackorigloo = - .winter--name = Igloo - .summer--name = Haystacks + .winter-name = Igloo + .summer-name = Haystacks meta-civhaystackorigloohusk = - .winter--name = Igloo (Destroyed) - .summer--name = Haystacks (Destroyed) + .winter-name = Igloo (Destroyed) + .summer-name = Haystacks (Destroyed) meta-tree-name = Tree meta-treehusk-name = Tree (Burnt) diff --git a/mods/cnc/maps/eviction-notice/eviction-notice-AI.lua b/mods/cnc/maps/eviction-notice/eviction-notice-AI.lua index 4c7263440f..ceb51d3545 100644 --- a/mods/cnc/maps/eviction-notice/eviction-notice-AI.lua +++ b/mods/cnc/maps/eviction-notice/eviction-notice-AI.lua @@ -139,7 +139,7 @@ InitAi = function() if not GDIAdvComCenter.IsDead then IonCannonOnline = true - Media.DisplayMessage(UserInterface.Translate("destroy-ion-cannon-advise")) + Media.DisplayMessage(UserInterface.Translate("destroy-ion-cannon-advice")) DestroyIonCannon = AddSecondaryObjective(Nod, "quickly-destroy-ion-cannon") end end) diff --git a/mods/cnc/maps/eviction-notice/eviction-notice.lua b/mods/cnc/maps/eviction-notice/eviction-notice.lua index 01d0c8edb3..fa04632d67 100644 --- a/mods/cnc/maps/eviction-notice/eviction-notice.lua +++ b/mods/cnc/maps/eviction-notice/eviction-notice.lua @@ -90,7 +90,7 @@ RunForHelp = function() CivsRunning = true local cam = Actor.Create("camera", true, { Owner = Nod, Location = CPos.New(53,44) }) Trigger.AfterDelay(125, cam.Destroy) - Media.DisplayMessage(UserInterface.Translate("civilians-runs"), UserInterface.Translate("nod-soldier")) + Media.DisplayMessage(UserInterface.Translate("civilians-running"), UserInterface.Translate("nod-soldier")) end end diff --git a/mods/cnc/maps/nod07c/nod07c.lua b/mods/cnc/maps/nod07c/nod07c.lua index 6c0932c24f..914a2301ac 100644 --- a/mods/cnc/maps/nod07c/nod07c.lua +++ b/mods/cnc/maps/nod07c/nod07c.lua @@ -142,7 +142,7 @@ WorldLoaded = function() end) CaptureHelipad = AddPrimaryObjective(Nod, "capture-gdi-helipad") - NoCaptureObjective = AddPrimaryObjective(Nod, "dont-capture-or-destroy") + NoCaptureObjective = AddPrimaryObjective(Nod, "do-not-capture-or-destroy") UseOrcaObjective = AddPrimaryObjective(Nod, "orca-wreak-havoc") DistractGuardsObjective = AddSecondaryObjective(Nod, "distract-guards") GDIObjective = AddPrimaryObjective(GDI, "") diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 2ac5b7ffcf..521acc0078 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -800,7 +800,7 @@ Types: building CaptureNotification: Notification: CivilianBuildingCaptured - TextNotification: notification-civilian-building-captured + TextNotification: notification-civ-building-captured RepairableBuilding: RepairPercent: 40 RepairStep: 1400 @@ -843,12 +843,12 @@ Condition: winter TileSets: SNOW, WINTER Tooltip@WINTER: - Name: meta-civhaystackorigloo.winter--name + Name: meta-civhaystackorigloo.winter-name RequiresCondition: winter GenericVisibility: None ShowOwnerRow: false Tooltip@SUMMER: - Name: meta-civhaystackorigloo.summer--name + Name: meta-civhaystackorigloo.summer-name RequiresCondition: !winter GenericVisibility: None ShowOwnerRow: false @@ -879,12 +879,12 @@ Condition: winter TileSets: SNOW, WINTER Tooltip@WINTER: - Name: meta-civhaystackorigloohusk.winter--name + Name: meta-civhaystackorigloohusk.winter-name RequiresCondition: winter GenericVisibility: None ShowOwnerRow: false Tooltip@SUMMER: - Name: meta-civhaystackorigloohusk.summer--name + Name: meta-civhaystackorigloohusk.summer-name RequiresCondition: !winter GenericVisibility: None ShowOwnerRow: false diff --git a/mods/common/chrome/editor.yaml b/mods/common/chrome/editor.yaml index 9da3dadf88..b97d26c15d 100644 --- a/mods/common/chrome/editor.yaml +++ b/mods/common/chrome/editor.yaml @@ -359,7 +359,7 @@ Container@EDITOR_WORLD_ROOT: Y: 60 Width: 55 Height: 25 - Text: label-actors-bg-owners + Text: label-actor-bg-owner Align: Right Font: TinyBold DropDownButton@OWNERS_DROPDOWN: diff --git a/mods/common/chrome/ingame-infoscripterror.yaml b/mods/common/chrome/ingame-infoscripterror.yaml index 0ef52fd904..f1428cfca9 100644 --- a/mods/common/chrome/ingame-infoscripterror.yaml +++ b/mods/common/chrome/ingame-infoscripterror.yaml @@ -10,7 +10,7 @@ Container@SCRIPT_ERROR_PANEL: Height: 20 Font: Bold Align: Center - Text: label-script-error-panel-desca + Text: label-script-error-panel-desc-a Label@DESCB: X: 15 Y: 46 @@ -18,7 +18,7 @@ Container@SCRIPT_ERROR_PANEL: Height: 20 Font: Regular Align: Center - Text: label-script-error-panel-descb + Text: label-script-error-panel-desc-b Label@DESCC: X: 15 Y: 66 @@ -26,7 +26,7 @@ Container@SCRIPT_ERROR_PANEL: Height: 20 Font: Regular Align: Center - Text: label-script-error-panel-descc + Text: label-script-error-panel-desc-c ScrollPanel@SCRIPT_ERROR_MESSAGE_PANEL: X: 20 Y: 96 diff --git a/mods/common/chrome/lobby-music.yaml b/mods/common/chrome/lobby-music.yaml index 2e1cd06058..aedd3f2810 100644 --- a/mods/common/chrome/lobby-music.yaml +++ b/mods/common/chrome/lobby-music.yaml @@ -175,11 +175,11 @@ Container@LOBBY_MUSIC_BIN: Width: PARENT_RIGHT - 24 Height: 25 Align: Center - Text: label-no-music-desca + Text: label-no-music-desc-a Label@DESCB: Y: 116 Width: PARENT_RIGHT - 24 Height: 25 Align: Center - Text: label-no-music-descb + Text: label-no-music-desc-b diff --git a/mods/common/chrome/mainmenu-prompts.yaml b/mods/common/chrome/mainmenu-prompts.yaml index fca28af601..466194e66c 100644 --- a/mods/common/chrome/mainmenu-prompts.yaml +++ b/mods/common/chrome/mainmenu-prompts.yaml @@ -139,7 +139,7 @@ Background@MAINMENU_INTRODUCTION_PROMPT: Width: PARENT_RIGHT Height: 16 Font: Small - Text: label-mouse-control-desc-classic-buildigs + Text: label-mouse-control-desc-classic-buildings LabelWithHighlight@DESC_SUPPORT: Y: 51 Width: PARENT_RIGHT @@ -192,12 +192,12 @@ Background@MAINMENU_INTRODUCTION_PROMPT: Height: 16 Font: Small Text: label-mouse-control-desc-modern-commands - LabelWithHighlight@DESC_BUILDIGS: + LabelWithHighlight@DESC_BUILDINGS: Y: 34 Width: PARENT_RIGHT Height: 16 Font: Small - Text: label-mouse-control-desc-modern-buildigs + Text: label-mouse-control-desc-modern-buildings LabelWithHighlight@DESC_SUPPORT: Y: 51 Width: PARENT_RIGHT diff --git a/mods/common/chrome/musicplayer.yaml b/mods/common/chrome/musicplayer.yaml index b423a9c302..39ca39c771 100644 --- a/mods/common/chrome/musicplayer.yaml +++ b/mods/common/chrome/musicplayer.yaml @@ -152,13 +152,13 @@ Background@MUSIC_PANEL: Width: PARENT_RIGHT - 24 Height: 25 Align: Center - Text: label-no-music-desca + Text: label-no-music-desc-a Label@DESCB: Y: 40 Width: PARENT_RIGHT - 24 Height: 25 Align: Center - Text: label-no-music-descb + Text: label-no-music-desc-b Button@BACK_BUTTON: X: PARENT_RIGHT - WIDTH - 20 Y: PARENT_BOTTOM - 45 diff --git a/mods/common/chrome/settings-input.yaml b/mods/common/chrome/settings-input.yaml index 7dcc880fce..b75fd03ec5 100644 --- a/mods/common/chrome/settings-input.yaml +++ b/mods/common/chrome/settings-input.yaml @@ -76,7 +76,7 @@ Container@INPUT_PANEL: Width: PARENT_RIGHT Height: 16 Font: Small - Text: label-mouse-control-desc-classic-buildigs + Text: label-mouse-control-desc-classic-buildings LabelWithHighlight@DESC_SUPPORT: Y: 51 Width: PARENT_RIGHT @@ -135,7 +135,7 @@ Container@INPUT_PANEL: Width: PARENT_RIGHT Height: 16 Font: Small - Text: label-mouse-control-desc-modern-buildigs + Text: label-mouse-control-desc-modern-buildings LabelWithHighlight@DESC_SUPPORT: Y: 51 Width: PARENT_RIGHT diff --git a/mods/common/languages/chrome/en.ftl b/mods/common/languages/chrome/en.ftl index 7640cf8427..d5961b3149 100644 --- a/mods/common/languages/chrome/en.ftl +++ b/mods/common/languages/chrome/en.ftl @@ -57,7 +57,7 @@ button-container-ok = OK label-tiles-bg-search = Search: label-bg-filter = Filter: label-actors-bg-search = Search: -label-actors-bg-owners = Owner: +label-actor-bg-owner = Owner: label-area-selection = Area Selection label-area-info = Area Info label-selected-area-diagonal = Diagonal: @@ -151,9 +151,9 @@ checkbox-debug-panel-show-screenmap = Show Screen Map label-mission-objectives = Mission: ## ingame-infoscripterror.yaml -label-script-error-panel-desca = The map script has encountered a fatal error -label-script-error-panel-descb = The details of the error have been saved to lua.log in the logs directory. -label-script-error-panel-descc = Please send this file to the map author so that they can fix this issue. +label-script-error-panel-desc-a = The map script has encountered a fatal error +label-script-error-panel-desc-b = The details of the error have been saved to lua.log in the logs directory. +label-script-error-panel-desc-c = Please send this file to the map author so that they can fix this issue. ## ingame-infostats.yaml label-objective-mission = Mission: @@ -206,8 +206,8 @@ checkbox-music-controls-shuffle = Shuffle checkbox-music-controls-loop = Loop label-container-title = Track label-no-music-title = Music Not Installed -label-no-music-desca = The game music can be installed -label-no-music-descb = from the "Manage Content" menu. +label-no-music-desc-a = The game music can be installed +label-no-music-desc-b = from the "Manage Content" menu. ## lobby-options.yaml label-lobby-options-bin-title = Map Options @@ -280,7 +280,7 @@ label-input-section-header = Input label-mouse-control-container = Control Scheme: label-mouse-control-desc-classic-selection = - Select units using the mouse button label-mouse-control-desc-classic-commands = - Command units using the mouse button -label-mouse-control-desc-classic-buildigs = - Place structures using the mouse button +label-mouse-control-desc-classic-buildings = - Place structures using the mouse button label-mouse-control-desc-classic-support = - Target support powers using the mouse button label-mouse-control-desc-classic-zoom = - Zoom the battlefield using the label-mouse-control-desc-classic-zoom-modifier = - Zoom the battlefield using @@ -289,7 +289,7 @@ label-mouse-control-desc-classic-scroll-middle = - Pan the battlefield using the label-mouse-control-desc-classic-edgescroll = or by moving the cursor to the edge of the screen label-mouse-control-desc-modern-selection = - Select units using the mouse button label-mouse-control-desc-modern-commands = - Command units using the mouse button -label-mouse-control-desc-modern-buildigs = - Place structures using the mouse button +label-mouse-control-desc-modern-buildings = - Place structures using the mouse button label-mouse-control-desc-modern-support = - Target support powers using the mouse button label-mouse-control-desc-modern-zoom = - Zoom the battlefield using the label-mouse-control-desc-modern-zoom-modifier = - Zoom the battlefield using diff --git a/mods/d2k/chrome/ingame-observer.yaml b/mods/d2k/chrome/ingame-observer.yaml index bd306cccb4..718f7fa440 100644 --- a/mods/d2k/chrome/ingame-observer.yaml +++ b/mods/d2k/chrome/ingame-observer.yaml @@ -28,7 +28,7 @@ Container@OBSERVER_WIDGETS: Y: 5 Width: 160 Height: 25 - Text: button-observer-widgets-options + Text: button-observer-widget-options Font: Bold Key: escape DisableWorldSounds: true diff --git a/mods/d2k/languages/campaign/en.ftl b/mods/d2k/languages/campaign/en.ftl index f25a5dbe9f..9395445674 100644 --- a/mods/d2k/languages/campaign/en.ftl +++ b/mods/d2k/languages/campaign/en.ftl @@ -16,4 +16,4 @@ bot-campaign-ai = neutral-prefix = Neutral ## harkonnen-05, ordos-04 -actor-outpost-modified--name = Modified Outpost +actor-outpost-modified-name = Modified Outpost diff --git a/mods/d2k/languages/chrome/en.ftl b/mods/d2k/languages/chrome/en.ftl index 74812d4637..222f457157 100644 --- a/mods/d2k/languages/chrome/en.ftl +++ b/mods/d2k/languages/chrome/en.ftl @@ -8,7 +8,7 @@ label-mentat-title = Mentat label-menu-buttons-title = Options ## ingame-observer.yaml -button-observer-widgets-options = Options (Esc) +button-observer-widget-options = Options (Esc) button-replay-player-pause-tooltip = Pause button-replay-player-play-tooltip = Play diff --git a/mods/d2k/languages/lua/en.ftl b/mods/d2k/languages/lua/en.ftl index ae905411d9..719acbfed4 100644 --- a/mods/d2k/languages/lua/en.ftl +++ b/mods/d2k/languages/lua/en.ftl @@ -96,7 +96,7 @@ destroy-atreides = Destroy the Atreides. ## harkonnen-04 fremen-annihilated = The Fremen have been annihilated! destroy-fremen = Destroy the Fremen. -fremen-spotted-north-southeast = Fremen concentrations spotted to the north and southwest. +fremen-spotted-north-southwest = Fremen concentrations spotted to the north and southwest. ## harkonnen-05 imperial-ships-penetrating-defense-grid = Imperial ships penetrating defense grid! diff --git a/mods/d2k/languages/rules/en.ftl b/mods/d2k/languages/rules/en.ftl index a5f95da060..8846e1fb04 100644 --- a/mods/d2k/languages/rules/en.ftl +++ b/mods/d2k/languages/rules/en.ftl @@ -17,7 +17,7 @@ notification-base-under-attack = Base under attack. notification-ally-under-attack = Our ally is under attack. notification-harvester-under-attack = Harvester under attack. notification-silos-needed = Silos needed. -notification-no-room-for-new-units = No room for new unit. +notification-no-room-for-new-unit = No room for new unit. notification-cannot-build-here = Cannot build here. notification-one-of-our-buildings-has-been-captured = One of our buildings has been captured. @@ -285,7 +285,7 @@ notification-unit-ready = Unit ready. notification-repairing = Repairing. notification-unit-repaired = Unit repaired. notification-select-target = Select target. -notifciation-missile-launch-detected = Missile launch detected. +notification-missile-launch-detected = Missile launch detected. notification-airstrike-ready = Airstrike ready. notification-building-lost = Building lost. notification-reinforcements-have-arrived = Reinforcements have arrived. @@ -299,13 +299,13 @@ meta-concrete = .description = Provides a strong foundation that prevents damage from the terrain. -actor-concretea = +actor-concrete-a = .name = Concrete Slab .encyclopedia = If buildings are not placed on concrete, they will be damaged. Buildings can be repaired, but unless the building sits completely on concrete, the building will suffer continual weathering damage from the erosive desert environment. Concrete is vulnerable to most weapon types. Concrete cannot be repaired if damaged. -actor-concreteb-name = Large Concrete Slab +actor-concrete-b-name = Large Concrete Slab actor-construction-yard = .description = Produces structures. diff --git a/mods/d2k/maps/harkonnen-04/harkonnen04.lua b/mods/d2k/maps/harkonnen-04/harkonnen04.lua index dab5f6b72e..b599320d33 100644 --- a/mods/d2k/maps/harkonnen-04/harkonnen04.lua +++ b/mods/d2k/maps/harkonnen-04/harkonnen04.lua @@ -191,7 +191,7 @@ WorldLoaded = function() end) Trigger.AfterDelay(DateTime.Seconds(15), function() - Media.DisplayMessage(UserInterface.Translate("fremen-spotted-north-southeast"), Mentat) + Media.DisplayMessage(UserInterface.Translate("fremen-spotted-north-southwest"), Mentat) end) local atreidesCondition = function() return Harkonnen.IsObjectiveCompleted(KillAtreides) end diff --git a/mods/d2k/maps/harkonnen-05/rules.yaml b/mods/d2k/maps/harkonnen-05/rules.yaml index 3ceae12448..c360ae334d 100644 --- a/mods/d2k/maps/harkonnen-05/rules.yaml +++ b/mods/d2k/maps/harkonnen-05/rules.yaml @@ -77,5 +77,5 @@ outpost: Tooltip: RequiresCondition: !modified Tooltip@Modified: - Name: actor-outpost-modified--name + Name: actor-outpost-modified-name RequiresCondition: modified diff --git a/mods/d2k/maps/ordos-04/rules.yaml b/mods/d2k/maps/ordos-04/rules.yaml index d0082fef87..ee1fc22456 100644 --- a/mods/d2k/maps/ordos-04/rules.yaml +++ b/mods/d2k/maps/ordos-04/rules.yaml @@ -40,7 +40,7 @@ outpost: Tooltip: RequiresCondition: !modified Tooltip@Modified: - Name: actor-outpost-modified--name + Name: actor-outpost-modified-name RequiresCondition: modified quad: diff --git a/mods/d2k/rules/player.yaml b/mods/d2k/rules/player.yaml index f9f31681c0..ec99046347 100644 --- a/mods/d2k/rules/player.yaml +++ b/mods/d2k/rules/player.yaml @@ -18,7 +18,7 @@ Player: ReadyAudio: BuildingReady ReadyTextNotification: notification-construction-complete BlockedAudio: NoRoom - BlockedTextNotification: notification-no-room-for-new-units + BlockedTextNotification: notification-no-room-for-new-unit QueuedAudio: Building OnHoldAudio: OnHold CancelledAudio: Cancelled @@ -31,7 +31,7 @@ Player: ReadyAudio: UnitReady ReadyTextNotification: notification-unit-ready BlockedAudio: NoRoom - BlockedTextNotification: notification-no-room-for-new-units + BlockedTextNotification: notification-no-room-for-new-unit QueuedAudio: Training OnHoldAudio: OnHold CancelledAudio: Cancelled @@ -44,7 +44,7 @@ Player: ReadyAudio: UnitReady ReadyTextNotification: notification-unit-ready BlockedAudio: NoRoom - BlockedTextNotification: notification-no-room-for-new-units + BlockedTextNotification: notification-no-room-for-new-unit QueuedAudio: Building OnHoldAudio: OnHold CancelledAudio: Cancelled @@ -57,7 +57,7 @@ Player: ReadyAudio: UnitReady ReadyTextNotification: notification-unit-ready BlockedAudio: NoRoom - BlockedTextNotification: notification-no-room-for-new-units + BlockedTextNotification: notification-no-room-for-new-unit QueuedAudio: Building OnHoldAudio: OnHold CancelledAudio: Cancelled @@ -68,7 +68,7 @@ Player: DisplayOrder: 4 BuildDurationModifier: 212 BlockedAudio: NoRoom - BlockedTextNotification: notification-no-room-for-new-units + BlockedTextNotification: notification-no-room-for-new-unit QueuedAudio: OrderPlaced OnHoldAudio: OnHold CancelledAudio: Cancelled @@ -79,7 +79,7 @@ Player: ReadyAudio: UnitReady ReadyTextNotification: notification-unit-ready BlockedAudio: NoRoom - BlockedTextNotification: notification-no-room-for-new-units + BlockedTextNotification: notification-no-room-for-new-unit QueuedAudio: Building OnHoldAudio: OnHold CancelledAudio: Cancelled @@ -90,7 +90,7 @@ Player: ReadyAudio: NewOptions ReadyTextNotification: notification-new-construction-options BlockedAudio: NoRoom - BlockedTextNotification: notification-no-room-for-new-units + BlockedTextNotification: notification-no-room-for-new-unit QueuedAudio: Upgrading OnHoldAudio: OnHold CancelledAudio: Cancelled diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 8709be0f07..960b7ae121 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -25,9 +25,9 @@ concretea: Footprint: xx xx Dimensions: 2,2 Tooltip: - Name: actor-concretea.name + Name: actor-concrete-a.name Encyclopedia: - Description: actor-concretea.encyclopedia + Description: actor-concrete-a.encyclopedia Category: Buildings Order: 10 Valued: @@ -46,7 +46,7 @@ concreteb: Footprint: xxx xxx xxx Dimensions: 3,3 Tooltip: - Name: actor-concreteb-name + Name: actor-concrete-b-name Valued: Cost: 50 Buildable: @@ -1162,7 +1162,7 @@ palace: IncomingSpeechNotification: MissileLaunchDetected BeginChargeTextNotification: notification-death-hand-missile-prepping EndChargeTextNotification: notification-death-hand-missile-ready - IncomingTextNotification: notifciation-missile-launch-detected + IncomingTextNotification: notification-missile-launch-detected SelectTargetTextNotification: notification-select-target MissileWeapon: deathhand MissileImage: deathhand @@ -1195,7 +1195,7 @@ palace: ReadyAudio: Reinforce ReadyTextNotification: notification-reinforcements-have-arrived BlockedAudio: NoRoom - BlockedTextNotification: notification-no-room-for-new-units + BlockedTextNotification: notification-no-room-for-new-unit OrderName: ProduceActorPower.Fremen SupportPowerPaletteOrder: 20 ProduceActorPower@saboteur: @@ -1212,7 +1212,7 @@ palace: ReadyAudio: Reinforce ReadyTextNotification: notification-reinforcements-have-arrived BlockedAudio: NoRoom - BlockedTextNotification: notification-no-room-for-new-units + BlockedTextNotification: notification-no-room-for-new-unit OrderName: ProduceActorPower.Saboteur SupportPowerPaletteOrder: 30 Exit@1: diff --git a/mods/ra/languages/lua/en.ftl b/mods/ra/languages/lua/en.ftl index ea52d3ae27..92e61e07ce 100644 --- a/mods/ra/languages/lua/en.ftl +++ b/mods/ra/languages/lua/en.ftl @@ -54,7 +54,7 @@ disguise-spy = Commander! You have to disguise me in order to get through the en battlefield-control = Battlefield Control skip-heroics = Good work! But next time skip the heroics! rescue-tanya = Rescue Tanya. -elminate-soviet-units = Eliminate all Soviet units in this area. +eliminate-soviet-units = Eliminate all Soviet units in this area. infiltrate-warfactory = Infiltrate the Soviet warfactory. destroy-sam-sites-blocker = Destroy all four SAM Sites that block our reinforcements' helicopter. @@ -62,7 +62,7 @@ destroy-sam-sites-blocker = Destroy all four SAM Sites that block # allies-06ab soviet-tech-centers-discovered = Coordinates of the Soviet tech centers discovered. destroy-soviet-buildings-units = Destroy all Soviet buildings and units in the area. -dont-capture-tech-centers = Do not capture the tech centers! Infiltrate one with a spy. +do-not-capture-tech-centers = Do not capture the tech centers! Infiltrate one with a spy. infiltrate-tech-center-spy = Infiltrate one of the Soviet tech centers with a spy. capture-radar-shore = Capture the Radar Dome at the shore. build-naval-yard-redeploy-mcv = Secure a foothold and build a Naval Yard. @@ -82,7 +82,7 @@ defeat-allied-forces = Defeat the Allied forces. ## allies-08ab experiment-successful = The experiment is a success! -chronosphere-experiments-completes-in = Chronosphere experiment completes in { $time } +chronosphere-experiment-complete-in = Chronosphere experiment completes in { $time } defend-chronosphere-tech-center = Defend the Chronosphere and the Tech Center at all costs. chronosphere-needs-power = The Chronosphere must have power when the @@ -140,7 +140,7 @@ transferring-funds = Transferring funds. co-commander-missing = Co-Commander is missing ## fall-of-greece-1-personal-war -civilians-manual-targetting = Commander, there are several civilians in the area. +civilians-manual-targeting = Commander, there are several civilians in the area. We'll need you to call out targets. soviet-aircraft-armor-moving-in = Alfa Niner this is Lima One Six. Be advised, Soviet aircraft and armor moving into your AO. headquarters = Headquarters @@ -156,12 +156,12 @@ get-tanya-stavros-helicopter = Get Stavros and Tanya to the extraction helicopte civilians-evacuated = { $evacuated } / { $threshold } civilians evacuated. chinook-assist-evacuation = Alfa Niner this is Pegasus. We are on site and ready to assist with the evacuation. chinook-pilot = Chinook pilot -rescue-civlians-island-shelter-easy = Evacuate at least half of the civilians to the island +rescue-civilians-island-shelter-easy = Evacuate at least half of the civilians to the island shelter. -rescue-civlians-island-shelter-normal = Evacuate at least three quarters of the civilians to +rescue-civilians-island-shelter-normal = Evacuate at least three quarters of the civilians to the island shelter. -rescue-civlians-island-shelter-hard = Evacuate all civilians to the island shelter. -clear-enemy-submarines = Clear the area of enemy submarine activity. +rescue-civilians-island-shelter-hard = Evacuate all civilians to the island shelter. +clear-enemy-submarines = Clear the area of enemy submarine activity ## fort-lonestar no-more-waves = You almost survived the onslaught! No more waves incoming. @@ -350,7 +350,7 @@ time-until-meltdown = Time until Meltdown: { $time } destroy-allied-sympathizers-village = Destroy the village of Allied sympathizers. ## soviet-09 -trucks-stopped-near-allied-base = Commander, the truck has stopped at a nearby allied base. +truck-stopped-near-allied-base = Commander, the truck has stopped at a nearby allied base. Allied radio intercepts say the truck has orders to flee the battlefield if any Soviet units approach the base. destroy-stolen-convoy-truck = Destroy the stolen convoy truck. @@ -394,7 +394,7 @@ takeover-reinforcements-dismantle-soviet-base = Take control of French reinforce dismantle the nearby Soviet base. enforce-position-hold-until-reinforcements = Enforce your position and hold-out the onslaught until reinforcements arrive. -destroy-two-sames-before-reinforcements = Destroy the two SAM sites before reinforcements +destroy-two-sams-before-reinforcements = Destroy the two SAM sites before reinforcements arrive. soviets-blocking-gps = The Soviets are blocking our GPS. We need to investigate their new technology. capture-hold-soviet-airbase-northeast = Capture and hold the Soviet airbase @@ -419,7 +419,7 @@ soviet-reinforcements-approaching = The Soviet reinforcements are approaching! ## top-o-the-world supply-truck-waystation = Bring the supply truck to the waystation. waystation-must-not-be-destroyed = The waystation must not be destroyed. -destory-aa-guns-enable-air-support = Destroy all the AA Guns to enable air support. +destroy-aa-guns-enable-air-support = Destroy all the AA Guns to enable air support. find-destroy-bridge-stop-allied-reinforcements = Find and destroy the bridge the allies are using to bring their reinforcements in the area. air-support-t-minus-3 = Very good comrade general! Our air units just took off diff --git a/mods/ra/languages/rules/en.ftl b/mods/ra/languages/rules/en.ftl index 1fba7d784c..a8d981b4d8 100644 --- a/mods/ra/languages/rules/en.ftl +++ b/mods/ra/languages/rules/en.ftl @@ -175,8 +175,8 @@ meta-ammobox-name = Ammo Box meta-civfield-name = Field meta-civhaystackorigloo = - .winter--name = Igloo - .summer--name = Haystacks + .winter-name = Igloo + .summer-name = Haystacks meta-tree-name = Tree meta-treehusk-name = Tree (Burnt) @@ -466,7 +466,7 @@ notification-chronosphere-charging = Chronosphere charging. notification-chronosphere-ready = Chronosphere ready. notification-satellite-launched = Satellite launched. notification-credits-stolen = Credits stolen. -notifcation-spy-plane-ready = Spy plane ready. +notification-spy-plane-ready = Spy plane ready. actor-mslo = .name = Missile Silo diff --git a/mods/ra/maps/allies-05a/allies05a.lua b/mods/ra/maps/allies-05a/allies05a.lua index f114ff8812..554c6868e1 100644 --- a/mods/ra/maps/allies-05a/allies05a.lua +++ b/mods/ra/maps/allies-05a/allies05a.lua @@ -374,7 +374,7 @@ end AddObjectives = function() USSRobjective = AddPrimaryObjective(USSR, "") RescueTanyaObjective = AddPrimaryObjective(Greece, "rescue-tanya") - KillAll = AddPrimaryObjective(Greece, "elminate-soviet-units") + KillAll = AddPrimaryObjective(Greece, "eliminate-soviet-units") InfiltrateWarfactoryObjective = AddSecondaryObjective(Greece, "infiltrate-warfactory") end diff --git a/mods/ra/maps/allies-05b/allies05b.lua b/mods/ra/maps/allies-05b/allies05b.lua index 4a49f71688..f7b2483cf3 100644 --- a/mods/ra/maps/allies-05b/allies05b.lua +++ b/mods/ra/maps/allies-05b/allies05b.lua @@ -390,7 +390,7 @@ WorldLoaded = function() USSRObj = AddPrimaryObjective(USSR, "") MainObj = AddPrimaryObjective(Greece, "rescue-tanya") - KillAll = AddPrimaryObjective(Greece, "elminate-soviet-units") + KillAll = AddPrimaryObjective(Greece, "eliminate-soviet-units") InfWarfactory = AddSecondaryObjective(Greece, "infiltrate-warfactory") InitTriggers() diff --git a/mods/ra/maps/allies-05c/allies05c.lua b/mods/ra/maps/allies-05c/allies05c.lua index be52426cce..c6c25a8368 100644 --- a/mods/ra/maps/allies-05c/allies05c.lua +++ b/mods/ra/maps/allies-05c/allies05c.lua @@ -348,7 +348,7 @@ WorldLoaded = function() USSRObj = AddPrimaryObjective(USSR, "") MainObj = AddPrimaryObjective(Greece, "rescue-tanya") - KillAll = AddPrimaryObjective(Greece, "elminate-soviet-units") + KillAll = AddPrimaryObjective(Greece, "eliminate-soviet-units") InfWarfactory = AddSecondaryObjective(Greece, "infiltrate-warfactory") InitTriggers() diff --git a/mods/ra/maps/allies-06a/allies06a.lua b/mods/ra/maps/allies-06a/allies06a.lua index 25d1ca7a49..b43de24055 100644 --- a/mods/ra/maps/allies-06a/allies06a.lua +++ b/mods/ra/maps/allies-06a/allies06a.lua @@ -169,7 +169,7 @@ InfiltrateTechCenter = function() Trigger.OnCapture(a, function() if not infiltrated then Media.PlaySoundNotification(Greece, "AlertBleep") - Media.DisplayMessage(UserInterface.Translate("dont-capture-tech-centers")) + Media.DisplayMessage(UserInterface.Translate("do-not-capture-tech-centers")) end end) end) diff --git a/mods/ra/maps/allies-06b/allies06b.lua b/mods/ra/maps/allies-06b/allies06b.lua index 42fb02d957..97bd5cae56 100644 --- a/mods/ra/maps/allies-06b/allies06b.lua +++ b/mods/ra/maps/allies-06b/allies06b.lua @@ -157,7 +157,7 @@ InfiltrateTechCenter = function() Trigger.OnCapture(a, function() if not Infiltrated then - Media.DisplayMessage(UserInterface.Translate("dont-capture-tech-centers")) + Media.DisplayMessage(UserInterface.Translate("do-not-capture-tech-centers")) end end) end) diff --git a/mods/ra/maps/allies-08a/allies08a.lua b/mods/ra/maps/allies-08a/allies08a.lua index d07c596ad8..64007f661b 100644 --- a/mods/ra/maps/allies-08a/allies08a.lua +++ b/mods/ra/maps/allies-08a/allies08a.lua @@ -105,7 +105,7 @@ Tick = function() if Ticked > 0 then if (Ticked % DateTime.Seconds(1)) == 0 then - Timer = UserInterface.Translate("chronosphere-experiments-completes-in", { ["time"] = Utils.FormatTime(Ticked) }) + Timer = UserInterface.Translate("chronosphere-experiment-complete-in", { ["time"] = Utils.FormatTime(Ticked) }) UserInterface.SetMissionText(Timer, TimerColor) end Ticked = Ticked - 1 diff --git a/mods/ra/maps/allies-08b/allies08b.lua b/mods/ra/maps/allies-08b/allies08b.lua index 36f5473598..c4f64cca5f 100644 --- a/mods/ra/maps/allies-08b/allies08b.lua +++ b/mods/ra/maps/allies-08b/allies08b.lua @@ -105,7 +105,7 @@ Tick = function() if Ticked > 0 then if (Ticked % DateTime.Seconds(1)) == 0 then - Timer = UserInterface.Translate("chronosphere-experiments-completes-in", { ["time"] = Utils.FormatTime(Ticked) }) + Timer = UserInterface.Translate("chronosphere-experiment-complete-in", { ["time"] = Utils.FormatTime(Ticked) }) UserInterface.SetMissionText(Timer, TimerColor) end Ticked = Ticked - 1 diff --git a/mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua b/mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua index 7e299d838b..6ce305f30e 100644 --- a/mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua +++ b/mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua @@ -79,7 +79,7 @@ MissionStart = function() end) end) Trigger.AfterDelay(DateTime.Seconds(6), function() - Media.DisplayMessage(UserInterface.Translate("civilians-manual-targetting"), UserInterface.Translate("tanya")) + Media.DisplayMessage(UserInterface.Translate("civilians-manual-targeting"), UserInterface.Translate("tanya")) end) end end) diff --git a/mods/ra/maps/fall-of-greece-2-evacuation/evacuation.lua b/mods/ra/maps/fall-of-greece-2-evacuation/evacuation.lua index 24f7c0b8ff..933f26977f 100644 --- a/mods/ra/maps/fall-of-greece-2-evacuation/evacuation.lua +++ b/mods/ra/maps/fall-of-greece-2-evacuation/evacuation.lua @@ -242,11 +242,11 @@ WorldLoaded = function() InitObjectives(Allies) if Difficulty == "easy" then - RescueCivilians = AddPrimaryObjective(Allies, "rescue-civlians-island-shelter-easy") + RescueCivilians = AddPrimaryObjective(Allies, "rescue-civilians-island-shelter-easy") elseif Difficulty == "normal" then - RescueCivilians = AddPrimaryObjective(Allies, "rescue-civlians-island-shelter-normal") + RescueCivilians = AddPrimaryObjective(Allies, "rescue-civilians-island-shelter-normal") else - RescueCivilians = AddPrimaryObjective(Allies, "rescue-civlians-island-shelter-hard") + RescueCivilians = AddPrimaryObjective(Allies, "rescue-civilians-island-shelter-hard") end ClearWaterway = AddSecondaryObjective(Allies, "clear-enemy-submarines") diff --git a/mods/ra/maps/soviet-09/soviet09.lua b/mods/ra/maps/soviet-09/soviet09.lua index df1b6d5c76..95c41fb4eb 100644 --- a/mods/ra/maps/soviet-09/soviet09.lua +++ b/mods/ra/maps/soviet-09/soviet09.lua @@ -24,7 +24,7 @@ MissionStart = function() end) Trigger.AfterDelay(DateTime.Seconds(45), function() - Media.DisplayMessage(UserInterface.Translate("trucks-stopped-near-allied-base")) + Media.DisplayMessage(UserInterface.Translate("truck-stopped-near-allied-base")) end) Trigger.OnKilled(StolenTruck, function() diff --git a/mods/ra/maps/survival01/survival01.lua b/mods/ra/maps/survival01/survival01.lua index c3d730c243..c943c71ce8 100644 --- a/mods/ra/maps/survival01/survival01.lua +++ b/mods/ra/maps/survival01/survival01.lua @@ -304,7 +304,7 @@ AddObjectives = function() InitObjectives(Allies) SurviveObj = AddPrimaryObjective(Allies, "enforce-position-hold-until-reinforcements") - KillSams = AddSecondaryObjective(Allies, "destroy-two-sames-before-reinforcements") + KillSams = AddSecondaryObjective(Allies, "destroy-two-sams-before-reinforcements") Media.DisplayMessage(UserInterface.Translate("soviets-blocking-gps")) CaptureAirfields = AddSecondaryObjective(Allies, "capture-hold-soviet-airbase-northeast") SovietObj = AddPrimaryObjective(Soviets, "") diff --git a/mods/ra/maps/top-o-the-world/rules.yaml b/mods/ra/maps/top-o-the-world/rules.yaml index f3b0aeb94c..90813823a9 100644 --- a/mods/ra/maps/top-o-the-world/rules.yaml +++ b/mods/ra/maps/top-o-the-world/rules.yaml @@ -60,7 +60,7 @@ powerproxy.spyplane: SelectTargetSpeechNotification: SelectTarget EndChargeSpeechNotification: SpyPlaneReady SelectTargetTextNotification: notification-select-target - EndChargeTextNotification: notifcation-spy-plane-ready + EndChargeTextNotification: notification-spy-plane-ready CameraActor: camera.spyplane CameraRemoveDelay: 150 UnitType: u2 diff --git a/mods/ra/maps/top-o-the-world/top-o-the-world.lua b/mods/ra/maps/top-o-the-world/top-o-the-world.lua index 26f8575701..2e6e740397 100644 --- a/mods/ra/maps/top-o-the-world/top-o-the-world.lua +++ b/mods/ra/maps/top-o-the-world/top-o-the-world.lua @@ -104,7 +104,7 @@ WorldLoaded = function() BringSupplyTruck = AddPrimaryObjective(USSR, "supply-truck-waystation") ProtectWaystation = AddPrimaryObjective(USSR, "waystation-must-not-be-destroyed") - DestroyAAGuns = AddSecondaryObjective(USSR, "destory-aa-guns-enable-air-support") + DestroyAAGuns = AddSecondaryObjective(USSR, "destroy-aa-guns-enable-air-support") PreventAlliedIncursions = AddSecondaryObjective(USSR, "find-destroy-bridge-stop-allied-reinforcements") Trigger.OnKilled(USSRTechCenter01, function() diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 6236a13865..96327cef93 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -939,12 +939,12 @@ Condition: winter TileSets: SNOW Tooltip@WINTER: - Name: meta-civhaystackorigloo.winter--name + Name: meta-civhaystackorigloo.winter-name RequiresCondition: winter GenericVisibility: None ShowOwnerRow: false Tooltip@SUMMER: - Name: meta-civhaystackorigloo.summer--name + Name: meta-civhaystackorigloo.summer-name RequiresCondition: !winter GenericVisibility: None ShowOwnerRow: false diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index ca8851fbed..1ff79969df 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -1562,7 +1562,7 @@ AFLD: SelectTargetSpeechNotification: SelectTarget EndChargeSpeechNotification: SpyPlaneReady SelectTargetTextNotification: notification-select-target - EndChargeTextNotification: notifcation-spy-plane-ready + EndChargeTextNotification: notification-spy-plane-ready CameraActor: camera.spyplane CameraRemoveDelay: 150 UnitType: u2 diff --git a/mods/ts/chrome/ingame-observer.yaml b/mods/ts/chrome/ingame-observer.yaml index f834050915..d6f91e9288 100644 --- a/mods/ts/chrome/ingame-observer.yaml +++ b/mods/ts/chrome/ingame-observer.yaml @@ -28,7 +28,7 @@ Container@OBSERVER_WIDGETS: Y: 5 Width: 160 Height: 25 - Text: button-observer-widgets-options + Text: button-observer-widget-options Font: Bold Key: escape DisableWorldSounds: true diff --git a/mods/ts/languages/chrome/en.ftl b/mods/ts/languages/chrome/en.ftl index c0387f8086..f4572914ba 100644 --- a/mods/ts/languages/chrome/en.ftl +++ b/mods/ts/languages/chrome/en.ftl @@ -8,7 +8,7 @@ label-voxel-selector-yaw = Yaw checkbox-debug-panel-show-depth-preview = Show Depth Data ## ingame-observer.yaml -button-observer-widgets-options = Options (Esc) +button-observer-widget-options = Options (Esc) button-replay-player-pause-tooltip = Pause button-replay-player-play-tooltip = Play diff --git a/mods/ts/languages/rules/en.ftl b/mods/ts/languages/rules/en.ftl index dfb12afe13..8bbe3c5475 100644 --- a/mods/ts/languages/rules/en.ftl +++ b/mods/ts/languages/rules/en.ftl @@ -61,7 +61,7 @@ notification-unit-sold = Unit sold. notification-ion-cannon-ready = Ion cannon ready. notification-select-target = Select target. notification-cluster-missile-ready = Cluster missile ready. -notifciation-missile-launch-detected = Missile launch detected. +notification-missile-launch-detected = Missile launch detected. notification-emp-cannon-ready = EMP cannon ready. ## Defaults @@ -119,12 +119,8 @@ actor-hunter-name = Hunter-Seeker Droid ## bridges.yaml actor-cabhut-name = Bridge repair hut meta-lowbridgeramp-name = Bridge -actor-lobrdg-a-d-name = Dead Bridge -actor-lobrdg-b-d-name = Dead Bridge -actor-lobrdg-r-se-name = Bridge Ramp -actor-lobrdg-r-nw-name = Bridge Ramp -actor-lobrdg-r-ne-name = Bridge Ramp -actor-lobrdg-r-sw-name = Bridge Ramp +actor-lobrdg-d-name = Dead Bridge +actor-lobrdg-r-name = Bridge Ramp meta-elevatedbridgeplaceholder-name = Bridge ## civilian-infantry.yaml @@ -468,7 +464,7 @@ actor-sonic = actor-jugg = .name = Juggernaut - .deployed--name = Juggernaut (deployed) + .deployed-name = Juggernaut (deployed) .description = Mobile Artillery Mech. Needs to deploy in order to shoot. Strong vs Ground units @@ -631,7 +627,7 @@ actor-bike = actor-ttnk = .name = Tick Tank - .deployed--name = Tick Tank (deployed) + .deployed-name = Tick Tank (deployed) .description = Nod's main battle tank. Can deploy to gain extra protection. Strong vs Vehicles @@ -639,7 +635,7 @@ actor-ttnk = actor-art2 = .name = Artillery - .deployed--name = Artillery (deployed) + .deployed-name = Artillery (deployed) .description = Mobile Artillery. Needs to deploy in order to shoot. Strong vs Ground units @@ -678,7 +674,7 @@ actor-stnk = actor-sgen = .name = Mobile Stealth Generator - .deployed--name = Mobile Stealth Generator (deployed) + .deployed-name = Mobile Stealth Generator (deployed) .description = Can cloak units when deployed. Unarmed @@ -739,7 +735,7 @@ actor-lpst = units when deployed. Unarmed .name = Mobile Sensor Array - .deployed--name = Mobile Sensor Array (deployed) + .deployed-name = Mobile Sensor Array (deployed) ## trees.yaml actor-bigblue-name = Large Blue Tiberium Crystal diff --git a/mods/ts/rules/bridges.yaml b/mods/ts/rules/bridges.yaml index 6ddfc6bb37..4e89211257 100644 --- a/mods/ts/rules/bridges.yaml +++ b/mods/ts/rules/bridges.yaml @@ -76,7 +76,7 @@ LOBRDG_A: LOBRDG_A_D: Inherits: LOBRDG_A EditorOnlyTooltip: - Name: actor-lobrdg-a-d-name + Name: actor-lobrdg-d-name -GroundLevelBridge: -AppearsOnRadar: BridgePlaceholder: @@ -115,7 +115,7 @@ LOBRDG_B: LOBRDG_B_D: Inherits: LOBRDG_B EditorOnlyTooltip: - Name: actor-lobrdg-b-d-name + Name: actor-lobrdg-d-name -GroundLevelBridge: -AppearsOnRadar: BridgePlaceholder: @@ -138,7 +138,7 @@ LOBRDG_R_SE: BridgePlaceholder: NeighbourOffsets: -1,1 EditorOnlyTooltip: - Name: actor-lobrdg-r-se-name + Name: actor-lobrdg-r-name LOBRDG_R_NW: Inherits: ^LowBridgeRamp @@ -148,7 +148,7 @@ LOBRDG_R_NW: BridgePlaceholder: NeighbourOffsets: 1,1 EditorOnlyTooltip: - Name: actor-lobrdg-r-nw-name + Name: actor-lobrdg-r-name LOBRDG_R_NE: Inherits: ^LowBridgeRamp @@ -158,7 +158,7 @@ LOBRDG_R_NE: BridgePlaceholder: NeighbourOffsets: 1,1 EditorOnlyTooltip: - Name: actor-lobrdg-r-ne-name + Name: actor-lobrdg-r-name LOBRDG_R_SW: Inherits: ^LowBridgeRamp @@ -168,7 +168,7 @@ LOBRDG_R_SW: BridgePlaceholder: NeighbourOffsets: 1,-1 EditorOnlyTooltip: - Name: actor-lobrdg-r-sw-name + Name: actor-lobrdg-r-name ^ElevatedBridgePlaceholder: AlwaysVisible: diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml index 3d96dbc05a..5b8f5cbe1d 100644 --- a/mods/ts/rules/gdi-vehicles.yaml +++ b/mods/ts/rules/gdi-vehicles.yaml @@ -324,7 +324,7 @@ JUGG: Name: actor-jugg.name RequiresCondition: !deployed Tooltip@DEPLOYED: - Name: actor-jugg.deployed--name + Name: actor-jugg.deployed-name RequiresCondition: deployed UpdatesPlayerStatistics: AddToArmyValue: true diff --git a/mods/ts/rules/nod-structures.yaml b/mods/ts/rules/nod-structures.yaml index 38775f6d7d..e5ce3874ac 100644 --- a/mods/ts/rules/nod-structures.yaml +++ b/mods/ts/rules/nod-structures.yaml @@ -541,7 +541,7 @@ NAMISL: IncomingSpeechNotification: MissileLaunchDetected EndChargeTextNotification: notification-cluster-missile-ready SelectTargetTextNotification: notification-select-target - IncomingTextNotification: notifciation-missile-launch-detected + IncomingTextNotification: notification-missile-launch-detected LaunchSound: icbm1.aud MissileWeapon: ClusterMissile MissileImage: ClusterMissile diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index f9fb10ee7e..7f2138a312 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -92,7 +92,7 @@ TTNK: Name: actor-ttnk.name RequiresCondition: !deployed Tooltip@DEPLOYED: - Name: actor-ttnk.deployed--name + Name: actor-ttnk.deployed-name RequiresCondition: deployed UpdatesPlayerStatistics: AddToArmyValue: true @@ -214,7 +214,7 @@ ART2: Name: actor-art2.name RequiresCondition: !deployed Tooltip@DEPLOYED: - Name: actor-art2.deployed--name + Name: actor-art2.deployed-name RequiresCondition: deployed UpdatesPlayerStatistics: AddToArmyValue: true @@ -565,7 +565,7 @@ SGEN: Name: actor-sgen.name RequiresCondition: !deployed Tooltip@DEPLOYED: - Name: actor-sgen.deployed--name + Name: actor-sgen.deployed-name RequiresCondition: deployed Selectable: Bounds: 1206, 1768, 0, -603 diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml index acc31d9c43..c5196ef31f 100644 --- a/mods/ts/rules/shared-vehicles.yaml +++ b/mods/ts/rules/shared-vehicles.yaml @@ -130,7 +130,7 @@ LPST: Name: actor-lpst.name RequiresCondition: !deployed Tooltip@DEPLOYED: - Name: actor-lpst.deployed--name + Name: actor-lpst.deployed-name RequiresCondition: deployed Health: HP: 60000