Generalized some taming stuff to work with Ocelots.

Changelog.txt

@@ -15,6 +15,8 @@ Version 2.0.00-dev
  + Added 'mcmmo.repair.arcanebypass' permission node to bypass Arcane Repair and keep your enchantments
  + Added config option to disable Herbalism's instant wheat replanting
  + Added LOTS of new permissions nodes. *CHECK PLUGIN.YML FOR UPDATES*
+ + Added Italian locale file - thanks Luxius96!
+ + Added ability to inspect Ocelots with Beast Lore
  = Fixed Green Terra not awarding Triple Drops
  = Fixed ClassCastException from Taming preventDamage checks
  = Fixed issue with Blast Mining not seeing TNT for detonation due to snow

src/main/java/com/gmail/nossr50/skills/Taming.java

@@ -101,13 +101,13 @@ public class Taming {
     }
 
     /**
-     * Get the name of a wolf's owner.
+     * Get the name of a tameable animal's owner.
      *
-     * @param theWolf The wolf whose owner's name to get
-     * @return the name of the wolf's owner, or "Offline Master" if the owner is offline
+     * @param beast The animal whose owner's name to get
+     * @return the name of the animal's owner, or "Offline Master" if the owner is offline
      */
-    private static String getOwnerName(Wolf theWolf) {
-        AnimalTamer tamer = theWolf.getOwner();
+    private static String getOwnerName(Tameable beast) {
+        AnimalTamer tamer = beast.getOwner();
 
         if (tamer instanceof Player) {
             Player owner = (Player) tamer;
@@ -225,10 +225,20 @@ public class Taming {
             if (item.getAmount() >= summonAmount) {
                 for (Entity x : player.getNearbyEntities(40, 40, 40)) {
                     if (x.getType().equals(type)) {
-                        player.sendMessage(mcLocale.getString("m.TamingSummonFailed"));
-                        return;
+                        switch (type) {
+                        case WOLF:
+                            player.sendMessage(mcLocale.getString("m.TamingSummonWolfFailed"));
+                            return;
+
+                        case OCELOT:
+                            player.sendMessage(mcLocale.getString("m.TamingSummonOcelotFailed"));
+                            return;
+
+                        default:
+                            return;
+                        }
                     }
-                }
+                }   
                 LivingEntity entity = player.getWorld().spawnCreature(player.getLocation(), type);
                 entity.setMetadata("mcmmoSummoned", new FixedMetadataValue(plugin, true));
                 ((Tameable) entity).setOwner(player);
@@ -243,29 +253,25 @@ public class Taming {
     }
 
     /**
-     * Inspect a tamed animal for details.
+     * Inspect a tameable animal for details.
      *
-     * @param event
-     * @param target
+     * @param event Event to modify
+     * @param target Animal to inspect
+     * @param inspector Player inspecting the animal
      */
-    public static void beastLore(EntityDamageByEntityEvent event, LivingEntity target, Player attacker) {
-
-        //TODO: Make this work for Ocelots
-        if (target.getType().equals(EntityType.WOLF)) {
-            Wolf wolf = (Wolf) target;
+    public static void beastLore(EntityDamageByEntityEvent event, LivingEntity target, Player inspector) {
+        if (target instanceof Tameable) {
+            Tameable beast = (Tameable) target;
             String message = mcLocale.getString("Combat.BeastLore") + " ";
-            int health = wolf.getHealth();
+            int health = target.getHealth();
             event.setCancelled(true);
 
-            if (wolf.isTamed()) {
-                message = message.concat(mcLocale.getString("Combat.BeastLoreOwner", new Object[] {getOwnerName(wolf)}) + " ");
-                message = message.concat(mcLocale.getString("Combat.BeastLoreHealthWolfTamed", new Object[] {health}));
-            }
-            else {
-                message = message.concat(mcLocale.getString("Combat.BeastLoreHealthWolf", new Object[] {health}));
+            if (beast.isTamed()) {
+                message = message.concat(mcLocale.getString("Combat.BeastLoreOwner", new Object[] {getOwnerName(beast)}) + " ");
             }
 
-            attacker.sendMessage(message);
+            message = message.concat(mcLocale.getString("Combat.BeastLoreHealth", new Object[] {health, target.getMaxHealth()}));
+            inspector.sendMessage(message);
         }
     }
 }

src/main/resources/locale/locale_de.properties

@@ -1,11 +1,7 @@
-Combat.WolfExamine=[[YELLOW]]**du musterst den Wolf mit Bestienkunde**
-Combat.WolfShowMaster=[[DARK_YELLOW]]Der Bestienmeister \: {0}
 Combat.Ignition=[[RED]]**ENTZUENDEN**
 Combat.BurningArrowHit=[[DARK_RED]]Du wurdest von einem brennenden Pfeil gestriffen\!
 Combat.TouchedFuzzy=[[DARK_RED]]Benommen. fuehlt sich schwindelig.
 Combat.TargetDazed=Target was [[DARK_RED]]benommen
-Combat.WolfNoMaster=[[AQUA]]Diese Bestie hat keinen Meister...
-Combat.WolfHealth=[[YELLOW]]Die Bestie hat {0} Lebensenergie 
 Combat.StruckByGore=[[RED]]**Getroffen von Biss**
 Combat.Gore=[[YELLOW]]**BISS**
 Combat.ArrowDeflect=[[AQUA]]**PFEIL ABGELENKT**
@@ -39,7 +35,6 @@ m.YourStats=[[DARK_AQUA]]_______ [[YELLOW]]DEINE WERTE [[DARK_AQUA]]_______
 m.SkillTaming=Bestienkunde (Taming)
 m.XPGainTaming=Animal Taming, or combat w/ your wolves
 m.EffectsTaming1_0=[[YELLOW]]Bestienkunde
-m.EffectsTaming1_1=[[AQUA]]mit Knochen schlagen inspiziert Woelfe
 m.EffectsTaming2_0=[[YELLOW]]Biss
 m.EffectsTaming2_1=[[AQUA]]Kritischer Schlag mit Blutungseffekt
 m.EffectsTaming3_0=[[YELLOW]]Geschaerfte Krallen
@@ -304,8 +299,7 @@ Skills.Disarmed=[[DARK_RED]]Du wurdest entwaffnet!
 m.LVL=[[AQUA]]LVL: [[GREEN]]{0} [[DARK_AQUA]]XP[[YELLOW]] ([[AQUA]]{1}[[YELLOW]]/[[AQUA]]{2}[[YELLOW]])
 Combat.BeastLore=[[YELLOW]]**BESTIENKUNDE**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Besitzer ([[RED]]{0}[[DARK_AQUA]])
-Combat.BeastLoreHealthWolfTamed=[[DARK_AQUA]]Gesundheit ([[YELLOW]]{0}[[DARK_AQUA]]/20)
-Combat.BeastLoreHealthWolf=[[DARK_AQUA]]Gesundheit ([[YELLOW]]{0}[[DARK_AQUA]]/8)
+Combat.BeastLoreHealth=[[DARK_AQUA]]Gesundheit ([[YELLOW]]{0}[[DARK_AQUA]]/{1})
 mcMMO.Description=mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcc[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]TheYeti [[BLUE]](Project Lead & Developer),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Developer),[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Developer & Creator),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]issues.mcmmo.org[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat,[[GOLD]] - [[GREEN]]www.mcmmo.org[[GOLD]] Official Website,[[GOLD]] - [[GREEN]]http://bit.ly/x3Yvry[[GOLD]] Bukkit Forum Thread,[[GOLD]] - [[GREEN]]https://twitter.com/#!/mcmmo_dev[[GOLD]] mcMMO Twitter,[[DARK_AQUA]]Donation Info:
 Party.IsLocked=[[RED]]Gruppe ist gesperrt.
 Party.Locked=[[RED]]Gruppe ist gesperrt, nur der Besitzer kann neue User einladen.
@@ -368,10 +362,8 @@ m.FishingMagicInfo=[[YELLOW]]Schatz-Jaeger: [[GREEN]] *Verbesert sich mit Schatz
 m.ShakeInfo=[[YELLOW]]Reissen: [[AQUA]]Reisse Items aus Mobs und verstuemmelt sie dabei ;_;
 m.AbilLockFishing1=[[DARK_AQUA]]Gesperrt bis Skilllevel 150+ (Reissen)
 m.TamingSummon=[[YELLOW]]Beschwoerung abgeschlossen
-m.TamingSummonFailed=[[YELLOW]]Du hast zu viele Woelfe um dich um weitere zu beschwoeren.
+m.TamingSummonWolfFailed=[[YELLOW]]Du hast zu viele Woelfe um dich um weitere zu beschwoeren.
 m.EffectsTaming7_0=[[YELLOW]]Ruf der Wildniss
-m.EffectsTaming7_1=[[AQUA]]Beschwoere einen Wolf auf deine Seite
-m.EffectsTaming7_2=[[YELLOW]]Info: [[AQUA]]Ducken und Rechtsklick mit {0} Knochen in der Hand
 m.EffectsTaming8_0=Fast Food Service
 m.EffectsTaming8_1=Chance for wolves to heal on attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
@@ -439,4 +431,9 @@ Guides.Woodcutting=Guide coming soon...
 GodMode.Forbidden=[mcMMO] God Mode not permitted on this world (See Permissions)
 XPRate.Event = [[GOLD]]mcMMO is currently in an XP rate event! XP rate is {0}x!
 BlastMining.Boom = [[GRAY]]**BOOM**
-Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+m.EffectsTaming7_1=Summon an animal to your side
+m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones/Fish in hand
+m.EffectsTaming1_1=Bone-whacking inspects wolves/ocelots
+Combat.BeastLoreHealth=[[DARK_AQUA]]Health ([[GREEN]]{0}[[DARK_AQUA]]/{1})
+m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.

src/main/resources/locale/locale_en_us.properties

@@ -1,11 +1,7 @@
-Combat.WolfExamine=[[GREEN]]**You examine the Wolf using Beast Lore**
-Combat.WolfShowMaster=[[DARK_GREEN]]The Beast's Master \: {0}
 Combat.Ignition=[[RED]]**IGNITION**
 Combat.BurningArrowHit=[[DARK_RED]]You were struck by a burning arrow\!
 Combat.TouchedFuzzy=[[DARK_RED]]Touched Fuzzy. Felt Dizzy.
 Combat.TargetDazed=Target was [[DARK_RED]]Dazed
-Combat.WolfNoMaster=[[GRAY]]This Beast has no Master...
-Combat.WolfHealth=[[GREEN]]This beast has {0} Health 
 Combat.StruckByGore=[[RED]]**STRUCK BY GORE**
 Combat.Gore=[[GREEN]]**GORE**
 Combat.ArrowDeflect=[[WHITE]]**ARROW DEFLECT**
@@ -39,7 +35,6 @@ m.YourStats=YOUR STATS
 m.SkillTaming=TAMING
 m.XPGainTaming=Animal Taming, or combat w/ your wolves
 m.EffectsTaming1_0=Beast Lore
-m.EffectsTaming1_1=Bone-whacking inspects wolves
 m.EffectsTaming2_0=Gore
 m.EffectsTaming2_1=Critical Strike that applies Bleed
 m.EffectsTaming3_0=Sharpened Claws
@@ -306,8 +301,7 @@ Skills.Disarmed=[[DARK_RED]]You have been disarmed!
 m.LVL=[[DARK_GRAY]]LVL: [[GREEN]]{0} [[DARK_AQUA]]XP[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]])
 Combat.BeastLore=[[GREEN]]**BEAST LORE**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Owner ([[RED]]{0}[[DARK_AQUA]])
-Combat.BeastLoreHealthWolfTamed=[[DARK_AQUA]]Health ([[GREEN]]{0}[[DARK_AQUA]]/20)
-Combat.BeastLoreHealthWolf=[[DARK_AQUA]]Health ([[GREEN]]{0}[[DARK_AQUA]]/8)
+Combat.BeastLoreHealth=[[DARK_AQUA]]Health ([[GREEN]]{0}[[DARK_AQUA]]/{1})
 mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcc[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]TheYeti [[BLUE]](Project Lead & Developer),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Developer),[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Developer & Creator),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]issues.mcmmo.org[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat,[[GOLD]] - [[GREEN]]www.mcmmo.org[[GOLD]] Official Website,[[GOLD]] - [[GREEN]]http://bit.ly/x3Yvry[[GOLD]] Bukkit Forum Thread,[[GOLD]] - [[GREEN]]https://twitter.com/#!/mcmmo_dev[[GOLD]] mcMMO Twitter,[[DARK_AQUA]]Donation Info:
 Party.Locked=[[RED]]Party is locked, only party leader may invite.
 Party.IsntLocked=[[GRAY]]Party is not locked
@@ -363,10 +357,9 @@ m.FishingMagicInfo=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunter
 m.ShakeInfo=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_;
 m.AbilLockFishing1=LOCKED UNTIL 150+ SKILL (SHAKE)
 m.TamingSummon=[[GREEN]]Summoning complete
-m.TamingSummonFailed=[[RED]]You have too many wolves nearby to summon any more.
+m.TamingSummonWolfFailed=[[RED]]You have too many wolves nearby to summon any more.
+m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.
 m.EffectsTaming7_0=Call of the Wild
-m.EffectsTaming7_1=Summon a wolf to your side
-m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
 m.EffectsTaming8_0=Fast Food Service
 m.EffectsTaming8_1=Chance for wolves to heal on attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
@@ -434,4 +427,7 @@ Guides.Woodcutting=Guide coming soon...
 GodMode.Forbidden=[mcMMO] God Mode not permitted on this world (See Permissions)
 XPRate.Event = [[GOLD]]mcMMO is currently in an XP rate event! XP rate is {0}x!
 BlastMining.Boom = [[GRAY]]**BOOM**
-Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+m.EffectsTaming7_1=Summon an animal to your side
+m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones/Fish in hand
+m.EffectsTaming1_1=Bone-whacking inspects wolves/ocelots

src/main/resources/locale/locale_es_es.properties

@@ -1,11 +1,7 @@
-Combat.WolfExamine=[[GREEN]]**Has examinado a un lobo usando tu conocimiento de fieras**
-Combat.WolfShowMaster=[[DARK_GREEN]]El maestro de las fieras \: {0}
 Combat.Ignition=[[RED]]**IGNICION**
 Combat.BurningArrowHit=[[DARK_RED]]Has sido golpeado por una flecha ardiendo\!
 Combat.TouchedFuzzy=[[DARK_RED]]Estas confuso. Te sientes mareado...
 Combat.TargetDazed=El objetivo fue [[DARK_RED]]aturdido
-Combat.WolfNoMaster=[[GRAY]]Esta bestia no tiene maestro...
-Combat.WolfHealth=[[GREEN]]Esta bestia tiene {0} de salud 
 Combat.StruckByGore=[[RED]]**GOLPEADO POR MORDISCO**
 Combat.Gore=[[GREEN]]**MORDISCO**
 Combat.ArrowDeflect=[[WHITE]]**FLECHA DESVIADA**
@@ -304,8 +300,7 @@ Skills.Disarmed=[[DARK_RED]]Has sido desarmado!
 m.LVL=[[DARK_GRAY]]LVL: [[GREEN]]{0} [[DARK_AQUA]]EXP[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]])
 Combat.BeastLore=[[GREEN]]**LEYENDA DE BESTIAS**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Dueño ([[RED]]{0}[[DARK_AQUA]])
