Lang/Items

* apply templates from GlobalStrings.lua
 * fix some translation errors in the process .. also, if s.o. knows, what constructs like |3-1(%s) do to the passed string, please tell me.

includes/types/item.class.php

@@ -526,20 +526,17 @@ class ItemList extends BaseType
             $x .= '<br /><!--bo-->'.Lang::item('bonding', $this->curTpl['bonding']);
 
         // unique || unique-equipped || unique-limited
-        if ($this->curTpl['maxCount'] > 0)
+        if ($this->curTpl['maxCount'] == 1)
-        {
+            $x .= '<br />'.Lang::item('unique', 0);
-            $x .= '<br />'.Lang::item('unique');
+        // not for currency tokens
-
+        else if ($this->curTpl['maxCount'] && $this->curTpl['bagFamily'] != 8192)
-            // not for currency tokens
+            $x .= '<br />'.sprintf(Lang::item('unique', 1), $this->curTpl['maxCount']);
-            if ($this->curTpl['maxCount'] > 1 && $this->curTpl['bagFamily'] != 8192)
-                $x .= ' ('.$this->curTpl['maxCount'].')';
-        }
         else if ($_flags & ITEM_FLAG_UNIQUEEQUIPPED)
-            $x .= '<br />'.Lang::item('uniqueEquipped');
+            $x .= '<br />'.Lang::item('uniqueEquipped', 0);
         else if ($this->curTpl['itemLimitCategory'])
         {
             $limit = DB::Aowow()->selectRow("SELECT * FROM ?_itemlimitcategory WHERE id = ?", $this->curTpl['itemLimitCategory']);
-            $x .= '<br />'.($limit['isGem'] ? Lang::item('uniqueEquipped') : Lang::item('unique')).Lang::main('colon').Util::localizedString($limit, 'name').' ('.$limit['count'].')';
+            $x .= '<br />'.sprintf(Lang::item($limit['isGem'] ? 'uniqueEquipped' : 'unique', 2), Util::localizedString($limit, 'name'), $limit['count']);
         }
 
         // max duration
@@ -591,31 +588,40 @@ class ItemList extends BaseType
             $x .= '<br />';
 
         // Weapon/Ammunition Stats                          (not limited to weapons (see item:1700))
-        $speed   = $this->curTpl['delay'] / 1000;
+        $speed  = $this->curTpl['delay'] / 1000;
-        $dmgmin1 = $this->curTpl['dmgMin1'] + $this->curTpl['dmgMin2'];
+        $sc1    = $this->curTpl['dmgType1'];
-        $dmgmax1 = $this->curTpl['dmgMax1'] + $this->curTpl['dmgMax2'];
+        $sc2    = $this->curTpl['dmgType2'];
-        $dps     = $speed ? ($dmgmin1 + $dmgmax1) / (2 * $speed) : 0;
+        $dmgmin = $this->curTpl['dmgMin1'] + $this->curTpl['dmgMin2'];
+        $dmgmax = $this->curTpl['dmgMax1'] + $this->curTpl['dmgMax2'];
+        $dps    = $speed ? ($dmgmin + $dmgmax) / (2 * $speed) : 0;
 
-        if ($_class == ITEM_CLASS_AMMUNITION && $dmgmin1 && $dmgmax1)
+        if ($_class == ITEM_CLASS_AMMUNITION && $dmgmin && $dmgmax)
-            $x .= Lang::item('addsDps').' '.number_format(($dmgmin1 + $dmgmax1) / 2, 1).' '.Lang::item('dps2').'<br />';
+        {
+            if ($sc1)
+                $x .= sprintf(Lang::item('damage', 'ammo', 1), ($dmgmin + $dmgmax) / 2, Lang::game('sc', $sc1)).'<br />';
+            else
+                $x .= sprintf(Lang::item('damage', 'ammo', 0), ($dmgmin + $dmgmax) / 2).'<br />';
+        }
         else if ($dps)
         {
-            if ($_class == ITEM_CLASS_WEAPON)
+            if ($this->curTpl['dmgMin1'] == $this->curTpl['dmgMax1'])
-            {
+                $dmg = sprintf(Lang::item('damage', 'single', $sc1 ? 1 : 0), $this->curTpl['dmgMin1'], $sc1 ? Lang::game('sc', $sc1) : null);
-                $x .= '<table width="100%"><tr>';
-                $x .= '<td><!--dmg-->'.sprintf($this->curTpl['dmgType1'] ? Lang::item('damageMagic') : Lang::item('damagePhys'), $this->curTpl['dmgMin1'].' - '.$this->curTpl['dmgMax1'], Lang::game('sc', $this->curTpl['dmgType1'])).'</td>';
-                $x .= '<th>'.Lang::item('speed').' <!--spd-->'.number_format($speed, 2).'</th>'; // do not use localized format here!
-                $x .= '</tr></table>';
-            }
             else
-                $x .= '<!--dmg-->'.sprintf($this->curTpl['dmgType1'] ? Lang::item('damageMagic') : Lang::item('damagePhys'), $this->curTpl['dmgMin1'].' - '.$this->curTpl['dmgMax1'], Lang::game('sc', $this->curTpl['dmgType1'])).'<br />';
+                $dmg = sprintf(Lang::item('damage', 'range', $sc1 ? 1 : 0), $this->curTpl['dmgMin1'], $this->curTpl['dmgMax1'], $sc1 ? Lang::game('sc', $sc1) : null);
+
+            if ($_class == ITEM_CLASS_WEAPON)               // do not use localized format here!
+                $x .= '<table width="100%"><tr><td><!--dmg-->'.$dmg.'</td><th>'.Lang::item('speed').' <!--spd-->'.number_format($speed, 2).'</th></tr></table>';
+            else
+                $x .= '<!--dmg-->'.$dmg.'<br />';
 
             // secondary damage is set
-            if ($this->curTpl['dmgMin2'])
+            if (($this->curTpl['dmgMin2'] || $this->curTpl['dmgMax2']) && $this->curTpl['dmgMin2'] != $this->curTpl['dmgMax2'])
-                $x .= '+'.sprintf($this->curTpl['dmgType2'] ? Lang::item('damageMagic') : Lang::item('damagePhys'), $this->curTpl['dmgMin2'].' - '.$this->curTpl['dmgMax2'], Lang::game('sc', $this->curTpl['dmgType2'])).'<br />';
+                $x .= sprintf(Lang::item('damage', 'range', $sc2 ? 3 : 2), $this->curTpl['dmgMin2'], $this->curTpl['dmgMax2'], $sc2 ? Lang::game('sc', $sc2) : null).'<br />';
+            else if ($this->curTpl['dmgMin2'])
+                $x .= sprintf(Lang::item('damage', 'single', $sc2 ? 3 : 2), $this->curTpl['dmgMin2'], $sc2 ? Lang::game('sc', $sc2) : null).'<br />';
 
             if ($_class == ITEM_CLASS_WEAPON)
-                $x .= '<!--dps-->('.number_format($dps, 1).' '.Lang::item('dps').')<br />'; // do not use localized format here!
+                $x .= '<!--dps-->'.sprintf(Lang::item('dps'), $dps).'<br />'; // do not use localized format here!
 
             // display FeralAttackPower if set
             if ($fap = $this->getFeralAP())
@@ -686,10 +692,22 @@ class ItemList extends BaseType
                 continue;
 
             // base stat
-            if ($type >= ITEM_MOD_AGILITY && $type <= ITEM_MOD_STAMINA)
+            switch ($type)
-                $x .= '<span><!--stat'.$type.'-->'.($qty > 0 ? '+' : '-').abs($qty).' '.Lang::item('statType', $type).'</span><br />';
+            {
-            else                                            // rating with % for reqLevel
+                case ITEM_MOD_MANA:
-                $green[] = $this->parseRating($type, $qty, $interactive, $causesScaling);
+                case ITEM_MOD_HEALTH:
+                    // $type += 1;                          // i think i fucked up somewhere mapping item_mods: offsets may be required somewhere
+                case ITEM_MOD_AGILITY:
+                case ITEM_MOD_STRENGTH:
+                case ITEM_MOD_INTELLECT:
+                case ITEM_MOD_SPIRIT:
+                case ITEM_MOD_STAMINA:
+                    $x .= '<span><!--stat'.$type.'-->'.($qty > 0 ? '+' : '-').abs($qty).' '.Lang::item('statType', $type).'</span><br />';
+                    break;
+                default:                                    // rating with % for reqLevel
+                    $green[] = $this->parseRating($type, $qty, $interactive, $causesScaling);
+
+            }
         }
 
         // magic resistances
