Apply trunk r6496 to trunk.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6497 c06c8d41-db1a-0410-9941-cceddc491573

4 files changed, 9 insertions, 8 deletions

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 3dd6883dc1..11ff6eca6e 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -1077,7 +1077,7 @@ static std::string _describe_weapon( const item_def &item, bool verbose)
                 description += "$It is well-crafted and very durable.";
 
             description += "$";
-            description += (race == ISFLAG_DWARVEN) ? "Dwarfs" :
+            description += (race == ISFLAG_DWARVEN) ? "Dwarves" :
                            (race == ISFLAG_ELVEN)   ? "Elves"
                                                     : "Orcs";
             description += " are more deadly with it";
@@ -1190,7 +1190,7 @@ static std::string _describe_ammo( const item_def &item )
             unsigned long race = get_equip_race(item);
 
             description += "It is more deadly when thrown by ";
-            description += (race == ISFLAG_DWARVEN) ? "dwarfs" :
+            description += (race == ISFLAG_DWARVEN) ? "dwarves" :
                            (race == ISFLAG_ELVEN)   ? "elves"
                                                     : "orcs";
             description += (can_launch) ? ", and it" : ".";
@@ -1343,7 +1343,7 @@ static std::string _describe_armour( const item_def &item, bool verbose )
         }
 
         description += "$It fits ";
-        description += (race == ISFLAG_DWARVEN) ? "dwarfs" :
+        description += (race == ISFLAG_DWARVEN) ? "dwarves" :
                        (race == ISFLAG_ELVEN)   ? "elves"
                                                 : "orcs";
         description += " well.";
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index b71d76e7e4..9398b487ca 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2330,7 +2330,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
 
             baseDam = property(item, PWPN_DAMAGE);
 
-            // Dwarfs/orcs with dwarven/orcish weapons.
+            // Dwarves/orcs with dwarven/orcish weapons.
             if (get_equip_race(item) == ISFLAG_DWARVEN
                    && player_genus(GENPC_DWARVEN)
                 || get_equip_race(item) == ISFLAG_ORCISH
diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc
index dc0d1bfd5c..e9b9c1193f 100644
--- a/crawl-ref/source/libutil.cc
+++ b/crawl-ref/source/libutil.cc
@@ -339,9 +339,10 @@ std::string pluralise(const std::string &name,
         // knife -> knives
         return name.substr(0, name.length() - 2) + "ves";
     }
-    else if (ends_with(name, "elf") || ends_with(name, "olf"))
+    else if (ends_with(name, "elf") || ends_with(name, "olf")
+              || ends_with(name, "arf"))
     {
-        // Elf, wolf. Dwarfs can stay dwarfs, if there were dwarfs.
+        // Elf, wolf, dwarf.
         return name.substr(0, name.length() - 1) + "ves";
     }
     else if (ends_with(name, "mage"))
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 25128edb68..9897f63201 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1666,7 +1666,7 @@ static item_status_flag_type _determine_missile_race(const item_def& item,
             rc = ISFLAG_ORCISH;
         }
 
-        // Dwarfs don't make arrows, sling bullets, javelins, or
+        // Dwarves don't make arrows, sling bullets, javelins, or
         // throwing nets.
         if ((item.sub_type == MI_DART || item.sub_type == MI_BOLT)
             && one_chance_in(6))
@@ -1674,7 +1674,7 @@ static item_status_flag_type _determine_missile_race(const item_def& item,
             rc = ISFLAG_DWARVEN;
         }
 
-        // Dwarfs don't make needles.
+        // Dwarves don't make needles.
         if (item.sub_type == MI_NEEDLE)
         {
             if (one_chance_in(10))