-Combat.BeastLoreHealthWolfTamed=[[DARK_AQUA]]Salud ([[GREEN]]{0}[[DARK_AQUA]]/20)
-Combat.BeastLoreHealthWolf=[[DARK_AQUA]]Salud ([[GREEN]]{0}[[DARK_AQUA]]/8)
+Combat.BeastLoreHealth=[[DARK_AQUA]]Salud ([[GREEN]]{0}[[DARK_AQUA]]/{1})
 mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcc[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]TheYeti [[BLUE]](Project Lead & Developer),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Developer),[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Developer & Creator),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]issues.mcmmo.org[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat,[[GOLD]] - [[GREEN]]www.mcmmo.org[[GOLD]] Official Website,[[GOLD]] - [[GREEN]]http://bit.ly/x3Yvry[[GOLD]] Bukkit Forum Thread,[[GOLD]] - [[GREEN]]https://twitter.com/#!/mcmmo_dev[[GOLD]] mcMMO Twitter,[[DARK_AQUA]]Donation Info:
 Party.Locked=[[RED]]La fiesta esta bloqueda, solo el lider puede invitarte
 Party.IsntLocked=[[GRAY]]La fiesta no esta bloqueada
@@ -361,7 +356,7 @@ m.FishingMagicInfo=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunter
 m.ShakeInfo=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_;
 m.AbilLockFishing1=LOCKED UNTIL 150+ SKILL (SHAKE)
 m.TamingSummon=[[GREEN]]Summoning complete
-m.TamingSummonFailed=[[RED]]You have too many wolves nearby to summon any more.
+m.TamingSummonWolfFailed=[[RED]]You have too many wolves nearby to summon any more.
 m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
@@ -432,4 +427,5 @@ Guides.Woodcutting=Guide coming soon...
 GodMode.Forbidden=[mcMMO] God Mode not permitted on this world (See Permissions)
 XPRate.Event = [[GOLD]]mcMMO is currently in an XP rate event! XP rate is {0}x!
 BlastMining.Boom = [[GRAY]]**BOOM**
-Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.

src/main/resources/locale/locale_fi.properties

@@ -1,11 +1,7 @@
-Combat.WolfExamine=[[GREEN]]**Tutkit sutta käyttämällä Pedon Tarinaa**
-Combat.WolfShowMaster=[[DARK_GREEN]]Pedon isäntä : {0}
 Combat.Ignition=[[RED]]**SYTYTYS**
 Combat.BurningArrowHit=[[DARK_RED]]Palava nuoli osui sinuun\!
 Combat.TouchedFuzzy=[[DARK_RED]]Touched Fuzzy. Felt Dizzy.
 Combat.TargetDazed=Kohde [[DARK_RED]]tyrmätty
-Combat.WolfNoMaster=[[GRAY]]Tällä pedolla ei ole isäntää...
-Combat.WolfHealth=[[GREEN]]Tämän pedon terveys on {0}
 Combat.StruckByGore=[[RED]]**SINUA ON PISTETTY**
 Combat.Gore=[[GREEN]]**PISTO**
 Combat.ArrowDeflect=[[WHITE]]**NUOLI TORJUTTU**
@@ -350,7 +346,7 @@ m.FishingMagicInfo=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunter
 m.ShakeInfo=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_;
 m.AbilLockFishing1=LOCKED UNTIL 150+ SKILL (SHAKE)
 m.TamingSummon=[[GREEN]]Summoning complete
-m.TamingSummonFailed=[[RED]]You have too many wolves nearby to summon any more.
+m.TamingSummonWolfFailed=[[RED]]You have too many wolves nearby to summon any more.
 m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
@@ -421,4 +417,8 @@ Guides.Woodcutting=Guide coming soon...
 GodMode.Forbidden=[mcMMO] God Mode not permitted on this world (See Permissions)
 XPRate.Event = [[GOLD]]mcMMO is currently in an XP rate event! XP rate is {0}x!
 BlastMining.Boom = [[GRAY]]**BOOM**
-Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+Combat.BeastLore=[[GREEN]]**BEAST LORE**
+Combat.BeastLoreOwner=[[DARK_AQUA]]Owner ([[RED]]{0}[[DARK_AQUA]])
+Combat.BeastLoreHealth=[[DARK_AQUA]]Health ([[GREEN]]{0}[[DARK_AQUA]]/{1})
+m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.

src/main/resources/locale/locale_fr.properties

@@ -1,11 +1,7 @@
-Combat.WolfExamine=[[GREEN]]**Vous examinez le loup avec le Beast Lore**
-Combat.WolfShowMaster=[[DARK_GREEN]]Le Maître des bêtes \: {0}
 Combat.Ignition=[[RED]]**ALLUMAGE**
 Combat.BurningArrowHit=[[DARK_RED]]Vous avez été frappé par une flèche brûlante\!
 Combat.TouchedFuzzy=[[DARK_RED]]Vous voyez flou. Vous vous sentez étourdi.
 Combat.TargetDazed=La cible a été [[DARK_RED]]Étourdi
-Combat.WolfNoMaster=[[GRAY]]Cette bête n'a pas de maître...
-Combat.WolfHealth=[[GREEN]]Cette bête a {0} points de vie 
 Combat.StruckByGore=[[RED]]**FRAPPÉ JUSQU'AU SANG**
 Combat.Gore=[[GREEN]]**SANG**
 Combat.ArrowDeflect=[[WHITE]]**FLÈCHE DEVIÉE**
@@ -304,8 +300,7 @@ Skills.Disarmed=[[DARK_RED]]Vous avez
 m.LVL=NIVEAU [[GREEN]]{0} - [[DARK_AQUA]]XP : [[YELLOW]][[[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]]]
 Combat.BeastLore=[[GREEN]]**Connaissances des bêtes**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Propriétaire ([[RED]]{0}[[DARK_AQUA]])
-Combat.BeastLoreHealthWolfTamed=[[DARK_AQUA]]Vie ([[GREEN]]{0}[[DARK_AQUA]]/20)
-Combat.BeastLoreHealthWolf=[[DARK_AQUA]]Vie ([[GREEN]]{0}[[DARK_AQUA]]/8)
+Combat.BeastLoreHealth=[[DARK_AQUA]]Vie ([[GREEN]]{0}[[DARK_AQUA]]/{1})
 mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcc[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]TheYeti [[BLUE]](Project Lead & Developer),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Developer),[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Developer & Creator),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]issues.mcmmo.org[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat,[[GOLD]] - [[GREEN]]www.mcmmo.org[[GOLD]] Official Website,[[GOLD]] - [[GREEN]]http://bit.ly/x3Yvry[[GOLD]] Bukkit Forum Thread,[[GOLD]] - [[GREEN]]https://twitter.com/#!/mcmmo_dev[[GOLD]] mcMMO Twitter,[[DARK_AQUA]]Donation Info:
 Party.Locked=[[RED]]Party is locked, only party leader may invite.
 Party.IsntLocked=[[GRAY]]Party is not locked
@@ -361,7 +356,7 @@ m.FishingMagicInfo=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunter
 m.ShakeInfo=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_;
 m.AbilLockFishing1=LOCKED UNTIL 150+ SKILL (SHAKE)
 m.TamingSummon=[[GREEN]]Summoning complete
-m.TamingSummonFailed=[[RED]]You have too many wolves nearby to summon any more.
+m.TamingSummonWolfFailed=[[RED]]You have too many wolves nearby to summon any more.
 m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
@@ -432,4 +427,5 @@ Guides.Woodcutting=Guide coming soon...
 GodMode.Forbidden=[mcMMO] God Mode not permitted on this world (See Permissions)
 XPRate.Event = [[GOLD]]mcMMO is currently in an XP rate event! XP rate is {0}x!
 BlastMining.Boom = [[GRAY]]**BOOM**
-Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.

src/main/resources/locale/locale_it.properties

@@ -1,11 +1,7 @@
-Combat.WolfExamine=[[GREEN]]**Stai esaminando il lupo con "Tradizioni Bestia"**
-Combat.WolfShowMaster=[[DARK_GREEN]]Maestro della bestia \: {0}
 Combat.Ignition=[[RED]]**ACCENSIONE**
 Combat.BurningArrowHit=[[DARK_RED]]Sei stato colpito da una freccia di fuoco\!
 Combat.TouchedFuzzy=[[DARK_RED]]Toccato sfocato. Feltro vertiginoso.
 Combat.TargetDazed=L'obbiettivo e [[DARK_RED]]Stordito
-Combat.WolfNoMaster=[[GRAY]]Questa bestia non ha un padrone.
-Combat.WolfHealth=[[GREEN]]Questa bestia ha {0} di vita
 Combat.StruckByGore=[[RED]]**Colpito dalle corne**
 Combat.Gore=[[GREEN]]**CORNE**
 Combat.ArrowDeflect=[[WHITE]]**DEVIARE FRECCIA**
@@ -306,8 +302,7 @@ Skills.Disarmed=[[DARK_RED]]Sei stato disarmato!!
 m.LVL=[[DARK_GRAY]]LVL: [[GREEN]]{0} [[DARK_AQUA]]XP[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]])
 Combat.BeastLore=[[GREEN]]**BESTIA TRADIZIONALE**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Proprietario ([[RED]]{0}[[DARK_AQUA]])