@@ -785,7 +803,7 @@ class ItemList extends BaseType
 
         // durability
         if ($dur = $this->curTpl['durability'])
-            $x .= Lang::item('durability').' '.$dur.' / '.$dur.'<br />';
+            $x .= sprintf(Lang::item('durability'), $dur, $dur).'<br />';
 
         // required classes
         if ($classes = Lang::getClassString($this->curTpl['requiredClass'], $jsg, $__))
@@ -817,9 +835,9 @@ class ItemList extends BaseType
 
         // required level
         if (($_flags & ITEM_FLAG_ACCOUNTBOUND) && $_quality == ITEM_QUALITY_HEIRLOOM)
-            $x .= sprintf(Lang::game('reqLevelHlm'), ' 1'.Lang::game('valueDelim').MAX_LEVEL.' ('.($interactive ? sprintf(Util::$changeLevelString, MAX_LEVEL) : '<!--lvl-->'.MAX_LEVEL).')').'<br />';
+            $x .= sprintf(Lang::item('reqLevelRange'), 1, MAX_LEVEL, ($interactive ? sprintf(Util::$changeLevelString, MAX_LEVEL) : '<!--lvl-->'.MAX_LEVEL)).'<br />';
         else if ($_reqLvl > 1)
-            $x .= sprintf(Lang::game('reqLevel'), $_reqLvl).'<br />';
+            $x .= sprintf(Lang::item('reqMinLevel'), $_reqLvl).'<br />';
 
         // required arena team rating / personal rating / todo (low): sort out what kind of rating
         if (!empty($this->getExtendedCost([], $reqRating)[$this->id]) && $reqRating)
@@ -827,7 +845,7 @@ class ItemList extends BaseType
 
         // item level
         if (in_array($_class, [ITEM_CLASS_ARMOR, ITEM_CLASS_WEAPON]))
-            $x .= Lang::item('itemLevel').' '.$this->curTpl['itemLevel'].'<br />';
+            $x .= sprintf(Lang::item('itemLevel'), $this->curTpl['itemLevel']).'<br />';
 
         // required skill
         if ($reqSkill = $this->curTpl['requiredSkill'])
@@ -978,7 +996,7 @@ class ItemList extends BaseType
                         $setSpells[$i] = $setSpells[$j];
                         $setSpells[$j] = $tmp;
                     }
-                    $xSet .= '<span>('.$setSpells[$i]['bonus'].') '.Lang::item('set').': <a href="?spell='.$setSpells[$i]['entry'].'">'.$setSpells[$i]['tooltip'].'</a></span>';
+                    $xSet .= '<span>'.sprintf(Lang::item('set'), $setSpells[$i]['bonus'], '<a href="?spell='.$setSpells[$i]['entry'].'">'.$setSpells[$i]['tooltip'].'</a>').'</span>';
                     if ($i < count($setSpells) - 1)
                         $xSet .= '<br />';
                 }

localization/locale_dede.php

