Apply a patch by castamir to fix a multitude of typos.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8005 c06c8d41-db1a-0410-9941-cceddc491573

23 files changed, 45 insertions, 45 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index f75e07ae88..bd122ecf91 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -3733,7 +3733,7 @@ static void _close_door(coord_def move)
 
             if (you.pos() == dc)
             {
-                mprf("There's a thickheaded creature in the %sway!", noun);
+                mprf("There's a thick-headed creature in the %sway!", noun);
                 return;
             }
         }
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 05bac81884..248c50f04c 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -5561,13 +5561,13 @@ std::string beam_type_name(beam_type type)
     case BEAM_POLYMORPH: return("polymorph");
     case BEAM_CHARM: return("enslave");
     case BEAM_BANISH: return("banishment");
-    case BEAM_DEGENERATE: return("degenration");
+    case BEAM_DEGENERATE: return("degeneration");
     case BEAM_ENSLAVE_UNDEAD: return("enslave undead");
     case BEAM_ENSLAVE_SOUL: return("enslave soul");
     case BEAM_PAIN: return("pain");
     case BEAM_DISPEL_UNDEAD: return("dispel undead");
     case BEAM_DISINTEGRATION: return("disintegration");
-    case BEAM_ENSLAVE_DEMON: return("enlsave demon");
+    case BEAM_ENSLAVE_DEMON: return("enslave demon");
     case BEAM_BLINK: return("blink");
     case BEAM_PETRIFY: return("petrify");
     case BEAM_BACKLIGHT: return("backlight");
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc
index 1aef71e6a9..3bd88f9340 100644
--- a/crawl-ref/source/branch.cc
+++ b/crawl-ref/source/branch.cc
@@ -74,7 +74,7 @@ bool set_branch_flags(unsigned long flags, bool silent,
         && you.skills[SK_TRANSLOCATIONS] > 0
         && could_control && !can_control && !silent)
     {
-        mpr("You sense the appearence of a powerful magical force "
+        mpr("You sense the appearance of a powerful magical force "
             "which warps space.", MSGCH_WARN);
     }
 
diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc
index 155168a3db..6f50aa8146 100644
--- a/crawl-ref/source/chardump.cc
+++ b/crawl-ref/source/chardump.cc
@@ -358,7 +358,7 @@ static void _sdump_gold(dump_params &par)
     if (you.attribute[ATTR_DONATIONS] > 0)
     {
         lines++;
-        text += make_stringf("You %sdonated %d gold pices.\n", have,
+        text += make_stringf("You %sdonated %d gold pieces.\n", have,
                              you.attribute[ATTR_DONATIONS]);
     }
 
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 3066b5a311..1fbab5fdfe 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -760,7 +760,7 @@ static const char *targeting_help_1 =
     "<w>Shift-Dir</w> : shoot straight-line beam\n"
 #ifdef WIZARD
     " \n"
-    "<h>Wizard targeting comands:</h>\n"
+    "<h>Wizard targeting commands:</h>\n"
     "<w>g</w>: give item to monster\n"
     "<w>s</w>: force monster to shout or speak\n"
     "<w>S</w>: make monster a summoned monster\n"
@@ -1135,13 +1135,13 @@ static void _append_non_item(std::string &desc, std::string key)
     unsigned int flags = get_spell_flags(type);
 
     if (flags & SPFLAG_DEVEL)
-        desc += "$This spell is still being developped, and is only avaible "
+        desc += "$This spell is still being developed, and is only available "
                 "via the &Z wizard command.";
     else if (flags & SPFLAG_TESTING)
-        desc += "$This is a testing spell, only avaible via the "
+        desc += "$This is a testing spell, only available via the "
                 "&Z wizard command.";
     else if (flags & SPFLAG_MONSTER)
-        desc += "$This is a monster-only spell, only avaible via the "
+        desc += "$This is a monster-only spell, only available via the "
                 "&Z wizard command.";
     else if (flags & SPFLAG_CARD)
         desc += "$This is a card-effect spell, unavailable in ordinary "
diff --git a/crawl-ref/source/dat/database/rand_arm.txt b/crawl-ref/source/dat/database/rand_arm.txt
index 2ec884633d..8fc562e800 100644
--- a/crawl-ref/source/dat/database/rand_arm.txt
+++ b/crawl-ref/source/dat/database/rand_arm.txt
@@ -480,7 +480,7 @@ Unambiguity
 
 the Lost Path
 
-Misanthrophy
+Misanthropy
 %%%%
 plain_armour_name
 
diff --git a/crawl-ref/source/dat/database/wpnnoise.txt b/crawl-ref/source/dat/database/wpnnoise.txt
index e1d32f4744..948dc2d1ef 100644
--- a/crawl-ref/source/dat/database/wpnnoise.txt
+++ b/crawl-ref/source/dat/database/wpnnoise.txt
@@ -244,7 +244,7 @@ speaking
 
 @The_weapon@ @points_out@ the lack of singing @not_swords@. 
 
-@The_weapon@ embarks on a lenghty monologue about murderous music.
+@The_weapon@ embarks on a lengthy monologue about murderous music.
 
 @The_weapon@ compliments itself on its singing voice.
 
diff --git a/crawl-ref/source/dat/descript/ability.txt b/crawl-ref/source/dat/descript/ability.txt
index c76ef0d985..ebfe1838c8 100644
--- a/crawl-ref/source/dat/descript/ability.txt
+++ b/crawl-ref/source/dat/descript/ability.txt
@@ -175,7 +175,7 @@ Summon Divine Warrior
 
 Summoned Angels and Daevas are powerful warriors against evil. They might be blessed by the Shining One to stay longer or even permanently in this world.
 %%%%
-# Both Kikubaaqudgha and Yredelmnul.
+# Both Kikubaaqudgha and Yredelemnul.
 Recall Undead Slaves
 
 Recall your undead followers from anywhere on the level to your immediate surroundings.
diff --git a/crawl-ref/source/dat/descript/branches.txt b/crawl-ref/source/dat/descript/branches.txt
index be50533b7c..51b5445e3d 100644
--- a/crawl-ref/source/dat/descript/branches.txt
+++ b/crawl-ref/source/dat/descript/branches.txt
@@ -43,7 +43,7 @@ Shoals
 
 From afar you hear the steady sounds of waves and smell the salty spray. 
 Upon reaching the Shoals, you are impressed by exotic underground beaches, 
-making up a few islands in a vast sea. Out of a sudden, a bloodcurling 
+making up a few islands in a vast sea. Out of a sudden, a bloodcurdling 
 scream fills the air, followed by a gurgle. Anxiously, you look around and 
 wonder: who is the predator? And who is the prey?
 
@@ -90,7 +90,7 @@ Once upon a time, all the daggers and axes and polearms would gather at the
 time of night and dance the waltz, dreaming of battlefields void of man and
 beast. That time is no more, yet the weapons are still there.
 
-The Hall of Blades is a single level amd can be found between Vaults:4 and
+The Hall of Blades is a single level and can be found between Vaults:4 and
 Vaults:6.
 %%%%
 Crypt
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index 93899475b7..da7a332d21 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -159,7 +159,7 @@ A tall bounty hunter.
 %%%%
 Killer Klown
 
-A comical figure full of life and laughter.  It looks very happy to see you... but is there a slightly malicious cast to its features?  Is that red facepaint or something altogether less pleasant?
+A comical figure full of life and laughter.  It looks very happy to see you... but is there a slightly malicious cast to its features?  Is that red face paint or something altogether less pleasant?
 %%%%
 Lom Lobon
 
@@ -390,7 +390,7 @@ A disembodied toe, hanging in the air and radiating an intense field of negative
 %%%%
 cyclops
 
-A giant with one eye in the centre of its forehead.  Despite their lack of binocular vision, cyclopes throw boulders with fearsome accuracy.
+A giant with one eye in the centre of its forehead.  Despite their lack of binocular vision, cyclopi throw boulders with fearsome accuracy.
 %%%%
 # Only used in lookup mode, not when examining an actual monster.
 dancing weapon
@@ -463,7 +463,7 @@ deep elf priest
 
 This deep elf is a servant of an ancient dark god. Deep elves are extremely 
 hostile towards any alien outside their tribe, including deep elves from 
-elsewhere. Noone ever made success in understanding the religious standings
+elsewhere. No one ever made success in understanding the religious standings
 of these elves.
 %%%%
 deep elf soldier
diff --git a/crawl-ref/source/dat/descript/skills.txt b/crawl-ref/source/dat/descript/skills.txt
index a9417cac42..760b5732b5 100644
--- a/crawl-ref/source/dat/descript/skills.txt
+++ b/crawl-ref/source/dat/descript/skills.txt
@@ -72,7 +72,7 @@ Being skilled in Staves makes becoming skilled in Polearms easier.
 Slings
 
 Being skilled in a particular type of ranged attack will let you deal 
-more damage when using the appropriate launcher an dammunition.
+more damage when using the appropriate launcher and ammunition.
 
 If you're already trained in Throwing, you'll pick up the Slings skill
 faster, and vice versa.
@@ -90,7 +90,7 @@ more damage when using the appropriate launcher and ammunition.
 Darts
 
 Being skilled in a particular type of ranged attack will let you deal 
-more damage when using the appropriate launcher an dammunition.
+more damage when using the appropriate launcher and ammunition.
 %%%%
 Throwing
 
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index 5e6b9a1589..34baa50826 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -644,7 +644,7 @@ static dungeon_feature_type _find_appropriate_stairs(bool down)
         }
         else
         {
-            mpr("Bug in determing level exit.");
+            mpr("Bug in determining level exit.");
             return DNGN_UNSEEN;
         }
     }