-Combat.BeastLoreHealthWolfTamed=[[DARK_AQUA]]Vita ([[GREEN]]{0}[[DARK_AQUA]]/20)
-Combat.BeastLoreHealthWolf=[[DARK_AQUA]]Vita ([[GREEN]]{0}[[DARK_AQUA]]/8)
+Combat.BeastLoreHealth=[[DARK_AQUA]]Vita ([[GREEN]]{0}[[DARK_AQUA]]/{1})
 mcMMO.Description=[[DARK_AQUA]]Informazioni su [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO e una [[RED]]open source[[GOLD]] RPG mod creata nel mese di febbraio 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. L'obbiettivo e quello di fornire un servizio di qualita RPG,[[DARK_AQUA]]Suggerimenti:,[[GOLD]] - [[GREEN]]Usa [[RED]]/mcc[[GREEN]] per vedere i comandi,[[GOLD]] - [[GREEN]]Scrivi [[RED]]/SKILLNAME[[GREEN]] Per vedere dei dettagli su una skill,[[DARK_AQUA]]Sviluppatori:,[[GOLD]] - [[GREEN]]TheYeti [[BLUE]](Project Lead & Developer),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Developer),[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Developer & Creator),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]issues.mcmmo.org[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat,[[GOLD]] - [[GREEN]]www.mcmmo.org[[GOLD]] Sito ufficiale,[[GOLD]] - [[GREEN]]http://bit.ly/x3Yvry[[GOLD]] Bukkit Forum Thread,[[GOLD]] - [[GREEN]]https://twitter.com/#!/mcmmo_dev[[GOLD]] mcMMO Twitter,[[DARK_AQUA]]Info sulle donazioni:
 Party.Locked=[[RED]]Il party e bloccato , soltanto il leader può invitare.
 Party.IsntLocked=[[GRAY]]Il party non e bloccato
@@ -363,7 +358,7 @@ m.FishingMagicInfo=[[RED]]Cacciatore Magico: [[GRAY]] **Migliora con Cacciatore
 m.ShakeInfo=[[RED]]Agiti: [[YELLOW]]Elementi tagliandi folle, mutilanti loro nel processo.
 m.AbilLockFishing1=BLOCCATO FINO A 150+ SKILL (AGITARE)
 m.TamingSummon=[[GREEN]]Evocazione completata
-m.TamingSummonFailed=[[RED]]Avete troppi lupi vicini e non puoi evocarne altri.
+m.TamingSummonWolfFailed=[[RED]]Avete troppi lupi vicini e non puoi evocarne altri.
 m.EffectsTaming7_0=Richiamo della giungla
 m.EffectsTaming7_1=Evocare il lupo dal tuo lato
 m.EffectsTaming7_2=[[GRAY]]COTW COME FARE: Accovacciati e clicca con il tasto destro {0} con l'osso in mano
@@ -434,4 +429,5 @@ Guides.Woodcutting=La guida arrivera dopo.
 GodMode.Forbidden=[mcMMO] La god mode non e permessa in questo mondo (Controlla  i Permissi)
 XPRate.Event = [[GOLD]]mcMMO ha un'evento in corso -> XP aumentato! la XP Rate e {0}x!
 BlastMining.Boom = [[GRAY]]**BOOM**
-Party.Forbidden=[mcMMO] I party non sono permessi in questo mondo (Controlla i Permessi)
+Party.Forbidden=[mcMMO] I party non sono permessi in questo mondo (Controlla i Permessi)
+m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.

src/main/resources/locale/locale_nl.properties

@@ -4,14 +4,10 @@
 # Verander deze file alleen met Notepad++
 # Geef fouten door aan pluis65@hotmail.com
 # Last official edit: 8-7-2011
-Combat.WolfExamine=[[GREEN]]**Je bekijkt de wolf met Wolfinspectie**
-Combat.WolfShowMaster=[[DARK_GREEN]]Eigenaar van de wolf \: {0}
 Combat.Ignition=[[RED]]**IGNITION**
 Combat.BurningArrowHit=[[DARK_RED]]Je bent geraakt door een brandende pijl\!
 Combat.TouchedFuzzy=[[DARK_RED]]Je raakte Fuzzy aan. Je voelt je duizelig.
 Combat.TargetDazed=Doelwit was [[DARK_RED]]versuft
-Combat.WolfNoMaster=[[GRAY]]Deze wolf heeft geen eigenaar...
-Combat.WolfHealth=[[GREEN]]Deze wolf heeft {0} levens 
 Combat.StruckByGore=[[RED]]**VAST DOOR GESTOLD BLOED**
 Combat.Gore=[[GREEN]]**GESTOLD BLOED**
 Combat.ArrowDeflect=[[WHITE]]**PIJL AFWIJKING**
@@ -310,8 +306,7 @@ Skills.Disarmed=[[DARK_RED]]Je bent ontwapend!
 m.LVL=[[DARK_GRAY]]LVL: [[GREEN]]{0} [[DARK_AQUA]]XP[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]])
 Combat.BeastLore=[[GREEN]]**WOLFINSPECTIE**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Eigenaar ([[RED]]{0}[[DARK_AQUA]])
