From b11d3fdcbef2c964f2b1b8298f86eb42dcc3feef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Mon, 5 Feb 2018 15:42:20 +0100 Subject: [PATCH] fix a bunch of typos found by codespell in data directory. https://github.com/lucasdemarchi/codespell --- data/ai/formula/new_recruitment.fai | 4 ++-- data/ai/formula/recruitment.fai | 4 ++-- data/ai/micro_ais/cas/ca_protect_unit_attack.lua | 2 +- data/ai/micro_ais/scenarios/messenger_escort.cfg | 2 +- data/campaigns/Dead_Water/scenarios/01_Invasion.cfg | 2 +- data/campaigns/Dead_Water/scenarios/02_Flight.cfg | 2 +- data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg | 2 +- .../scenarios/11_Descent_into_Darkness.cfg | 2 +- .../Eastern_Invasion/scenarios/17b_Weldyn_Besieged.cfg | 2 +- .../scenarios/chapter4/13_News_from_the_Front.cfg | 2 +- .../scenarios/chapter5/19_Costly_Revenge.cfg | 2 +- .../Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg | 4 ++-- .../Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg | 2 +- .../Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg | 2 +- .../Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg | 2 +- .../Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg | 2 +- data/campaigns/Northern_Rebirth/utils/herodeaths.cfg | 2 +- data/campaigns/Secrets_of_the_Ancients/utils/terrain.cfg | 2 +- .../scenarios/02_Across_the_Harsh_Sands.cfg | 2 +- .../scenarios/06b_In_the_Domain_of_Dwarves.cfg | 2 +- .../scenarios_old/02_Across_the_Harsh_Sands.cfg | 2 +- .../scenarios_old/06b_In_the_Domain_of_Dwarves.cfg | 2 +- data/core/about.cfg | 6 +++--- data/core/about_i18n.cfg | 2 +- data/core/help.cfg | 2 +- data/core/macros/teleport-utils.cfg | 2 +- data/core/terrain-graphics/tracks.cfg | 2 +- data/core/terrain-graphics/transitions.cfg | 2 +- data/core/terrain.cfg | 2 +- data/core/units/merfolk/Entangler.cfg | 2 +- data/gui/widget/menu_button_default.cfg | 4 ++-- data/gui/widget/multimenu_button_default.cfg | 4 ++-- data/gui/widget/panel_story_viewer.cfg | 2 +- data/gui/widget/panel_wml_message.cfg | 3 +-- data/gui/window/addon_manager.cfg | 6 +++--- data/gui/window/drop_down_list.cfg | 2 +- data/lua/ilua.lua | 2 +- data/multiplayer/scenarios/2p_Dark_Forecast.lua | 4 +--- data/schema.cfg | 4 ++-- data/test/scenarios/prestart_settings.cfg | 2 +- data/test/scenarios/sighted_events.cfg | 2 +- data/test/scenarios/test_menu_items.cfg | 2 +- data/themes/_initial.cfg | 2 +- data/themes/classic.cfg | 4 ++-- 44 files changed, 55 insertions(+), 58 deletions(-) diff --git a/data/ai/formula/new_recruitment.fai b/data/ai/formula/new_recruitment.fai index 72455c74747..548a922fde0 100644 --- a/data/ai/formula/new_recruitment.fai +++ b/data/ai/formula/new_recruitment.fai @@ -55,7 +55,7 @@ def find_enemies_part( ai*, locations_map) ) where enemy_leaders = enemy_leaders( ai ); -# Returns a List of those enemy leaders wich are near to the important locations # +# Returns a List of those enemy leaders which are near to the important locations # def find_enemies( ai*, locations_map) filter( keys(enemies_part), 'leader', enemies_part[leader] <= average( values( enemies_part ) ) @@ -78,7 +78,7 @@ def direct_enemies_recruits( ai* ) ) ); -# returns map of important locations and number of their occurences on a gamemap # +# returns map of important locations and number of their occurrences on a gamemap # # for example: [ 'forest' -> 10 ] # # all terrains inside side_terrain are considered. # def important_locations_map(ai*) diff --git a/data/ai/formula/recruitment.fai b/data/ai/formula/recruitment.fai index a3db0725bdf..040be26c103 100644 --- a/data/ai/formula/recruitment.fai +++ b/data/ai/formula/recruitment.fai @@ -71,7 +71,7 @@ def direct_enemies_recruits( ai* ) ); # -returns map of important locations and number of their occurences on a gamemap +returns map of important locations and number of their occurrences on a gamemap for example: [ 'forest' -> 10 ] # def important_locations_map(ai*) @@ -332,4 +332,4 @@ if( vars.side_terrain, ) -wflend \ No newline at end of file +wflend diff --git a/data/ai/micro_ais/cas/ca_protect_unit_attack.lua b/data/ai/micro_ais/cas/ca_protect_unit_attack.lua index a25accde44c..0e1f1628fa3 100644 --- a/data/ai/micro_ais/cas/ca_protect_unit_attack.lua +++ b/data/ai/micro_ais/cas/ca_protect_unit_attack.lua @@ -48,7 +48,7 @@ function ca_protect_unit_attack:evaluation(cfg) if counter_damage_table[str] then -- If so, use saved value max_counter_damage = max_counter_damage + counter_damage_table[str] else -- if not, calculate it and save value - -- Go thru all weapons, as "best weapon" might be different later on + -- Go through all weapons, as "best weapon" might be different later on local min_hp = unit.hitpoints for n_weapon,weapon in ipairs(enemy_attack.enemy.attacks) do -- Terrain does not matter for this, we're only interested in the maximum damage diff --git a/data/ai/micro_ais/scenarios/messenger_escort.cfg b/data/ai/micro_ais/scenarios/messenger_escort.cfg index 05529455d20..36118064965 100644 --- a/data/ai/micro_ais/scenarios/messenger_escort.cfg +++ b/data/ai/micro_ais/scenarios/messenger_escort.cfg @@ -118,7 +118,7 @@ # waypoints for AI {PLACE_IMAGE "scenery/signpost.png" 31 20} - {SET_LABEL 31 20 _"Messanger Waypoint 1"} + {SET_LABEL 31 20 _"Messenger Waypoint 1"} {PLACE_IMAGE "scenery/signpost.png" 24 14} {SET_LABEL 24 14 _"Messenger Waypoint 2"} {PLACE_IMAGE "scenery/signpost.png" 27 7} diff --git a/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg b/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg index 9819ff00376..138660dc37c 100644 --- a/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg +++ b/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg @@ -17,7 +17,7 @@ # under control. When it is, bring in more units to help them. Attack # during the day, but retreat and heal at night: You can't afford to # have very many units zombified. Also, rotate your units and use the -# ZOC of Gwabbo and your level ones to sheild your wounded. Fighters +# ZOC of Gwabbo and your level ones to shield your wounded ones. Fighters # are the best for this because they can take some punishment. When # the map starts to thin out, circle most units around to the enemy # leader. Try to make some brawlers, and take Gwabbo's advice to get diff --git a/data/campaigns/Dead_Water/scenarios/02_Flight.cfg b/data/campaigns/Dead_Water/scenarios/02_Flight.cfg index acd586fad1b..ed85ba666a7 100644 --- a/data/campaigns/Dead_Water/scenarios/02_Flight.cfg +++ b/data/campaigns/Dead_Water/scenarios/02_Flight.cfg @@ -173,7 +173,7 @@ _f, _f, _f, _f, _f, _f, _f # I want more, not more powerful, units. Limit the level twos # so the leaders have to buy more level ones - # The ifdefs are neccessary because this macro will allow + # The ifdefs are necessary because this macro will allow # recruits that weren't originally in the recruit lists. #ifdef EASY [set_recruit] diff --git a/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg b/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg index b6b0c6c8928..932f41bd1f7 100644 --- a/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg +++ b/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg @@ -118,7 +118,7 @@ radius=8 [/not] [not] - # Ocupied by spiders. + # Occupied by spiders. [filter] [/filter] [/not] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg index 0f2f2b4c452..197155e1930 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg @@ -467,7 +467,7 @@ append=yes [/music] - # He's not necessarilly totally happy about this + # He's not necessarily totally happy about this [message] speaker=Mal Keshar sound=lich-die.ogg diff --git a/data/campaigns/Eastern_Invasion/scenarios/17b_Weldyn_Besieged.cfg b/data/campaigns/Eastern_Invasion/scenarios/17b_Weldyn_Besieged.cfg index 376246b2899..61d601e2963 100644 --- a/data/campaigns/Eastern_Invasion/scenarios/17b_Weldyn_Besieged.cfg +++ b/data/campaigns/Eastern_Invasion/scenarios/17b_Weldyn_Besieged.cfg @@ -1,7 +1,7 @@ #textdomain wesnoth-ei # # NOTE: This level is intended as a challenging final scenario. -# Players without sufficent high-level troops to recall +# Players without sufficient high-level troops to recall # are advised to select "The Duel" instead. # [scenario] diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg index 0435d904c14..2fe222fd649 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg @@ -3,7 +3,7 @@ # To future editors: 'philter' is a real archaic word in English meaning a # potion with magical effects. Do *not* change it to 'filter'! -### to do: make Landar dissapear +### to do: make Landar disappear [scenario] name= _ "News from the Front" id=13_News_from_the_Front diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg index 5be45a59b61..f549f91c44c 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg @@ -106,7 +106,7 @@ Chapter Five" [/kill] #endif - #TODO see if this recalls units wich are not recallable + #TODO see if this recalls units which are not recallable {RECALL_LOYALS} [/event] diff --git a/data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg b/data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg index cce19f749a2..bdd52642926 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg @@ -674,10 +674,10 @@ [/objectives] [/event] - # Moving Tallin withing 5 hexes of Hamel. End scenario without bonus. + # Moving Tallin within 5 hexes of Hamel. End scenario without bonus. # TODO: it's possible (but unlikely) that this could result in an unwinnable # scenario if all hexes near Hamel are full. Aagin, though, unlikely. Still, - # it might be worth comming up with an even better victory condition. + # it might be worth coming up with an even better victory condition. [event] name=moveto [filter] diff --git a/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg b/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg index 9b3c56c716c..1ee289b616f 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg @@ -608,7 +608,7 @@ message= _ "And someone keep an eye on him. We don’t want him to get away." [/message] - # Set up relase from jail event that will trigerr each time it's full + # Set up release from jail event that will trigger each time it's full [event] name=moveto first_time_only=no diff --git a/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg b/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg index ddd4c6a6823..f484b8276c7 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg @@ -382,7 +382,7 @@ [message] speaker=Tallin # po: This is an approximate quote from an Anglo-Saxon heroic poem - # po: the Lay of Beorthnoth. Tranlate appropriately. + # po: the Lay of Beorthnoth. Translate appropriately. message= _ "Courage shall be the harder, heart the keener, and our spirit greater as our strength lessens. Kill them all!" [/message] diff --git a/data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg b/data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg index 7eb3ea86042..251c584b158 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg @@ -510,7 +510,7 @@ [/message] [/event] - # Victory event, choose next scenario depending on wheter Eryssa is alive or not. + # Victory event, choose next scenario depending on whether Eryssa is alive or not. [event] name=enemies defeated diff --git a/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg b/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg index 89bbf343432..ba715504b0c 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg @@ -160,7 +160,7 @@ {AI_CONTROLLER () 1 2 ()} - # Enemy AI - set to be agressive + # Enemy AI - set to be aggressive [side] side=3 controller=ai diff --git a/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg b/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg index d3e5f7d0a66..b2aab79680c 100644 --- a/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg +++ b/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg @@ -877,7 +877,7 @@ [/event] #enddef -# Macro shortcut whith everyone's death macros +# Macro shortcut with everyone's death macros #define HERODEATH_EVERYONE {HERODEATH_TALLIN} {HERODEATH_CAMERIN} diff --git a/data/campaigns/Secrets_of_the_Ancients/utils/terrain.cfg b/data/campaigns/Secrets_of_the_Ancients/utils/terrain.cfg index 8590502c184..d1e0f44eb53 100644 --- a/data/campaigns/Secrets_of_the_Ancients/utils/terrain.cfg +++ b/data/campaigns/Secrets_of_the_Ancients/utils/terrain.cfg @@ -24,7 +24,7 @@ #ifdef EDITOR [terrain_type] id=not_here - # Marks an area outside the graveyard fence where a unit should not be spawed. + # Marks an area outside the graveyard fence where a unit should not be spawned. editor_name= _ "Not Here Overlay" symbol_image=not-here-tile-editor string=^Nhyr diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg index c6f0c850805..85b0dbbecd5 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg @@ -295,7 +295,7 @@ message= _ "Unfortunately, because of our hasty flight from our village, we are short on water-skins and rations. We’ll have enough if we move quickly and eat as little as possible, but we won’t last long in the wastes if we can’t find more sources of water. As it is, between the heat of the day and the cold of the night, this journey will be hard on our people." [/message] - # Rewriten message -> explains new dehydration rules + # Rewritten message -> explains new dehydration rules [message] speaker=narrator message= _ "During the daytime (Dawn, Morning, Midday, Afternoon, and Dusk) at the beginning of each your turns, every unit in a sand, road, rubble or sand dune hex will suffer from thirst. Each turn of thirst reduces a unit’s attack damage and causes $dehydration_loss hitpoints of damage. Healers can prevent dehydration from becoming worse, but cannot heal it. Only by refreshing at an oasis (any water hex) at the start of your turn will your units regain full attack strength." diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg index a0c39b2b94b..bfb5cb1151d 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg @@ -115,7 +115,7 @@ x,y=24-42, 23-50 [/avoid] - #bats cant go west and attack dwarves + #bats can't go west and attack dwarves [avoid] x,y=33-35,13-15 [/avoid] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios_old/02_Across_the_Harsh_Sands.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios_old/02_Across_the_Harsh_Sands.cfg index 0cba3c3d199..48c90aa8cae 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios_old/02_Across_the_Harsh_Sands.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios_old/02_Across_the_Harsh_Sands.cfg @@ -295,7 +295,7 @@ message= _ "Unfortunately, because of our hasty flight from our village, we are short on water-skins and rations. We’ll have enough if we move quickly and eat as little as possible, but we won’t last long in the wastes if we can’t find more sources of water. As it is, between the heat of the day and the cold of the night, this journey will be hard on our people." [/message] - # Rewriten message -> explains new dehydration rules + # Rewritten message -> explains new dehydration rules [message] speaker=narrator message= _ "During the daytime (Dawn, Morning, Midday, Afternoon, and Dusk) at the beginning of each your turns, every unit in a sand, road, rubble or sand dune hex will suffer from thirst. Each turn of thirst reduces a unit’s attack damage and causes $dehydration_loss hitpoints of damage. Healers can prevent dehydration from becoming worse, but cannot heal it. Only by refreshing at an oasis (any water hex) at the start of your turn will your units regain full attack strength." diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios_old/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios_old/06b_In_the_Domain_of_Dwarves.cfg index 01fd88dbfc7..fdf962a9626 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios_old/06b_In_the_Domain_of_Dwarves.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios_old/06b_In_the_Domain_of_Dwarves.cfg @@ -115,7 +115,7 @@ x,y=24-42, 23-50 [/avoid] - #bats cant go west and attack dwarves + #bats can't go west and attack dwarves [avoid] x,y=33-35,13-15 [/avoid] diff --git a/data/core/about.cfg b/data/core/about.cfg index 081c1759dd3..bf7ece91a82 100644 --- a/data/core/about.cfg +++ b/data/core/about.cfg @@ -86,7 +86,7 @@ [/entry] [entry] name = "Eric S. Raymond (ESR)" - comment = "Macro library reorganization, major UI makeover introducing lightweight transparent popups and linger mode, maintainance tools for WML, eight campaigns lifted from UMC, one all-original campaign, editor refactoring, many many code cleanups, and svn-to-git migration." + comment = "Macro library reorganization, major UI makeover introducing lightweight transparent popups and linger mode, maintenance tools for WML, eight campaigns lifted from UMC, one all-original campaign, editor refactoring, many many code cleanups, and svn-to-git migration." [/entry] [entry] name = "Eugen Jiresch (euschn)" @@ -199,7 +199,7 @@ [entry] name = "Pauli Nieminen (suokko)" email = "paniemin_AT_cc.hut.fi" - comment = "Bug fixing; usualy targeting MP or WML engine" + comment = "Bug fixing; usually targeting MP or WML engine" [/entry] [entry] name = "Philippe Plantier (Ayin)" @@ -1645,7 +1645,7 @@ [/entry] [entry] name = "Vladimír Slávik" - comment = "Miscellanous text formating and translation engine related help" + comment = "Miscellaneous text formatting and translation engine related help" [/entry] [entry] name = "vn971, vgaming" diff --git a/data/core/about_i18n.cfg b/data/core/about_i18n.cfg index e9c09003c72..df8f4c98fea 100644 --- a/data/core/about_i18n.cfg +++ b/data/core/about_i18n.cfg @@ -659,7 +659,7 @@ sort=yes [/entry] [/about] -# no strings commited so far +# no strings committed so far [about] title = _"Friulian Translation" # wmllint: no spellcheck [entry] diff --git a/data/core/help.cfg b/data/core/help.cfg index 1c65819af5e..556879594e2 100644 --- a/data/core/help.cfg +++ b/data/core/help.cfg @@ -547,7 +547,7 @@ Switch debug mode on (does not work in multiplayer). See dst='debug_command Debug mode is turned off by quitting the game or :nodebug. " + "
text=':droid [] [on|off]'
" + _ " -Set or toggle player on side between human and AI player. The player/client who controls that side needs to issue this command. If no second parameter is supplied, toggle bewteen human and AI. If it is ‘on’, set an AI controller. If it is ‘off’ set a human controller. Defaults to the currently active side if no parameter is supplied. +Set or toggle player on side between human and AI player. The player/client who controls that side needs to issue this command. If no second parameter is supplied, toggle between human and AI. If it is ‘on’, set an AI controller. If it is ‘off’ set a human controller. Defaults to the currently active side if no parameter is supplied. " + "
text=':controller '
" + _ " Display the controller status of a side. diff --git a/data/core/macros/teleport-utils.cfg b/data/core/macros/teleport-utils.cfg index 4ae49052e1f..6a7a1c8b65e 100644 --- a/data/core/macros/teleport-utils.cfg +++ b/data/core/macros/teleport-utils.cfg @@ -26,7 +26,7 @@ #define TELEPORT_TILE OLD_X OLD_Y NEW_X NEW_Y # Teleports a unit on tile OLD_X,OLD_Y to NEW_X,NEW_Y # - # For example, teleport any unit thats currently on 1,1 to 4,5 + # For example, teleport any unit that's currently on 1,1 to 4,5 #! {TELEPORT_TILE 1 1 4 5} [teleport] [filter] diff --git a/data/core/terrain-graphics/tracks.cfg b/data/core/terrain-graphics/tracks.cfg index fe9928d97f3..3d21aea7860 100644 --- a/data/core/terrain-graphics/tracks.cfg +++ b/data/core/terrain-graphics/tracks.cfg @@ -11,7 +11,7 @@ {TRACK_CONNECT {N_S_VALUE} {FLAG} s sw nw n ne se * * * * 2 *} {TRACK_CONNECT {NE_SW_VALUE} {FLAG} sw nw n ne se s * * * * * 2} - # mark -away- on sides where we should have exited but didnt + # mark -away- on sides where we should have exited but didn't {TRACK_AWAY {N_S_VALUE} {SE_NW_VALUE} {FLAG} s nw se n sw ne 2 3 * * * *} {TRACK_AWAY {N_S_VALUE} {NE_SW_VALUE} {FLAG} s ne sw n se nw * 3 2 * * *} {TRACK_AWAY {NE_SW_VALUE} {N_S_VALUE} {FLAG} sw n s ne nw se * 2 3 * * *} diff --git a/data/core/terrain-graphics/transitions.cfg b/data/core/terrain-graphics/transitions.cfg index 7580459f704..d9e1f3d7a35 100644 --- a/data/core/terrain-graphics/transitions.cfg +++ b/data/core/terrain-graphics/transitions.cfg @@ -19,7 +19,7 @@ #enddef # Legacy macro used for same purpose as DISABLE_BASE_TRANSITIONS. -# Kept for compatability. +# Kept for compatibility. #define DISABLE_TRANSITIONS TERRAIN_PATTERN {DISABLE_BASE_TRANSITIONS ({TERRAIN_PATTERN})} diff --git a/data/core/terrain.cfg b/data/core/terrain.cfg index 531b047b93f..994ea0e0347 100644 --- a/data/core/terrain.cfg +++ b/data/core/terrain.cfg @@ -2733,7 +2733,7 @@ For those who go by land or sea, a bridge is the best of both worlds — for gam hide_help=yes [/terrain_type] -# Kept for compability +# Kept for compatibility [terrain_type] symbol_image=void/void editor_image=void/shroud-editor diff --git a/data/core/units/merfolk/Entangler.cfg b/data/core/units/merfolk/Entangler.cfg index efdb6b386c0..7d417c7ee2e 100644 --- a/data/core/units/merfolk/Entangler.cfg +++ b/data/core/units/merfolk/Entangler.cfg @@ -16,7 +16,7 @@ {AMLA_DEFAULT} cost=46 usage=mixed fighter - description= _ "Merfolk tend to use a combination of both nets and clubs in fishing; nets to collect the fish, and clubs to finish the kill. Both of these tools have seen adaptation for warfare, and are valuable enough that auxilliaries who specialize in using them are deliberately brought to battle. + description= _ "Merfolk tend to use a combination of both nets and clubs in fishing; nets to collect the fish, and clubs to finish the kill. Both of these tools have seen adaptation for warfare, and are valuable enough that auxiliaries who specialize in using them are deliberately brought to battle. Mermen often find themselves in a standoff with land-based enemies; the merfolk are too strong in the water, and are too weak to make any offense on land. Nets are a key bit of leverage; without nets, mermen can’t give any effective chase over land, and are at a great disadvantage in hand-to-hand combat."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW} {DEFENSE_ANIM "units/merfolk/entangler.png" "units/merfolk/entangler.png" mermen-hit.wav } diff --git a/data/gui/widget/menu_button_default.cfg b/data/gui/widget/menu_button_default.cfg index 9546fdc93b8..4affab719a0 100644 --- a/data/gui/widget/menu_button_default.cfg +++ b/data/gui/widget/menu_button_default.cfg @@ -16,13 +16,13 @@ [/rectangle] #enddef -#define _GUI_TEXT FONT_SIZE FONT_COLOR +#define _GUI_TEXT FONT_SIZE FONT_COLOR [text] x = 5 y = {GUI__TEXT_VERTICALLY_CENTRED} w = "(text_width)" h = "(text_height)" - # 25 offset to accomadate the arrow + # 25 offset to accommodate the arrow maximum_width = "(width - 25)" font_size = {FONT_SIZE} color = {FONT_COLOR} diff --git a/data/gui/widget/multimenu_button_default.cfg b/data/gui/widget/multimenu_button_default.cfg index b5ce9aa0291..0f277c740a0 100644 --- a/data/gui/widget/multimenu_button_default.cfg +++ b/data/gui/widget/multimenu_button_default.cfg @@ -16,13 +16,13 @@ [/rectangle] #enddef -#define _GUI_TEXT FONT_SIZE FONT_COLOR +#define _GUI_TEXT FONT_SIZE FONT_COLOR [text] x = 5 y = {GUI__TEXT_VERTICALLY_CENTRED} w = "(text_width)" h = "(text_height)" - # 25 offset to accomadate the arrow + # 25 offset to accommodate the arrow maximum_width = "(width - 25)" font_size = {FONT_SIZE} color = {FONT_COLOR} diff --git a/data/gui/widget/panel_story_viewer.cfg b/data/gui/widget/panel_story_viewer.cfg index 27623926a49..9e33143032b 100644 --- a/data/gui/widget/panel_story_viewer.cfg +++ b/data/gui/widget/panel_story_viewer.cfg @@ -20,7 +20,7 @@ [draw] - # This works fine for normal messges. However, messages with options behave + # This works fine for normal messages. However, messages with options behave # strangely, and messages with scrollbars perform badly. # Uncomment once this has been fixed. #{DEFAULT_BLUR} diff --git a/data/gui/widget/panel_wml_message.cfg b/data/gui/widget/panel_wml_message.cfg index 5fb244ad313..d4e7f8d5446 100644 --- a/data/gui/widget/panel_wml_message.cfg +++ b/data/gui/widget/panel_wml_message.cfg @@ -20,7 +20,7 @@ [draw] - # This works fine for normal messges. However, messages with options behave + # This works fine for normal messages. However, messages with options behave # strangely, and messages with scrollbars perform badly. # Uncomment once this has been fixed. #{DEFAULT_BLUR} @@ -66,4 +66,3 @@ #undef _GUI_RESOLUTION #undef _GUI_BASE_NAME - diff --git a/data/gui/window/addon_manager.cfg b/data/gui/window/addon_manager.cfg index 63665d6f4a8..72464fa4153 100644 --- a/data/gui/window/addon_manager.cfg +++ b/data/gui/window/addon_manager.cfg @@ -691,7 +691,7 @@ id = "filter" definition = "filter" - tooltip = _ "Filters on addon descripton, version, type or author." + tooltip = _ "Filters on addon description, version, type or author." [/text_box] [/column] @@ -907,13 +907,13 @@ [row] grow_factor = 1 - + [column] grow_factor = 0 border = "all" border_size = 5 horizontal_alignment = "left" - + [button] id = "details_toggle" definition = "default" diff --git a/data/gui/window/drop_down_list.cfg b/data/gui/window/drop_down_list.cfg index e9d9642b037..19e35da423a 100644 --- a/data/gui/window/drop_down_list.cfg +++ b/data/gui/window/drop_down_list.cfg @@ -22,7 +22,7 @@ min( maximum_height = 700 width = "(max(button_w, if(window_width > 0, window_width, screen_width)))" height = "({FORMULA_WINDOW_HEIGHT})" - ## Show the droplist below or above the button, wherever we have enough space. Below is prefered. + ## Show the droplist below or above the button, wherever we have enough space. Below is preferred. x = "(min(button_x, screen_width - window_width))" y = "( if(screen_height - button_h - button_y >= best_height, diff --git a/data/lua/ilua.lua b/data/lua/ilua.lua index f031df07830..b578045eadb 100644 --- a/data/lua/ilua.lua +++ b/data/lua/ilua.lua @@ -4,7 +4,7 @@ -- will try to print out tables recursively, subject to the pretty_print_limit value. -- Steve Donovan, 2007 -- Adapted by iceiceice for wesnoth, 2014 --- Retrived from: http://lua-users.org/files/wiki_insecure/users/steved/ilua.lua +-- Retrieeved from: http://lua-users.org/files/wiki_insecure/users/steved/ilua.lua -- Note: This file is loaded automatically by the engine. local pretty_print_limit = 20 diff --git a/data/multiplayer/scenarios/2p_Dark_Forecast.lua b/data/multiplayer/scenarios/2p_Dark_Forecast.lua index a251dc3e89b..e7d8004ba8d 100644 --- a/data/multiplayer/scenarios/2p_Dark_Forecast.lua +++ b/data/multiplayer/scenarios/2p_Dark_Forecast.lua @@ -257,7 +257,7 @@ local function final_spawn() place_units(types, spawn.x, spawn.y) end --- convert all 'veteran' units from side 2 to the more agressive side 1 +-- convert all 'veteran' units from side 2 to the more aggressive side 1 -- this must happen before the new units are created from spawns. on_event("new turn", function() for i, unit in ipairs(wesnoth.get_units { side = 2 }) do @@ -491,5 +491,3 @@ on_event("side 3 turn", function() error("unknown weather '" .. tostring(weather_event.weather_id) .. "'") end end) - - diff --git a/data/schema.cfg b/data/schema.cfg index aa1e95c4ca8..7f965a9b71b 100644 --- a/data/schema.cfg +++ b/data/schema.cfg @@ -424,7 +424,7 @@ _part="repeated part" [/story] [part] - # TODO: _background_layer="optinal ..." # TODO: Required 'background' defined + # TODO: _background_layer="optional ..." # TODO: Required 'background' defined # TODO: _image=... background="optional string" # TODO: Can be improved to check if the image file really exists @@ -505,7 +505,7 @@ simple_targeting="optional boolean" support_villages="optional boolean" village_value="optional float limit-lower(0)" - villages_per_scout="optional float limit-lower(0)" + villages_per_scout="optional float limit-lower(0)" [/ai] [/schema] diff --git a/data/test/scenarios/prestart_settings.cfg b/data/test/scenarios/prestart_settings.cfg index e1fec5a85c8..481fbd19fd4 100644 --- a/data/test/scenarios/prestart_settings.cfg +++ b/data/test/scenarios/prestart_settings.cfg @@ -1,4 +1,4 @@ -# Tests how various variable settings occuring in prestart +# Tests how various variable settings occurring in prestart # and in early events work out. # For example, whether setting gold of a side in prestart works, or goes OOS # Also, whether setting the turn counter works. diff --git a/data/test/scenarios/sighted_events.cfg b/data/test/scenarios/sighted_events.cfg index 681c42bd77a..fe440d83ea3 100644 --- a/data/test/scenarios/sighted_events.cfg +++ b/data/test/scenarios/sighted_events.cfg @@ -4,7 +4,7 @@ # We pass if the elvish archer is the discoverer, and the # variable "sighted_should_trigger" is set. # Companion tests check what happens if the orc is discovered -# on the elf's turn, and also that we fail if we dont set the +# on the elf's turn, and also that we fail if we don't set the # flag. #define TEST_SIGHTED_EVENTS_SCEN ID BOB_CONDITION SET_FLAG diff --git a/data/test/scenarios/test_menu_items.cfg b/data/test/scenarios/test_menu_items.cfg index c0a9b7343ac..ba9fb3ba33a 100644 --- a/data/test/scenarios/test_menu_items.cfg +++ b/data/test/scenarios/test_menu_items.cfg @@ -65,7 +65,7 @@ )} # -# An ammended form of the above test, which checks a menu item which creates a unit, +# An amended form of the above test, which checks a menu item which creates a unit, # being fired twice. # {GENERIC_UNIT_TEST "test_wml_menu_items_3" ( diff --git a/data/themes/_initial.cfg b/data/themes/_initial.cfg index 606f440bb77..9489ed83f01 100644 --- a/data/themes/_initial.cfg +++ b/data/themes/_initial.cfg @@ -6,7 +6,7 @@ background_image = "terrain/off-map/background.png" # this image is processed by the terrain matching code so should be - # in the terrains directory and should ommit the 'terrain/' prefix + # in the terrains directory and should omit the 'terrain/' prefix # and the '.png' suffix tile_image = "off-map/alpha.png" [/main_map_border] diff --git a/data/themes/classic.cfg b/data/themes/classic.cfg index 31f21096014..49915354ac7 100644 --- a/data/themes/classic.cfg +++ b/data/themes/classic.cfg @@ -53,7 +53,7 @@ background_image = "terrain/off-map/background.png" # this image is processed by the terrain matching code so should be - # in the terrains directory and should ommit the 'terrain/' prefix + # in the terrains directory and should omit the 'terrain/' prefix # and the '.png' suffix tile_image = "off-map/alpha.png" [/main_map_border] @@ -557,7 +557,7 @@ image=button_normal/button_H22 rect="=+17,=+3,+80,+20" [/change] - # adjust allowed heigth for displaying weapon stuff + # adjust allowed height for displaying weapon stuff [change] id=unit-weapons ref=unit-defense