@@ -222,7 +222,6 @@ $lang = array(
         'requires'      => "Benötigt %s",
         'requires2'     => "Benötigt",
         'reqLevel'      => "Benötigt Stufe %s",
-        'reqLevelHlm'   => "Benötigt Stufe %s",
         'reqSkillLevel' => "Benötigte Fertigkeitsstufe",
         'level'         => "Stufe",
         'school'        => "Magieart",
@@ -916,26 +915,18 @@ $lang = array(
         'locked'        => "Verschlossen",
         'ratingString'  => "%s @ L%s",
         'heroic'        => "Heroisch",
-        'unique'        => "Einzigartig",
-        'uniqueEquipped'=> "Einzigartig anlegbar",
         'startQuest'    => "Dieser Gegenstand startet eine Quest",
         'bagSlotString' => "%d Platz %s",
-        'dps'           => "Schaden pro Sekunde",
-        'dps2'          => "Schaden pro Sekunde",
-        'addsDps'       => "Adds",
         'fap'           => "Angriffskraft in Tiergestalt",
-        'durability'    => "Haltbarkeit",
+        'durability'    => "Haltbarkeit %1$d / %2$d",
         'realTime'      => "Realzeit",
         'conjured'      => "Herbeigezauberter Gegenstand",
-        'damagePhys'    => "%s Schaden",
-        'damageMagic'   => "%s %sschaden",
-        'speed'         => "Tempo",
         'sellPrice'     => "Verkaufspreis",
-        'itemLevel'     => "Gegenstandsstufe",
+        'itemLevel'     => "Gegenstandsstufe %d",
         'randEnchant'   => "<Zufällige Verzauberung&gt",
         'readClick'     => "<Zum Lesen rechtsklicken&gt",
         'openClick'     => "<Zum Öffnen rechtsklicken&gt",
-        'set'           => "Set",
+        'set'           => "(%d) Set: %s",
         'partyLoot'     => "Gruppenloot",
         'smartLoot'     => "Intelligente Beuteverteilung",
         'indestructible'=> "Kann nicht zerstört werden",
@@ -968,6 +959,18 @@ $lang = array(
         'buyout'        => "Sofortkaufpreis",
         'each'          => "Stück",
         'tabOther'      => "Anderes",
+        'reqMinLevel'   => "Benötigt Stufe %d",
+        'reqLevelRange' => "Benötigt Stufe %d bis %d (%s)",
+        'unique'        => ["Einzigartig",          "Limitiert (%d)", "Einzigartig: %s (%d)"         ],
+        'uniqueEquipped'=> ["Einzigartig anlegbar", null,             "Einzigartig angelegt: %s (%d)"],
+        'speed'         => "Tempo",
+        'dps'           => "(%.1f Schaden pro Sekunde)",
+        'damage'        => array(                           // *DAMAGE_TEMPLATE*
+                        //  basic,                                              basic /w school,                                    add basic,                  add basic /w school
+            'single'    => ['%d Schaden',                                       '%1$d %2$sschaden',                                 '+ %1$d Schaden',           '+ %1$d %2$sschaden'        ],
+            'range'     => ['%1$d - %2$d Schaden',                              '%1$d - %2$d %3$sschaden',                          '+ %1$d - %2$d Schaden',    '+ %1$d - %2$d %3$sschaden' ],
+            'ammo'      => ["Verursacht %g zusätzlichen Schaden pro Sekunde.",  "Verursacht %g zusätzlichen %sschaden pro Sekunde", "+ %g Schaden pro Sekunde", "+ %g %sschaden pro Sekunde"]
+        ),
         'gems'          => "Edelsteine",
         'socketBonus'   => "Sockelbonus",
         'socket'        => array(
@@ -1072,8 +1075,8 @@ $lang = array(
             13 => "Schlüssel",
         ),
         'statType'      => array(
-            "Erhöht Euer Mana um %d.",
+            "Mana",
-            "Erhöht Eure Gesundheit um %d.",
+            "Gesundheit",
             null,
             "Beweglichkeit",
             "Stärke",

localization/locale_enus.php

@@ -4,6 +4,11 @@ if (!defined('AOWOW_REVISION'))
     die('illegal access');
 
 
+
+// comments in CAPS point to items in \Interface\FrameXML\GlobalStrings.lua - lowercase sources are contextual
+
+
+
 $lang = array(
     // page variables
     'timeUnits' => array(
@@ -217,7 +222,6 @@ $lang = array(
         'requires'      => "Requires %s",
         'requires2'     => "Requires",
         'reqLevel'      => "Requires Level %s",
-        'reqLevelHlm'   => "Requires Level %s",
         'reqSkillLevel' => "Required skill level",
         'level'         => "Level",
         'school'        => "School",
@@ -232,14 +236,14 @@ $lang = array(
         'zone'          => "zone",
         'zones'         => "Zones",
 
-        'pvp'           => "PvP",
+        'pvp'           => "PvP",                           // PVP
-        'honorPoints'   => "Honor Points",
+        'honorPoints'   => "Honor Points",                  // HONOR_POINTS
-        'arenaPoints'   => "Arena Points",
+        'arenaPoints'   => "Arena Points",                  // ARENA_POINTS
         'heroClass'     => "Hero class",
         'resource'      => "Resource",
         'resources'     => "Resources",
-        'role'          => "Role",
+        'role'          => "Role",                          // ROLE
-        'roles'         => "Roles",
+        'roles'         => "Roles",                         // LFG_TOOLTIP_ROLES
         'specs'         => "Specs",
         '_roles'        => ["Healer", "Melee DPS", "Ranged DPS", "Tank"],
 
@@ -255,20 +259,20 @@ $lang = array(
             "Milled",                       "Mined",                        "Prospected",                   "Pickpocketed",                 "Salvaged",                     "Skinned",
             "In-Game Store"
         ),
-        'languages'     => array(
+        'languages'     => array(                           // Languages.dbc
              1 => "Orcish",                  2 => "Darnassian",              3 => "Taurahe",                 6 => "Dwarvish",                7 => "Common",                  8 => "Demonic",
              9 => "Titan",                  10 => "Thalassian",             11 => "Draconic",               12 => "Kalimag",                13 => "Gnomish",                14 => "Troll",
             33 => "Gutterspeak",            35 => "Draenei",                36 => "Zombie",                 37 => "Gnomish Binary",         38 => "Goblin Binary"
         ),
-        'gl'            => [null, "Major", "Minor"],
+        'gl'            => [null, "Major", "Minor"],                                                                                                                                // MAJOR_GLYPH, MINOR_GLYPH
         'si'            => [1 => "Alliance", -1 => "Alliance only", 2 => "Horde", -2 => "Horde only", 3 => "Both"],
-        'resistances'   => [null, 'Holy Resistance', 'Fire Resistance', 'Nature Resistance', 'Frost Resistance', 'Shadow Resistance', 'Arcane Resistance'],
+        'resistances'   => [null, 'Holy Resistance', 'Fire Resistance', 'Nature Resistance', 'Frost Resistance', 'Shadow Resistance', 'Arcane Resistance'],                         // RESISTANCE?_NAME
-        'dt'            => [null, "Magic", "Curse", "Disease", "Poison", "Stealth", "Invisibility", null, null, "Enrage"],
+        'dt'            => [null, "Magic", "Curse", "Disease", "Poison", "Stealth", "Invisibility", null, null, "Enrage"],                                                          // SpellDispalType.dbc
-        'sc'            => ["Physical", "Holy", "Fire", "Nature", "Frost", "Shadow", "Arcane"],
+        'sc'            => ["Physical", "Holy", "Fire", "Nature", "Frost", "Shadow", "Arcane"],                                                                                     // STRING_SCHOOL_*
-        'cl'            => [null, "Warrior", "Paladin", "Hunter", "Rogue", "Priest", "Death Knight", "Shaman", "Mage", "Warlock", null, "Druid"],
+        'cl'            => [null, "Warrior", "Paladin", "Hunter", "Rogue", "Priest", "Death Knight", "Shaman", "Mage", "Warlock", null, "Druid"],                                   // ChrClasses.dbc
-        'ra'            => [-2 => "Horde", -1 => "Alliance", "Both", "Human", "Orc", "Dwarf", "Night Elf", "Undead", "Tauren", "Gnome", "Troll", null, "Blood Elf", "Draenei"],
+        'ra'            => [-2 => "Horde", -1 => "Alliance", "Both", "Human", "Orc", "Dwarf", "Night Elf", "Undead", "Tauren", "Gnome", "Troll", null, "Blood Elf", "Draenei"],     // ChrRaces.dbc
-        'rep'           => ["Hated", "Hostile", "Unfriendly", "Neutral", "Friendly", "Honored", "Revered", "Exalted"],
+        'rep'           => ["Hated", "Hostile", "Unfriendly", "Neutral", "Friendly", "Honored", "Revered", "Exalted"],                                                              // FACTION_STANDING_LABEL*
-        'st'            => array(
+        'st'            => array(                           // SpellShapeshiftForm.dbc
             "Default",                      "Cat Form",                     "Tree of Life",                 "Travel Form",                  "Aquatic Form",                 "Bear From",
             null,                           null,                           "Dire Bear Form",               null,                           null,                           null,
             null,                           "Shadowdance",                  null,                           null,                           "Ghostwolf",                    "Battle Stance",
@@ -276,7 +280,7 @@ $lang = array(
             null,                           null,                           null,                           "Swift Flight Form",            "Shadow Form",                  "Flight Form",
             "Stealth",                      "Moonkin Form",                 "Spirit of Redemption"
         ),
-        'me'            => array(
+        'me'            => array(                           // SpellMechanic.dbc .. not quite
             null,                           "Charmed",                      "Disoriented",                  "Disarmed",                     "Distracted",                   "Fleeing",
             "Gripped",                      "Rooted",                       "Pacified",                     "Silenced",                     "Asleep",                       "Ensnared",
             "Stunned",                      "Frozen",                       "Incapacitated",                "Bleeding",                     "Healing",                      "Polymorphed",
@@ -284,12 +288,12 @@ $lang = array(
             "Horrified",                    "Invulnerable",                 "Interrupted",                  "Dazed",                        "Discovery",                    "Invulnerable",
             "Sapped",                       "Enraged"
         ),
-        'ct'            => array(
+        'ct'            => array(                           // CreatureType.dbc
             "Uncategorized",                "Beast",                        "Dragonkin",                    "Demon",                        "Elemental",                    "Giant",
             "Undead",                       "Humanoid",                     "Critter",                      "Mechanical",                   "Not specified",                "Totem",
             "Non-combat Pet",               "Gas Cloud"
         ),
-        'fa'            => array(
+        'fa'            => array(                           // CreatureFamily.dbc
              1 => "Wolf",                    2 => "Cat",                     3 => "Spider",                  4 => "Bear",                    5 => "Boar",                    6 => "Crocolisk",
              7 => "Carrion Bird",            8 => "Crab",                    9 => "Gorilla",                11 => "Raptor",                 12 => "Tallstrider",            20 => "Scorpid",
             21 => "Turtle",                 24 => "Bat",                    25 => "Hyena",                  26 => "Bird of Prey",           27 => "Wind Serpent",           30 => "Dragonhawk",
@@ -297,7 +301,7 @@ $lang = array(
             38 => "Chimaera",               39 => "Devilsaur",              41 => "Silithid",               42 => "Worm",                   43 => "Rhino",                  44 => "Wasp",
             45 => "Core Hound",             46 => "Spirit Beast"
         ),
-        'pvpRank'       => array(
+        'pvpRank'       => array(                           // PVP_RANK_\d_\d(_FEMALE)?
             null,                                                           "Private / Scout",                                              "Corporal / Grunt",
             "Sergeant / Sergeant",                                          "Master Sergeant / Senior Sergeant",                            "Sergeant Major / First Sergeant",
             "Knight / Stone Guard",                                         "Knight-Lieutenant / Blood Guard",                              "Knight-Captain / Legionnare",
@@ -552,7 +556,7 @@ $lang = array(
         '_transfer'     => 'This quest will be converted to <a href="?quest=%d" class="q1">%s</a> if you transfer to <span class="icon-%s">%s</span>.',
         'questLevel'    => "Level %s",
         'requirements'  => "Requirements",
-        'reqMoney'      => "Required money",
+        'reqMoney'      => "Required money",                // REQUIRED_MONEY
         'money'         => "Money",
         'additionalReq' => "Additional requirements to obtain this quest",
         'reqRepWith'    => 'Your reputation with <a href="?faction=%d">%s</a> must be %s %s',
@@ -588,7 +592,7 @@ $lang = array(
         'enabledByQ'    => "Enabled by",
         'enabledByQDesc'=> "This quest is available only, when one of these quests are active",
         'gainsDesc'     => "Upon completion of this quest you will gain",
-        'theTitle'      => 'the title "%s"',
+        'theTitle'      => 'the title "%s"',                                        // REWARD_TITLE
         'mailDelivery'  => "You will receive this letter%s%s",
         'mailBy'        => ' by <a href="?npc=%d">%s</a>',
         'mailIn'        => " after %s",
@@ -596,11 +600,11 @@ $lang = array(
         'experience'    => "experience",
         'expConvert'    => "(or %s if completed at level %d)",
         'expConvert2'   => "%s if completed at level %d",
-        'chooseItems'   => "You will be able to choose one of these rewards",
+        'chooseItems'   => "You will be able to choose one of these rewards",       // REWARD_CHOICES
-        'receiveItems'  => "You will receive",
+        'receiveItems'  => "You will receive",                                      // REWARD_ITEMS_ONLY
-        'receiveAlso'   => "You will also receive",
+        'receiveAlso'   => "You will also receive",                                 // REWARD_ITEMS
-        'spellCast'     => "The following spell will be cast on you",
+        'spellCast'     => "The following spell will be cast on you",               // REWARD_AURA
-        'spellLearn'    => "You will learn",
+        'spellLearn'    => "You will learn",                                        // REWARD_SPELL
         'bonusTalents'  => "talent points",
         'spellDisplayed'=> ' (<a href="?spell=%d">%s</a> is displayed)',
         'attachment'    => "Attachment",
@@ -786,21 +790,21 @@ $lang = array(
         'procChance'    => "Proc chance",
         'starter'       => "Starter spell",
         'trainingCost'  => "Training cost",
-        'remaining'     => "%s remaining",
+        'remaining'     => "%s remaining",                  // SPELL_TIME_REMAINING_*
-        'untilCanceled' => "until canceled",
+        'untilCanceled' => "until cancelled",               // SPELL_DURATION_UNTIL_CANCELLED
-        'castIn'        => "%s sec cast",
+        'castIn'        => "%s sec cast",                   // SPELL_CAST_TIME_SEC
-        'instantPhys'   => "Instant",
+        'instantPhys'   => "Instant",                       // SPELL_CAST_TIME_INSTANT_NO_MANA
-        'instantMagic'  => "Instant cast",
+        'instantMagic'  => "Instant cast",                  // SPELL_CAST_TIME_INSTANT
-        'channeled'     => "Channeled",
+        'channeled'     => "Channeled",                     // SPELL_CAST_CHANNELED
-        'range'         => "%s yd range",
+        'range'         => "%s yd range",                   // SPELL_RANGE / SPELL_RANGE_DUAL
-        'meleeRange'    => "Melee Range",
+        'meleeRange'    => "Melee Range",                   // MELEE_RANGE
-        'unlimRange'    => "Unlimited Range",
+        'unlimRange'    => "Unlimited Range",               // SPELL_RANGE_UNLIMITED
-        'reagents'      => "Reagents",
+        'reagents'      => "Reagents",                      // SPELL_REAGENTS
-        'tools'         => "Tools",
+        'tools'         => "Tools",                         // SPELL_TOTEMS
         'home'          => "&lt;Inn&gt;",
         'pctCostOf'     => "of base %s",
-        'costPerSec'    => ", plus %s per sec",
+        'costPerSec'    => ", plus %s per sec",             // see 'powerTypes'
-        'costPerLevel'  => ", plus %s per level",
+        'costPerLevel'  => ", plus %s per level",           // not used?
         'stackGroup'    => "Stack Group",
         'linkedWith'    => "Linked with",
         '_scaling'      => "Scaling",
@@ -808,12 +812,12 @@ $lang = array(
             'directSP' => "+%.2f%% of spell power to direct component",         'directAP' => "+%.2f%% of attack power to direct component",
             'dotSP'    => "+%.2f%% of spell power per tick",                    'dotAP'    => "+%.2f%% of attack power per tick"
         ),
-        'powerRunes'    => ["Frost", "Unholy", "Blood", "Death"],
+        'powerRunes'    => ["Frost", "Unholy", "Blood", "Death"], // RUNE_COST_* / COMBAT_TEXT_RUNE_*
         'powerTypes'    => array(
-            // conventional
+            // conventional - HEALTH, MANA, RAGE, FOCUS, ENERGY, HAPPINESS, RUNES, RUNIC_POWER / *_COST / *COST_PER_TIME
               -2 => "Health",              0 => "Mana",                1 => "Rage",                2 => "Focus",               3 => "Energy",              4 => "Happiness",
-               5 => "Rune",                6 => "Runic Power",
+               5 => "Runes",               6 => "Runic Power",
-            // powerDisplay
+            // powerDisplay - PowerDisplay.dbc -> GlobalStrings.lua POWER_TYPE_*
               -1 => "Ammo",              -41 => "Pyrite",            -61 => "Steam Pressure",   -101 => "Heat",             -121 => "Ooze",             -141 => "Blood Power",
             -142 => "Wrath"
         ),
@@ -823,12 +827,12 @@ $lang = array(
             'recipes' => '<a href="?items=9.%s">recipe items</a>',
             'crafted' => '<a href="?items&filter=cr=86;crs=%s;crv=0">crafted items</a>'
         ),
-        'cat'           => array(
+        'cat'           => array(                           // as per menu in locale_enus.js
-              7 => "Class Skills",      // classList
+              7 => "Class Skills",                          // classList
-            -13 => "Glyphs",            // classList
+            -13 => "Glyphs",                                // classList
             -11 => array("Proficiencies", 8 => "Armor", 6 => "Weapon", 10 => "Languages"),
              -4 => "Racial Traits",
-             -2 => "Talents",           // classList
+             -2 => "Talents",                               // classList
              -6 => "Companions",
              -5 => "Mounts",
              -3 => array(
@@ -859,12 +863,12 @@ $lang = array(
              -9 => "GM Abilities",
               0 => "Uncategorized"
         ),
-        'armorSubClass' => array(
+        'armorSubClass' => array(                           // ItemSubClass.dbc/2
             "Miscellaneous",                        "Cloth Armor",                          "Leather Armor",                        "Mail Armor",                           "Plate Armor",
             null,                                   "Shields",                              "Librams",                              "Idols",                                "Totems",
             "Sigils"
         ),
-        'weaponSubClass' => array(                          // ordered by content firts, then alphabeticaly
+        'weaponSubClass' => array(                          // ItemSubClass.dbc/4; ordered by content firts, then alphabeticaly
             15 => "Daggers",                        13 => "Fist Weapons",                    0 => "One-Handed Axes",                 4 => "One-Handed Maces",                7 => "One-Handed Swords",
              6 => "Polearms",                       10 => "Staves",                          1 => "Two-Handed Axes",                 5 => "Two-Handed Maces",                8 => "Two-Handed Swords",
              2 => "Bows",                           18 => "Crossbows",                       3 => "Guns",                           16 => "Thrown",                         19 => "Wands",
@@ -893,7 +897,7 @@ $lang = array(
             "Taken Critical Ranged Hit Chance",     "Taken Critical Spell Hit Chance",      "Melee Haste",                          "Ranged Haste",                         "Spell Haste",
             "Mainhand Weapon Skill",                "Offhand Weapon Skill",                 "Ranged Weapon Skill",                  "Expertise",                            "Armor Penetration"
         ),
-        'lockType'      => array(
+        'lockType'      => array(                           // lockType.dbc
             null,                                   "Lockpicking",                          "Herbalism",                            "Mining",                               "Disarm Trap",
             "Open",                                 "Treasure (DND)",                       "Calcified Elven Gems (DND)",           "Close",                                "Arm Trap",
             "Quick Open",                           "Quick Close",                          "Open Tinkering",                       "Open Kneeling",                        "Open Attacking",
@@ -905,32 +909,24 @@ $lang = array(
     ),
     'item' => array(
         'notFound'      => "This item doesn't exist.",
-        'armor'         => "%s Armor",
+        'armor'         => "%s Armor",                      // ARMOR_TEMPLATE
-        'block'         => "%s Block",
+        'block'         => "%s Block",                      // SHIELD_BLOCK_TEMPLATE
-        'charges'       => "Charges",
+        'charges'       => "Charges",                       // ITEM_SPELL_CHARGES
-        'locked'        => "Locked",
+        'locked'        => "Locked",                        // LOCKED
         'ratingString'  => "%s&nbsp;@&nbsp;L%s",
-        'heroic'        => "Heroic",
+        'heroic'        => "Heroic",                        // ITEM_HEROIC
-        'unique'        => "Unique",
+        'startQuest'    => "This Item Begins a Quest",      // ITEM_STARTS_QUEST
-        'uniqueEquipped'=> "Unique-Equipped",
+        'bagSlotString' => "%d Slot %s",                    // CONTAINER_SLOTS
-        'startQuest'    => "This Item Begins a Quest",
-        'bagSlotString' => "%d Slot %s",
-        'dps'           => "damage per second",
-        'dps2'          => "damage per second",
-        'addsDps'       => "Adds",
         'fap'           => "Feral Attack Power",
-        'durability'    => "Durability",
+        'durability'    => "Durability %d / %d",            // DURABILITY_TEMPLATE
         'realTime'      => "real time",
-        'conjured'      => "Conjured Item",
+        'conjured'      => "Conjured Item",                 // ITEM_CONJURED
-        'damagePhys'    => "%s Damage",
+        'sellPrice'     => "Sell Price",                    // SELL_PRICE
-        'damageMagic'   => "%s %s Damage",
+        'itemLevel'     => "Item Level %d",                 // ITEM_LEVEL
-        'speed'         => "Speed",
+        'randEnchant'   => "&lt;Random enchantment&gt",     // ITEM_RANDOM_ENCHANT
-        'sellPrice'     => "Sell Price",
+        'readClick'     => "&lt;Right Click To Read&gt",    // ITEM_READABLE
-        'itemLevel'     => "Item Level",
+        'openClick'     => "&lt;Right Click To Open&gt",    // ITEM_OPENABLE
-        'randEnchant'   => "&lt;Random enchantment&gt",
+        'set'           => "(%d) Set: %s",                  // ITEM_SET_BONUS_GRAY
-        'readClick'     => "&lt;Right Click To Read&gt",
-        'openClick'     => "&lt;Right Click To Open&gt",
-        'set'           => "Set",
         'partyLoot'     => "Party loot",
         'smartLoot'     => "Smart loot",
         'indestructible'=> "Cannot be destroyed",
@@ -944,31 +940,43 @@ $lang = array(
         'consumable'    => "Consumable",
         'nonConsumable' => "Non-consumable",
         'accountWide'   => "Account-wide",
-        'millable'      => "Millable",
+        'millable'      => "Millable",                      // ITEM_MILLABLE
         'noEquipCD'     => "No equip cooldown",
-        'prospectable'  => "Prospectable",
+        'prospectable'  => "Prospectable",                  // ITEM_PROSPECTABLE
-        'disenchantable'=> "Disenchantable",
+        'disenchantable'=> "Disenchantable",                // ITEM_DISENCHANT_ANY_SKILL
-        'cantDisenchant'=> "Cannot be disenchanted",
+        'cantDisenchant'=> "Cannot be disenchanted",        // ITEM_DISENCHANT_NOT_DISENCHANTABLE
-        'repairCost'    => "Repair cost",
+        'repairCost'    => "Repair cost",                   // REPAIR_COST
         'tool'          => "Tool",
-        'cost'          => "Cost",
+        'cost'          => "Cost",                          // COSTS_LABEL
         'content'       => "Content",
         '_transfer'     => 'This item will be converted to <a href="?item=%d" class="q%d icontiny tinyspecial" style="background-image: url('.STATIC_URL.'/images/wow/icons/tiny/%s.gif)">%s</a> if you transfer to <span class="icon-%s">%s</span>.',
         '_unavailable'  => "This item is not available to players.",
         '_rndEnchants'  => "Random Enchantments",
         '_chance'       => "(%s%% chance)",
         'slot'          => "Slot",
-        '_quality'      => "Quality",
+        '_quality'      => "Quality",                       // QUALITY
         'usableBy'      => "Usable by",
-        'buyout'        => "Buyout price",
+        'buyout'        => "Buyout price",                  // BUYOUT_PRICE
         'each'          => "each",
         'tabOther'      => "Other",
+        'reqMinLevel'   => "Requires Level %d",             // ITEM_MIN_LEVEL
+        'reqLevelRange' => "Requires level %d to %d (%s)",  // ITEM_LEVEL_RANGE_CURRENT
+        'unique'        => ["Unique",          "Unique (%d)", "Unique: %s (%d)"         ],   // ITEM_UNIQUE, ITEM_UNIQUE_MULTIPLE, ITEM_LIMIT_CATEGORY
+        'uniqueEquipped'=> ["Unique-Equipped", null,          "Unique-Equipped: %s (%d)"],   // ITEM_UNIQUE_EQUIPPABLE, null, ITEM_LIMIT_CATEGORY_MULTIPLE
+        'speed'         => "Speed",                         // SPEED
+        'dps'           => "(%.1f damage per second)",      // DPS_TEMPLATE
+        'damage'        => array(                           // *DAMAGE_TEMPLATE*
+                        //  basic,                          basic /w school,                add basic,                  add basic /w school
+            'single'    => ["%d Damage",                    "%d %s Damage",                 "+ %d Damage",              "+%d %s Damage"             ],
+            'range'     => ["%d - %d Damage",               "%d - %d %s Damage",            "+ %d - %d Damage",         "+%d - %d %s Damage"        ],
+            'ammo'      => ["Adds %g damage per second",    "Adds %g %s damage per second", "+ %g damage per second",   "+ %g %s damage per second" ]
+        ),
         'gems'          => "Gems",
-        'socketBonus'   => "Socket Bonus",
+        'socketBonus'   => "Socket Bonus",                  // ITEM_SOCKET_BONUS
-        'socket'        => array(
+        'socket'        => array(                           // EMPTY_SOCKET_*
             "Meta Socket",          "Red Socket",       "Yellow Socket",        "Blue Socket",          -1 => "Prismatic Socket"
         ),
-        'gemColors'     => array(
+        'gemColors'     => array(                           // *_GEM
             "meta",                 "red",              "yellow",               "blue"
         ),
         'gemConditions' => array(                           // ENCHANT_CONDITION_* in GlobalStrings.lua
@@ -981,24 +989,24 @@ $lang = array(
             "Requires personal and team arena rating of %d<br>in 3v3 or 5v5 brackets",
             "Requires personal and team arena rating of %d<br>in 5v5 brackets"
         ),
-        'quality'       => array(
+        'quality'       => array(                           // ITEM_QUALITY?_DESC
             "Poor",                 "Common",           "Uncommon",             "Rare",
             "Epic",                 "Legendary",        "Artifact",             "Heirloom"
         ),
-        'trigger'       => array(
+        'trigger'       => array(                           // ITEM_SPELL_TRIGGER_*
             "Use: ",                "Equip: ",          "Chance on hit: ",      "",                             "",
             "",                     ""
         ),
-        'bonding'       => array(
+        'bonding'       => array(                           // ITEM_BIND_*
             "Binds to account",                         "Binds when picked up",                                 "Binds when equipped",
             "Binds when used",                          "Quest Item",                                           "Quest Item"
         ),
-        "bagFamily"     => array(
+        "bagFamily"     => array(                           // ItemSubClass.dbc/1
             "Bag",                  "Quiver",           "Ammo Pouch",           "Soul Bag",                     "Leatherworking Bag",
             "Inscription Bag",      "Herb Bag",         "Enchanting Bag",       "Engineering Bag",              null, /*Key*/
             "Gem Bag",              "Mining Bag"
         ),
-        'inventoryType' => array(
+        'inventoryType' => array(                           // INVTYPE_*
             null,                   "Head",             "Neck",                 "Shoulder",                     "Shirt",
             "Chest",                "Waist",            "Legs",                 "Feet",                         "Wrist",
             "Hands",                "Finger",           "Trinket",              "One-Hand",                     "Off Hand", /*Shield*/
@@ -1006,23 +1014,23 @@ $lang = array(
             null, /*Robe*/          "Main Hand",        "Off Hand",             "Held In Off-Hand",             "Projectile",
             "Thrown",               null, /*Ranged2*/   "Quiver",               "Relic"
         ),
-        'armorSubClass' => array(
+        'armorSubClass' => array(                           // ItemSubClass.dbc/2
             "Miscellaneous",        "Cloth",            "Leather",              "Mail",                         "Plate",
             null,                   "Shield",           "Libram",               "Idol",                         "Totem",
             "Sigil"
         ),
-        'weaponSubClass'=> array(
+        'weaponSubClass'=> array(                           // ItemSubClass.dbc/4
             "Axe",                  "Axe",              "Bow",                  "Gun",                          "Mace",
             "Mace",                 "Polearm",          "Sword",                "Sword",                        null,
             "Staff",                null,               null,                   "Fist Weapon",                  "Miscellaneous",
             "Dagger",               "Thrown",           null,                   "Crossbow",                     "Wand",
             "Fishing Pole"
         ),
-        'projectileSubClass' => array(
+        'projectileSubClass' => array(                      // ItemSubClass.dbc/6
             null,                   null,               "Arrow",                "Bullet",                        null
         ),
         'elixirType'    => [null, "Battle", "Guardian"],
-        'cat'           => array(                           // ordered by content first, then alphabeticaly
+        'cat'           => array(                           // ordered by content first, then alphabeticaly; item menu from locale_enus.js
              2 => "Weapons",                                // self::$spell['weaponSubClass']
              4 => array("Armor", array(
                  1 => "Cloth Armor",                 2 => "Leather Armor",           3 => "Mail Armor",              4 => "Plate Armor",             6 => "Shields",                 7 => "Librams",
@@ -1066,9 +1074,9 @@ $lang = array(
             12 => "Quest",
             13 => "Keys",
         ),
-        'statType'      => array(
+        'statType'      => array(                           // ITEM_MOD_*
-            "Increases your Mana by %d.",
+            "Mana",
-            "Increases your Health by %d.",
+            "Health",
             null,
             "Agility",
             "Strength",
@@ -1076,7 +1084,7 @@ $lang = array(
             "Spirit",
             "Stamina",
             null, null, null, null,
-            "Improves defense rating by %d.",
+            "Increases defense rating by %d.",
             "Increases your dodge rating by %d.",
             "Increases your parry rating by %d.",
             "Increases your shield block rating by %d.",
@@ -1101,17 +1109,17 @@ $lang = array(
             "Improves critical avoidance rating by %d.",
             "Increases your resilience rating by %d.",
             "Increases your haste rating by %d.",
-            "Improves expertise rating by %d.",
+            "Increases expertise rating by %d.",
-            "Improves attack power by %d.",
+            "Increases attack power by %d.",
-            "Improves ranged attack power by %d.",
+            "Increases ranged attack power by %d.",
-            "Improves attack power by %d in Cat, Bear, Dire Bear, and Moonkin forms only.",
+            "Increases attack power by %d in Cat, Bear, Dire Bear, and Moonkin forms only.",
-            "Improves damage done by magical spells and effects by up to %d.",
+            "Increases damage done by magical spells and effects by up to %d.",
-            "Improves healing done by magical spells and effects by up to %d.",
+            "Increases healing done by magical spells and effects by up to %d.",
             "Restores %d mana per 5 sec.",
             "Increases your armor penetration rating by %d.",
-            "Improves spell power by %d.",
+            "Increases spell power by %d.",
             "Restores %d health per 5 sec.",
-            "Improves spell penetration by %d.",
+            "Increases spell penetration by %d.",
             "Increases the block value of your shield by %d.",
             "Unknown Bonus #%d (%d)",
         )

localization/locale_eses.php

@@ -222,7 +222,6 @@ $lang = array(
         'requires'      => "Requiere %s",
         'requires2'     => "Requiere",
         'reqLevel'      => "Necesitas ser de nivel %s",
-        'reqLevelHlm'   => "Necesitas ser de nivel %s",
         'reqSkillLevel' => "Requiere nivel de habilidad",
         'level'         => "Nivel",
         'school'        => "Escuela",
@@ -319,7 +318,6 @@ $lang = array(
             "Desarrollador",                "VIP",                          "Bloggor",                      "Premium",                      "Traductor",                    "Agente de ventas",
             "Gestor de Capturas de pantalla","Gestor de vídeos",            "Partner de API",               "Pendiente"
         ),
-
         // signIn
         'doSignIn'      => "Iniciar sesión con tu cuenta de Aowow",
         'signIn'        => "Iniciar sesión",
@@ -917,26 +915,18 @@ $lang = array(
         'locked'        => "Cerrado",
         'ratingString'  => "%s @ L%s",
         'heroic'        => "Heroico",
-        'unique'        => "Único",
-        'uniqueEquipped'=> "Único-Equipado",
         'startQuest'    => "Este objeto inicia una misión",
         'bagSlotString' => "%s de %d casillas",
-        'dps'           => "daño por segundo",
-        'dps2'          => "daño por segundo",
-        'addsDps'       => "Añade",
         'fap'           => "poder de ataque feral",
-        'durability'    => "Durabilidad",
+        'durability'    => "Durabilidad %d / %d",
         'realTime'      => "tiempo real",
         'conjured'      => "Objeto mágico",
-        'damagePhys'    => "%s Daño",
-        'damageMagic'   => "%s %s Daño",
-        'speed'         => "Velocidad",
         'sellPrice'     => "Precio de venta",
-        'itemLevel'     => "Nivel de objeto",
+        'itemLevel'     => "Nivel de objeto %d",
         'randEnchant'   => "<Encantamiento aleatorio&gt",
         'readClick'     => "<Click derecho para leer&gt",
         'openClick'     => "<Click derecho para abrir&gt",
-        'set'           => "Conjunto",
+        'set'           => "(%d) Bonif.: %s",
         'partyLoot'     => "Despojo de grupo",
         'smartLoot'     => "Botín inteligente",
         'indestructible'=> "No puede ser destruido",
@@ -969,6 +959,18 @@ $lang = array(
         'buyout'        => "Precio de venta en subasta",
         'each'          => "cada uno",
         'tabOther'      => "Otros",
+        'reqMinLevel'   => "Necesitas ser de nivel %d",
+        'reqLevelRange' => "Requiere un nivel entre %d y %d (%s)",
+        'unique'        => ["Único",          "Único (%d)", "Único: %s (%d)"         ],
+        'uniqueEquipped'=> ["Único-Equipado", null,         "Único-Equipado: %s (%d)"],
+        'speed'         => "Veloc.",
+        'dps'           => "(%.1f daño por segundo)",
+        'damage'        => array(                           // *DAMAGE_TEMPLATE*
+                        //  basic,                          basic /w school,                add basic,                  add basic /w school
+            "single"    => ["%d Daño",                      "%d %s Daño",                   "+ %d daño",                "+%d %s daños"            ],
+            "range"     => ["%d - %d Daño",                 "%d - %d daño de %s",           "+ %d: %d daño",            "+%d - %d daño de %s"     ],
+            'ammo'      => ["Añade %g daño por segundo",    "Añade %g %s daño por segundo", "+ %g daño por segundo",    "+ %g %s daño por segundo"]
+        ),
         'gems'          => "Gemas",
         'socketBonus'   => "Bono de ranura",
         'socket'        => array(
@@ -1073,8 +1075,8 @@ $lang = array(
             13 => "Llaves",
         ),
         'statType'      => array(
-            "Aumenta tu maná %d p.",
+            "Maná",
-            "Aumenta tu salud %d p.",
+            "Salud",
             null,
             "agilidad",
             "fuerza",
@@ -1101,16 +1103,16 @@ $lang = array(
             "Mejora tu índice de celeridad cuerpo a cuerpo %d p.",
             "Mejora tu índice de celeridad a distancia %d p.",
             "Mejora tu índice de celeridad con hechizos %d p.",
-            "Aumenta tu índice de golpe %d p.",
+            "Mejora tu índice de golpe %d p.",
-            "Aumenta tu índice de golpe crítico %d p.",
+            "Mejora tu índice de golpe crítico %d p.",
             "Mejora tu índice de evasión %d p.",
             "Mejora tu índice de evasión de golpes críticos %d p.",
-            "Aumenta tu índice de temple %d p.",
+            "Mejora tu índice de temple %d p.",
-            "Aumenta tu índice de celeridad %d p.",
+            "Mejora tu índice de celeridad %d p.",
             "Aumenta tu índice de pericia %d p.",
             "Aumenta el poder de ataque %d p.",
             "Aumenta el poder de ataque a distancia %d p.",
-            "Aumenta en %d p. el poder de ataque bajo formas felinas, de oso, de oso temible y de lechúcico lunar.",
+            "Aumenta el poder de ataque %d p. solo con las formas de gato, oso, oso temible y lechúcico lunar.",
             "Aumenta el daño infligido con hechizos y efectos mágicos hasta %d p.",
             "Aumenta la sanación hecha con hechizos y efectos mágicos hasta %d p.",
             "Restaura %d p. de maná cada 5 s.",

localization/locale_frfr.php

@@ -222,7 +222,6 @@ $lang = array(
         'requires'      => "%s requis",
         'requires2'     => "Requiert",
         'reqLevel'      => "Niveau %s requis",
-        'reqLevelHlm'   => "Requiert Niveau %s",
         'reqSkillLevel' => "Niveau de compétence requis",
         'level'         => "Niveau",
         'school'        => "École",
@@ -679,7 +678,8 @@ $lang = array(
             ),
             7 => array( "Divers",
                 -365 => "Guerre d'Ahn'Qiraj",          -1010 => "Chercheur de donjons",           -1 => "Épique",                       -344 => "Légendaire",                   -367 => "Réputation",
-                -368 => "Invasion du fléau",            -241 => "Tournoi"),
+                -368 => "Invasion du fléau",            -241 => "Tournoi"
+            ),
            -2 => "Non classés"
         )
     ),
@@ -915,26 +915,18 @@ $lang = array(
         'locked'        => "Verrouillé",
         'ratingString'  => "%s @ L%s",
         'heroic'        => "Héroïque",
-        'unique'        => "Unique",
-        'uniqueEquipped'=> "Unique - Equipé",
         'startQuest'    => "Cet objet permet de lancer une quête",
         'bagSlotString' => "%s %d emplacements",
-        'dps'           => "dégâts par seconde",
-        'dps2'          => "dégâts par seconde",
-        'addsDps'       => "Ajoute",
         'fap'           => "puissance d'attaque en combat farouche",
-        'durability'    => "Durabilité",
+        'durability'    => "Durabilité %d / %d",
         'realTime'      => "temps réel",
         'conjured'      => "Objet invoqué",
-        'damagePhys'    => "Dégâts : %s",
-        'damageMagic'   => "%s points de dégâts (%s)",
-        'speed'         => "Vitesse",
         'sellPrice'     => "Prix de Vente",
-        'itemLevel'     => "Niveau d'objet",
+        'itemLevel'     => "Niveau d'objet %d",
         'randEnchant'   => "<Enchantement aléatoire&gt",
         'readClick'     => "<Clique Droit pour Lire&gt",
         'openClick'     => "<Clic Droit pour Ouvrir&gt",
-        'set'           => "Set",
+        'set'           => "(%d) Ensemble : %s",
         'partyLoot'     => "Butin de groupe",
         'smartLoot'     => "Butin intelligent",
         'indestructible'=> "Ne peut être détruit",
@@ -967,6 +959,18 @@ $lang = array(
         'buyout'        => "Vente immédiate",
         'each'          => "chacun",
         'tabOther'      => "Autre",
+        'reqMinLevel'   => "Niveau %d requis",
+        'reqLevelRange' => "Niveau %d à %d (%s) requis",
+        'unique'        => ["Unique",          "Unique (%d)", "Unique: %s (%d)"         ],   // ITEM_UNIQUE, ITEM_UNIQUE_MULTIPLE, ITEM_LIMIT_CATEGORY
+        'uniqueEquipped'=> ["Unique - Equipé", null,          "Unique - Equipé: %s (%d)"],   // ITEM_UNIQUE_EQUIPPABLE, null, ITEM_LIMIT_CATEGORY_MULTIPLE
+        'speed'         => "Vitesse",
+        'dps'           => "(%.1f dégâts par seconde)",
+        'damage'        => array(                           // *DAMAGE_TEMPLATE*
+                            //  basic,                      basic /w school,                                add basic,                              add basic /w school
+            'single'    => ["%d Dégâts",                    "%d points de dégâts (%s)",                     "+ %d points de dégâts",                "+ %d points de dégâts (%s)"             ],
+            'range'     => ["Dégâts : %d - %d",             "%d - %d points de dégâts (%s)",                "+ %d - %d points de dégâts",           "+%d - %d points de dégâts (%s)"         ],
+            'ammo'      => ["Ajoute %g dégâts par seconde", "Ajoute %g points de dégâts (%s) par seconde",  "+ %g points de dégâts par seconde",    "+ %g points de dégâts (%s) par seconde" ]
+        ),
         'gems'          => "Gemmes",
         'socketBonus'   => "Bonus de châsse",
         'socket'        => array(
@@ -1071,8 +1075,8 @@ $lang = array(
             13 => "Clés",
         ),
         'statType'      => array(
-            "Augmente vos points de mana de %d.",
+            "Mana",
-            "Augmente vos points de vie de %d.",
+            "Vie",
             null,
             "Agilité",
             "Force",

localization/locale_ruru.php

@@ -222,7 +222,6 @@ $lang = array(
         'requires'      => "Требует %s",
         'requires2'     => "Требуется:",
         'reqLevel'      => "Требуется уровень: %s",
-        'reqLevelHlm'   => "Требуется уровень: %s",
         'reqSkillLevel' => "Требуется уровень навыка",
         'level'         => "Уровень",
         'school'        => "Школа",
@@ -786,7 +785,6 @@ $lang = array(
         '_collapseAll'  => "Свернуть все",
         '_expandAll'    => "Развернуть все",
         '_transfer'     => 'Этот предмет превратится в <a href="?spell=%d" class="q%d icontiny tinyspecial" style="background-image: url('.STATIC_URL.'/images/wow/icons/tiny/%s.gif)">%s</a>, если вы перейдете за <span class="icon-%s">%s</span>.',
-
         'discovered'    => "Изучается путём освоения местности",
         'ppm'           => "Срабатывает %s раз в минуту",
         'procChance'    => "Шанс срабатывания",
@@ -917,26 +915,18 @@ $lang = array(
         'locked'        => "Заперт",
         'ratingString'  => "%s&nbsp;@&nbsp;L%s",
         'heroic'        => "Героический",
-        'unique'        => "Уникальный",
-        'uniqueEquipped'=> "Не более 1 в вооружении",
         'startQuest'    => "Этот предмет позволяет получить задание.",
         'bagSlotString' => "%s (ячеек: %d)",
-        'dps'           => "ед. урона в секунду",
-        'dps2'          => "урон в секунду",
-        'addsDps'       => "Добавляет",
         'fap'           => "Сила атаки зверя",
-        'durability'    => "Прочность:",
+        'durability'    => "Прочность: %d / %d",
         'realTime'      => "реальное время",
         'conjured'      => "Сотворенный предмет",
-        'damagePhys'    => "Урон: %s",
-        'damageMagic'   => "Урон: %s (%s)",
-        'speed'         => "Скорость",
         'sellPrice'     => "Цена продажи",
-        'itemLevel'     => "Уровень предмета:",
+        'itemLevel'     => "Уровень предмета: %d",
         'randEnchant'   => "&lt;Случайное зачарование&gt",
         'readClick'     => "&lt;Щелкните правой кнопкой мыши, чтобы прочитать.&gt",
         'openClick'     => "&lt;Щелкните правой кнопкой мыши, чтобы открыть.&gt",
-        'set'           => "Набор",
+        'set'           => "Комплект (%d предмет): %s",     // todo(med): fix that shit! |4предмет:предмета:предметов;
         'partyLoot'     => "Добыча группы",
         'smartLoot'     => "Умное распределение добычи",
         'indestructible'=> "Невозможно выбросить",
@@ -969,6 +959,18 @@ $lang = array(
         'buyout'        => "Цена выкупа",
         'each'          => "каждый",
         'tabOther'      => "Другое",
+        'reqMinLevel'   => "Требуется уровень: %d",
+        'reqLevelRange' => "Требуемый уровень: %d – %d (%d)",
+        'unique'        => ["Уникальный",                   "Уникальный (%d)",  "Уникальный: %s (%d)"                       ],
+        'uniqueEquipped'=> ["Уникальный использующийся",    null,               "Уникальный использующийся предмет: %s (%d)"],
+        'speed'         => "Скорость",
+        'dps'           => "(%.1f ед. урона в секунду)",
+        'damage'        => array(                           // *DAMAGE_TEMPLATE*
+                        //  basic,                              basic /w school,                            add basic,                                      add basic /w school
+            'single'    => ["Урон: %d",                         "%d ед. %s",                                "+ %d ед. урона",                               "+%d ед. урона (%s)"            ],
+            'range'     => ["Урон: %d - %d",                    "%d - %d ед. %s",                           "+ %d - %d ед. урона",                          "+%d - %d ед. урона (%s)"       ],
+            'ammo'      => ["Добавляет %g ед. урона в секунду", "Добавляет %g ед. урона (%s) в секунду",    "+ ед. урона в секунду от боеприпасов (%g)",    "+ %g %s ед. урона в секунду"   ]
+        ),
         'gems'          => "Самоцветы",
         'socketBonus'   => "При соответствии цвета",
         'socket'        => array(
@@ -1072,8 +1074,8 @@ $lang = array(
             13 => "Ключи",
         ),
         'statType'      => array(
-            "Увеличение запаса маны на %d ед.",
+            "к мане",
-            "Увеличение максимального запаса здоровья на %d ед.",
+            "к здоровью",
             null,
             "к ловкости",
             "к силе",

static/js/global.js

@@ -11517,8 +11517,7 @@ Listview.templates = {
         ]
     },
 
-    icongallery:
+    icongallery: {
-    {
         sort: [1],
         mode: Listview.MODE_FLEXGRID,
         clickable: false,
@@ -11667,8 +11666,7 @@ Listview.templates = {
         }
     },
 
-    topusers:
+    topusers: {
-    {
         sort: ['reputation'],
         searchable: 1,
         filtrable: 0,
@@ -15996,7 +15994,7 @@ Listview.templates = {
             if (displayId) {
                 var a = $WH.ce('a');
                 a.href = 'javascript:;';
-                a.rel = this.genericlinktype + '=' + model.id;
+                a.rel = this.genericlinktype + '=' + model.id + ' domain=' + Locale.get().domain ;
                 a.onclick = this.template.modelShow.bind(this.template, type, typeId, displayId, slot, false);
 
                 var img = $WH.ce('img');