-Combat.BeastLoreHealthWolfTamed=[[DARK_AQUA]]Levens ([[GREEN]]{0}[[DARK_AQUA]]/20)
-Combat.BeastLoreHealthWolf=[[DARK_AQUA]]Levens ([[GREEN]]{0}[[DARK_AQUA]]/8)
+Combat.BeastLoreHealth=[[DARK_AQUA]]Levens ([[GREEN]]{0}[[DARK_AQUA]]/{1})
 mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcc[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]TheYeti [[BLUE]](Project Lead & Developer),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Developer),[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Developer & Creator),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]issues.mcmmo.org[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat,[[GOLD]] - [[GREEN]]www.mcmmo.org[[GOLD]] Official Website,[[GOLD]] - [[GREEN]]http://bit.ly/x3Yvry[[GOLD]] Bukkit Forum Thread,[[GOLD]] - [[GREEN]]https://twitter.com/#!/mcmmo_dev[[GOLD]] mcMMO Twitter,[[DARK_AQUA]]Donation Info:
 Party.Locked=[[RED]]Party is locked, only party leader may invite.
 Party.IsntLocked=[[GRAY]]Party is not locked
@@ -367,7 +362,7 @@ m.FishingMagicInfo=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunter
 m.ShakeInfo=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_;
 m.AbilLockFishing1=LOCKED UNTIL 150+ SKILL (SHAKE)
 m.TamingSummon=[[GREEN]]Summoning complete
-m.TamingSummonFailed=[[RED]]You have too many wolves nearby to summon any more.
+m.TamingSummonWolfFailed=[[RED]]You have too many wolves nearby to summon any more.
 m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
@@ -438,4 +433,5 @@ Guides.Woodcutting=Guide coming soon...
 GodMode.Forbidden=[mcMMO] God Mode not permitted on this world (See Permissions)
 XPRate.Event = [[GOLD]]mcMMO is currently in an XP rate event! XP rate is {0}x!
 BlastMining.Boom = [[GRAY]]**BOOM**
-Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.

src/main/resources/locale/locale_pl.properties

@@ -1,11 +1,7 @@
-Combat.WolfExamine=[[GREEN]]**Zbadales wilka uzywajac wiedzy o zwierzetach**
-Combat.WolfShowMaster=[[DARK_GREEN]]Wlascicielem wilka jest \: {0}
 Combat.Ignition=[[RED]]**PODPALENIE**
 Combat.BurningArrowHit=[[DARK_RED]]Zostales trafiony plonaca strzala\!
 Combat.TouchedFuzzy=[[DARK_RED]]Zostales oszolomiony.
 Combat.TargetDazed=Cel zostal [[DARK_RED]]oszolomiony.
-Combat.WolfNoMaster=[[GRAY]]Ten wilk nie ma wlasciciela...
-Combat.WolfHealth=[[GREEN]]Ten wilk ma {0} zycia.
 Combat.StruckByGore=[[RED]]**WYKRWAWIENIE**
 Combat.Gore=[[GREEN]]**KRWOTOK**
 Combat.ArrowDeflect=[[WHITE]]**ODBICIE STRZALY**
@@ -304,8 +300,7 @@ Skills.Disarmed=[[DARK_RED]]Zostales rozbrojony!
 m.LVL=[[DARK_GRAY]]LVL: [[GREEN]]{0} [[DARK_AQUA]]Doswiadczenia[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]])
 Combat.BeastLore=[[GREEN]]**WIEDZA O ZWIERZETACH**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Wlasciciel ([[RED]]{0}[[DARK_AQUA]])