@@ -677,7 +677,7 @@ static dungeon_feature_type _find_appropriate_stairs(bool down)
         return DNGN_UNSEEN;
     }
 
-    mpr("Impossible occurence in find_appropriate_stairs()");
+    mpr("Impossible occurrence in find_appropriate_stairs()");
     return DNGN_UNSEEN;
 }
 #endif
@@ -2706,7 +2706,7 @@ void debug_item_statistics( void )
         return;
     }
 
-    mpr( "Generate stats for: [a] aquirement [b] randart properties");
+    mpr( "Generate stats for: [a] acquirement [b] randart properties");
 
     const int keyin = tolower( get_ch() );
     switch ( keyin )
@@ -5066,7 +5066,7 @@ void debug_miscast( int target_index )
 
     // Handle repeats ourselves since miscasts are likely to interrupt
     // command repetions, especially if the player is the target.
-    int repeats = _debug_prompt_for_int("Number of repitions? ", true);
+    int repeats = _debug_prompt_for_int("Number of repetitions? ", true);
     if (repeats < 1)
     {
         canned_msg(MSG_OK);
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index c8b3e49452..71dd75dd8a 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -397,7 +397,7 @@ bool set_level_flags(unsigned long flags, bool silent)
     if (you.skills[SK_TRANSLOCATIONS] > 0
         && could_control && !can_control && !silent)
     {
-        mpr("You sense the appearence of a powerful magical force "
+        mpr("You sense the appearance of a powerful magical force "
             "which warps space.", MSGCH_WARN);
     }
 
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 5a1b84b795..16a1cb685c 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2191,7 +2191,7 @@ enum chaos_type
     NUM_CHAOS_TYPES
 };
 
-// XXX: We might want to vary the probabilites for the various effects
+// XXX: We might want to vary the probabilities for the various effects
 // based on whether the source is weapon of chaos or a monster with
 // AF_CHAOS
 void melee_attack::chaos_affects_defender()
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index d736e1d8d7..d1e47e9b16 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -349,7 +349,7 @@ static std::string _no_selectables_message(int item_selector)
     case OSEL_MEMORISE:
         return("You aren't carrying any spellbooks.");
     case OSEL_RECHARGE:
-        return("You aren't carrying any rechargable items.");
+        return("You aren't carrying any rechargeable items.");
     case OSEL_ENCH_ARM:
         return("You aren't carrying any armour which can be enchanted "
                "further.");
@@ -843,7 +843,7 @@ static bool _item_class_selected(const item_def &i, int selector)
         return (itype == OBJ_SCROLLS || itype == OBJ_BOOKS);
 
     case OSEL_RECHARGE:
-        return (item_is_rechargable(i, true));
+        return (item_is_rechargeable(i, true));
 
     case OSEL_ENCH_ARM:
         return (is_enchantable_armour(i, true));
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 7d638147b1..a1d9ba74a8 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -4228,7 +4228,7 @@ static bool _scroll_modify_item(item_def scroll)
         }
         break;
     case SCR_RECHARGING:
-        if (item_is_rechargable(item))
+        if (item_is_rechargeable(item))
         {
             // Might still fail on highly enchanted weapons of electrocution.
             // (If so, already prints the "Nothing happens" message.)
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 6df9597b0a..3f3dd28d1a 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -1322,7 +1322,7 @@ bool check_armour_shape( const item_def &item, bool quiet )
 }
 
 // If known is true, only returns true for *known* weapons of electrocution.
-bool item_is_rechargable(const item_def &it, bool known)
+bool item_is_rechargeable(const item_def &it, bool known)
 {
     // These are obvious...
     if (it.base_type == OBJ_WANDS || item_is_rod(it))
diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h
index 9635d6b358..4da74c1f11 100644
--- a/crawl-ref/source/itemprop.h
+++ b/crawl-ref/source/itemprop.h
@@ -634,7 +634,7 @@ int   fit_armour_size( const item_def &item, size_type size );
 bool  check_armour_size( const item_def &item, size_type size );
 bool  check_armour_shape( const item_def &item, bool quiet );
 
-bool item_is_rechargable(const item_def &it, bool known = false);
+bool item_is_rechargeable(const item_def &it, bool known = false);
 bool is_enchantable_weapon(const item_def &wpn, bool uncurse);
 bool is_enchantable_armour(const item_def &arm, bool uncurse);
 
diff --git a/crawl-ref/source/luadgn.cc b/crawl-ref/source/luadgn.cc
index 66ef2b23f9..b85a67d5f7 100644
--- a/crawl-ref/source/luadgn.cc
+++ b/crawl-ref/source/luadgn.cc
@@ -2629,7 +2629,7 @@ LUAFN(dgn_set_level_type_name_abbrev)
     if (!lua_isstring(ls, 1))
     {
         luaL_argerror(ls, 1, "Expected string for level type name "
-                             "abberviation");
+                             "abbreviation");
         return(0);
     }
 
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 918cdcc6c4..6e3aad8da5 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -5050,7 +5050,7 @@ std::string monsters::hand_name(bool plural, bool *can_plural) const
     case MON_SHAPE_INSECT:
     case MON_SHAPE_INSECT_WINGED:
     case MON_SHAPE_CENTIPEDE:
-        str = "antena";
+        str = "antenna";
         break;
 
     case MON_SHAPE_SNAIL:
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index ddd5d3e57c..b5244c75df 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -704,8 +704,8 @@ const char *lose_mutation[][3] = {
     {"You feel an ache in your throat.", "You feel an ache in your throat.",
      "You feel an ache in your throat."},
 
-    {"You feel slightly disorientated.", "You feel slightly disorientated.",
-     "You feel slightly disorientated."},
+    {"You feel slightly disoriented.", "You feel slightly disoriented.",
+     "You feel slightly disoriented."},
 
 // 30
     {"A chill runs up and down your throat.",
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index d24e2b1523..d448f053c5 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -914,7 +914,7 @@ static void _try_monster_cast(spell_type spell, int powc,
         return;
     }
 
-    mpr("Invalid player spell, attemtping to cast it as monster spell.");
+    mpr("Invalid player spell, attempting to cast it as monster spell.");
 
     monsters* mon = &menv[midx];
 
@@ -4435,7 +4435,7 @@ void MiscastEffect::_earth(int severity)
             else
             {
                 you_msg      = "You momentarily stiffen.";
-                mon_msg_seen = "@The_monster@ momentariliy stiffens.";
+                mon_msg_seen = "@The_monster@ momentarily stiffens.";
             }
             break;
         case 11:
@@ -4462,7 +4462,7 @@ void MiscastEffect::_earth(int severity)
             case 1:
                 you_msg        = "You are blasted with sand!";
                 mon_msg_seen   = "@The_monster@ is blasted with sand!";
-                mon_msg_unseen = "A minature sandstorm briefly appears!";
+                mon_msg_unseen = "A miniature sandstorm briefly appears!";
                 break;
             case 2:
                 you_msg        = "Rocks fall onto you out of nowhere!";
@@ -4644,7 +4644,7 @@ void MiscastEffect::_air(int severity)
                              "discharges!";
             mon_msg_seen   = "@The_monster@ is caught in an explosion of "
                              "electrical discharges!";
-            mon_msg_unseen = "Elecectrical discharges explodes from out of "
+            mon_msg_unseen = "Electrical discharges explodes from out of "
                              "thin air!";
 
             beam.type    = dchar_glyph(DCHAR_FIRED_BURST);
@@ -4910,5 +4910,5 @@ std::string spell_range_string(spell_type spell)
     else
         return std::string("@") + std::string(range, '.')
             + "<darkgrey>" + std::string(maxrange - range, '.')
-            + "</dargrey>";
+            + "</darkgrey>";
 }
diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc
index 0a3e4d3529..52e319e5d6 100644
--- a/crawl-ref/source/tutorial.cc
+++ b/crawl-ref/source/tutorial.cc
@@ -691,7 +691,7 @@ void tutorial_death_screen()
     std::string text;
 
     mpr( "Condolences! Your character's premature death is a sad, but "
-         "common occurence in Crawl. Rest assured that with diligence and "
+         "common occurrence in Crawl. Rest assured that with diligence and "
          "playing experience your characters will last longer.",
          MSGCH_TUTORIAL);
 
@@ -1418,7 +1418,7 @@ static void _new_god_conduct()
     text.str("");
 
     text << "\nYou can check your god's likes and dislikes, as well as your "
-            "current standing and divine abilites, by typing <w>^</w>"
+            "current standing and divine abilities, by typing <w>^</w>"
 #ifdef USE_TILE
             " (alternatively press <w>Shift</w> while "
             "<w>right-clicking</w> on your avatar)"
@@ -2803,7 +2803,7 @@ void learned_something_new(tutorial_event_type seen_what, coord_def gc)
         text << "\nAlternatively, you can dump all information pertaining to "
                 "your character into a text file with the <w>#</w> command. "
                 "You can then find said file in the <w>morgue/</w> folder (<w>"
-             << you.your_name << ".txt</w>) and read it at your leasure. Also, "
+             << you.your_name << ".txt</w>) and read it at your leisure. Also, "
                 "such a file will automatically be created upon death (the "
                 "filename will then also contain the date) but that won't be "
                 "of much use to you now.";
@@ -2881,7 +2881,7 @@ static std::string _tut_target_mode(bool spells = false)
 {
    std::string result;
    result = "then be taken to target mode with the nearest monster or previous "
-            "target already targetted. You can also cycle through all hostile "
+            "target already targeted. You can also cycle through all hostile "
             "monsters in sight with <w>+</w> or <w>-</w>. "
             "Once you're aiming at the correct monster, simply hit "
             "<w>f</w>, <w>Enter</w> or <w>.</w> to shoot at it. "
@@ -3445,7 +3445,7 @@ void tutorial_describe_item(const item_def &item)
             break;
 
        case OBJ_MISCELLANY:
-            ostr << "Miscellanous items sometimes harbour magical powers. Try "
+            ostr << "Miscellaneous items sometimes harbour magical powers. Try "
                     "<w>w</w>ielding and e<w>v</w>oking it"
 #ifdef USE_TILE
                     ", either of which can be done by clicking on it"
@@ -3579,7 +3579,7 @@ void tutorial_describe_feature(dungeon_feature_type feat)
                         "dangerous task.\n\n"
 
                         "You can safely pass over a mechanical trap if "
-                        "you're flying or leviating.";
+                        "you're flying or levitating.";
             }
             else
             {