-Combat.BeastLoreHealthWolfTamed=[[DARK_AQUA]]Zycie ([[GREEN]]{0}[[DARK_AQUA]]/20)
-Combat.BeastLoreHealthWolf=[[DARK_AQUA]]Zycie ([[GREEN]]{0}[[DARK_AQUA]]/8)
+Combat.BeastLoreHealth=[[DARK_AQUA]]Zycie ([[GREEN]]{0}[[DARK_AQUA]]/{1})
 mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcc[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]TheYeti [[BLUE]](Project Lead & Developer),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Developer),[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Developer & Creator),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]issues.mcmmo.org[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat,[[GOLD]] - [[GREEN]]www.mcmmo.org[[GOLD]] Official Website,[[GOLD]] - [[GREEN]]http://bit.ly/x3Yvry[[GOLD]] Bukkit Forum Thread,[[GOLD]] - [[GREEN]]https://twitter.com/#!/mcmmo_dev[[GOLD]] mcMMO Twitter,[[DARK_AQUA]]Donation Info:
 Party.Locked=[[RED]]Grupa jest zamknieta, tylko wlasciciel moze dodac graczy.
 Party.IsntLocked=[[GRAY]]Grupa jest otwarta dla wszystkich.
@@ -361,7 +356,7 @@ m.FishingMagicInfo=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunter
 m.ShakeInfo=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_;
 m.AbilLockFishing1=LOCKED UNTIL 150+ SKILL (SHAKE)
 m.TamingSummon=[[GREEN]]Summoning complete
-m.TamingSummonFailed=[[RED]]You have too many wolves nearby to summon any more.
+m.TamingSummonWolfFailed=[[RED]]You have too many wolves nearby to summon any more.
 m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
@@ -432,4 +427,5 @@ Guides.Woodcutting=Guide coming soon...
 GodMode.Forbidden=[mcMMO] God Mode not permitted on this world (See Permissions)
 XPRate.Event = [[GOLD]]mcMMO is currently in an XP rate event! XP rate is {0}x!
 BlastMining.Boom = [[GRAY]]**BOOM**
-Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.

src/main/resources/locale/locale_pt_br.properties

@@ -1,11 +1,7 @@
-Combat.WolfExamine=[[GREEN]]*Você examinou um lobo usando Conhecimento de Feras*
-Combat.WolfShowMaster=[[DARK_GREEN]]O Mestre das Feras \: {0}
 Combat.Ignition=[[RED]]*IGNIÇAO*
 Combat.BurningArrowHit=[[DARK_RED]]Você foi atingido por uma flecha flamejante\!
 Combat.TouchedFuzzy=[[DARK_RED]]Visao turva. Sente Tonturas.
 Combat.TargetDazed=Alvo foi [[DARK_RED]]Atordoado
-Combat.WolfNoMaster=[[GRAY]]Esse Animal nao tem um mestre...
-Combat.WolfHealth=[[GREEN]]Esse animal tem {0} de vida 
 Combat.StruckByGore=[[RED]]*ATINGIDO POR MORDIDA*
 Combat.Gore=[[GREEN]]*MORDIDA*
 Combat.ArrowDeflect=[[WHITE]]*DESVIOU A FLECHA*
@@ -311,8 +307,7 @@ Skills.Disarmed=[[DARK_RED]]Voc
 m.LVL=[[DARK_GRAY]]LVL: [[GREEN]]{0} [[DARK_AQUA]]XP[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]])
 Combat.BeastLore=[[GREEN]]*CONHECIMENTO DE FERAS*
 Combat.BeastLoreOwner=[[DARK_AQUA]]Dono ([[RED]]{0}[[DARK_AQUA]])
-Combat.BeastLoreHealthWolfTamed=[[DARK_AQUA]]Health ([[GREEN]]{0}[[DARK_AQUA]]/20)
-Combat.BeastLoreHealthWolf=[[DARK_AQUA]]Vida ([[GREEN]]{0}[[DARK_AQUA]]/8)
+Combat.BeastLoreHealth=[[DARK_AQUA]]Health ([[GREEN]]{0}[[DARK_AQUA]]/{1})
 mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcc[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]TheYeti [[BLUE]](Project Lead & Developer),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Developer),[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Developer & Creator),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]issues.mcmmo.org[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat,[[GOLD]] - [[GREEN]]www.mcmmo.org[[GOLD]] Official Website,[[GOLD]] - [[GREEN]]http://bit.ly/x3Yvry[[GOLD]] Bukkit Forum Thread,[[GOLD]] - [[GREEN]]https://twitter.com/#!/mcmmo_dev[[GOLD]] mcMMO Twitter,[[DARK_AQUA]]Donation Info:
 Party.Locked=[[RED]]Equipe está trancada, só o líder pode convidar.
 Party.IsntLocked=[[GRAY]]Equipe nao está trancada
@@ -368,7 +363,7 @@ m.FishingMagicInfo=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunter
 m.ShakeInfo=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_;
 m.AbilLockFishing1=LOCKED UNTIL 150+ SKILL (SHAKE)
 m.TamingSummon=[[GREEN]]Summoning complete
-m.TamingSummonFailed=[[RED]]You have too many wolves nearby to summon any more.
+m.TamingSummonWolfFailed=[[RED]]You have too many wolves nearby to summon any more.
 m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
@@ -439,4 +434,5 @@ Guides.Woodcutting=Guide coming soon...
 GodMode.Forbidden=[mcMMO] God Mode not permitted on this world (See Permissions)
 XPRate.Event = [[GOLD]]mcMMO is currently in an XP rate event! XP rate is {0}x!
 BlastMining.Boom = [[GRAY]]**BOOM**
-Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.

src/main/resources/locale/locale_ru.properties

@@ -1,12 +1,7 @@
-Combat.WolfExamine=[[GREEN]]**Âû íàó÷èëè Âîëêà èñïîëüçîâàíèþ "Óäàðà âîëêà"**
-Combat.WolfExamine=[[GREEN]]**Âû íàó÷èëè Âîëêà èñïîëüçîâàíèþ "Óäàðà âîëêà"**
-Combat.WolfShowMaster=[[DARK_GREEN]]Ìàñòåð ïî ïðèðó÷åíèþ Âîëêîâ \: {0}
 Combat.Ignition=[[RED]]**Âû ïîäîæãëè ïðîòèâíèêà ñòðåëîé!!**
 Combat.BurningArrowHit=[[DARK_RED]]Âû áûëè ïîðàæåíû ãîðÿùåé ñòðåëîé\!
 Combat.TouchedFuzzy=[[DARK_RED]]Âû èñòåêàåòå êðîâüþ. Êðóæèòñÿ ãîëîâà.
 Combat.TargetDazed=Âàøà öåëü [[DARK_RED]]Øîêèðîâàíà
-Combat.WolfNoMaster=[[GRAY]]Ó ýòîãî Âîëêà íåò õîçÿèíà
-Combat.WolfHealth=[[GREEN]]Ó ýòîãî Âîëêà {0} Çäîðîâüÿ 
 Combat.StruckByGore=[[RED]]**Îêðàâëåíèå íåóäà÷íî**
 Combat.Gore=[[GREEN]]**Îêðàâëåíèå**
 Combat.ArrowDeflect=[[WHITE]]**Ñòðåëà îòñêî÷èëà**
@@ -305,8 +300,7 @@ Skills.Disarmed=[[DARK_RED]]
 m.LVL=[[DARK_GRAY]]Óðîâåíü: [[GREEN]]{0} [[DARK_AQUA]]XP[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]])
 Combat.BeastLore=[[GREEN]]**Óìåíèå "Óäàð âîëêà" àêòèâèðîâàíî**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Âëàäåëåö ([[RED]]{0}[[DARK_AQUA]])
-Combat.BeastLoreHealthWolfTamed=[[DARK_AQUA]]Çäîðîâüÿ ([[GREEN]]{0}[[DARK_AQUA]]/20)
-Combat.BeastLoreHealthWolf=[[DARK_AQUA]]Çäîðîâüÿ ([[GREEN]]{0}[[DARK_AQUA]]/8)
+Combat.BeastLoreHealth=[[DARK_AQUA]]Çäîðîâüÿ ([[GREEN]]{0}[[DARK_AQUA]]/{1})
 Party.Locked=[[RED]]Ãðóïïà çàïàðîëåíà, òîëüêî ëèäåð ãðóïïû ìîæåò ïðèãëàøàòü.
 Party.IsntLocked=[[GRAY]]Ãðóïïà ðàçáëîêèðîâàíà
 Party.Unlocked=[[GRAY]]Ãðóïïà ðàçáëîêèðîâàíà
@@ -353,7 +347,7 @@ m.FishingMagicInfo=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunter
 m.ShakeInfo=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_;
 m.AbilLockFishing1=LOCKED UNTIL 150+ SKILL (SHAKE)
 m.TamingSummon=[[GREEN]]Summoning complete
-m.TamingSummonFailed=[[RED]]You have too many wolves nearby to summon any more.
+m.TamingSummonWolfFailed=[[RED]]You have too many wolves nearby to summon any more.
 m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
@@ -424,4 +418,5 @@ Guides.Woodcutting=Guide coming soon...
 GodMode.Forbidden=[mcMMO] God Mode not permitted on this world (See Permissions)
 XPRate.Event = [[GOLD]]mcMMO is currently in an XP rate event! XP rate is {0}x!
 BlastMining.Boom = [[GRAY]]**BOOM**
-Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
+m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.