WoWInterface SVN MorgDKP

Compare Revisions

  • This comparison shows the changes necessary to convert path
    /
    from Rev 23 to Rev 24
    Reverse comparison

Rev 23 → Rev 24

trunk/MorgDKP/MorgDKPFu.lua
86,7 → 86,7
end
 
function MorgDKPFu:ActivateMorgDKP()
if MorgDKP.db.account.defaults.autozone and not UnitIsGhost("player") then
if MorgDKP.db.account.defaults.autozone and not UnitIsGhost("player") then
if not MorgDKP:IsActive() then MorgDKP:ToggleActive(true) end
end
MorgDKP:ReclaimZone()
trunk/MorgDKP/plugins/morgdkp/Morgfunc.php
259,16 → 259,16
function FetchAliases($eqdkp, $table_prefix, $name) {
if (mysql_select_db($eqdkp)) {
$result = mysql_query("SELECT alias_id, alias_name, alias_member_id, member_name, member_id
FROM " . $table_prefix . 'ctrt_aliases' . ", " . $table_prefix . 'members' .
" WHERE member_id = alias_member_id AND member_name = '$name'");
FROM " . $table_prefix . 'ctrt_aliases' . ", " . $table_prefix . 'members' .
" WHERE member_id = alias_member_id AND member_name = '$name'");
$temp = array();
if ($result) {
while ($row = mysql_fetch_array($result)) {
$temp[] = array("alias_id"=>$row["alias_id"],
"alias_name"=>stripslashes($row["alias_name"]),
"alias_member_id"=>$row["alias_member_id"],
"member_name"=>stripslashes($row["member_name"]),
"member_id"=>$row["member_id"]);
"alias_name"=>stripslashes($row["alias_name"]),
"alias_member_id"=>$row["alias_member_id"],
"member_name"=>stripslashes($row["member_name"]),
"member_id"=>$row["member_id"]);
}
}
return $temp;
278,16 → 278,16
function FetchAllAliases($eqdkp, $table_prefix) {
if (mysql_select_db($eqdkp)) {
$result = mysql_query("SELECT alias_id, alias_name, alias_member_id, member_name, member_id
FROM " . $table_prefix . 'ctrt_aliases' . ", " . $table_prefix . 'members' .
" WHERE member_id = alias_member_id");
FROM " . $table_prefix . 'ctrt_aliases' . ", " . $table_prefix . 'members' .
" WHERE member_id = alias_member_id");
$temp = array();
if ($result) {
while ($row = mysql_fetch_array($result)) {
$temp[] = array("alias_id"=>$row["alias_id"],
"alias_name"=>stripslashes($row["alias_name"]),
"alias_member_id"=>$row["alias_member_id"],
"member_name"=>stripslashes($row["member_name"]),
"member_id"=>$row["member_id"]);
"alias_name"=>stripslashes($row["alias_name"]),
"alias_member_id"=>$row["alias_member_id"],
"member_name"=>stripslashes($row["member_name"]),
"member_id"=>$row["member_id"]);
}
}
return $temp;
297,10 → 297,10
function CreateAliasDB($eqdkp, $table_prefix) {
if (mysql_select_db($eqdkp)) {
$result = mysql_query("CREATE TABLE IF NOT EXISTS `". $table_prefix . 'ctrt_aliases' . "` (
`alias_id` smallint unsigned NOT NULL auto_increment,
`alias_member_id` mediumint NOT NULL,
`alias_name` varchar(50) NOT NULL,
PRIMARY KEY (`alias_id`));");
`alias_id` smallint unsigned NOT NULL auto_increment,
`alias_member_id` mediumint NOT NULL,
`alias_name` varchar(50) NOT NULL,
PRIMARY KEY (`alias_id`));");
if ($result) return true;
return false;
} else mysql_error();
339,17 → 339,17
or mysql_error();
while ($row = mysql_fetch_array($result)) {
$temp[stripslashes($row['member_name'])] = array('member_id'=>$row['member_id'],
'member_earned'=>$row['member_earned'],
'member_spent'=>$row['member_spent'],
'member_adjustment'=>$row['member_adjustment'],
'member_status'=>$row['member_status'],
'member_firstraid'=>$row['member_firstraid'],
'member_lastraid'=>$row['member_lastraid'],
'member_raidcount'=>$row['member_raidcount'],
'member_level'=>$row['member_level'],
'member_race_id'=>$row['member_race_id'],
'member_class_id'=>$row['member_class_id'],
'member_rank_id'=>$row['member_rank_id']);
'member_earned'=>$row['member_earned'],
'member_spent'=>$row['member_spent'],
'member_adjustment'=>$row['member_adjustment'],
'member_status'=>$row['member_status'],
'member_firstraid'=>$row['member_firstraid'],
'member_lastraid'=>$row['member_lastraid'],
'member_raidcount'=>$row['member_raidcount'],
'member_level'=>$row['member_level'],
'member_race_id'=>$row['member_race_id'],
'member_class_id'=>$row['member_class_id'],
'member_rank_id'=>$row['member_rank_id']);
}
return $temp;
} else mysql_error();
398,14 → 398,14
$result = mysql_query($sql);
if (!$result) echo "!addnew" . mysql_error();
$log_action = array('header' => '{L_ACTION_MEMBER_ADDED}',
'{L_NAME}' => addslashes($membername),
'{L_EARNED}' => '0',
'{L_SPENT}' => '0',
'{L_ADJUSTMENT}' => $data['member_adjustment'],
'{L_LEVEL}' => $data['member_level'],
'{L_RACE}' => $otherdata['race'],
'{L_CLASS}' => $otherdata['class'],
'{L_ADDED_BY}' => addslashes($user));
'{L_NAME}' => addslashes($membername),
'{L_EARNED}' => '0',
'{L_SPENT}' => '0',
'{L_ADJUSTMENT}' => $data['member_adjustment'],
'{L_LEVEL}' => $data['member_level'],
'{L_RACE}' => $otherdata['race'],
'{L_CLASS}' => $otherdata['class'],
'{L_ADDED_BY}' => addslashes($user));
LogAction($eqdkp, $table_prefix, $log_action);
return true;
} else echo mysql_error();
423,12 → 423,12
$result = mysql_query($sql);
if (!$result) echo "!upevent" . mysql_error();
$log_action = array('header' => '{L_ACTION_EVENT_UPDATED}',
'id' => $eventid,
'{L_NAME_BEFORE}' => addslashes($olddata['event_name']),
'{L_VALUE_BEFORE}' => $olddata['event_value'],
'{L_NAME_AFTER}' => addslashes($eventname),
'{L_VALUE_AFTER}' => $newval,
'{L_UPDATED_BY}' => addslashes($user));
'id' => $eventid,
'{L_NAME_BEFORE}' => addslashes($olddata['event_name']),
'{L_VALUE_BEFORE}' => $olddata['event_value'],
'{L_NAME_AFTER}' => addslashes($eventname),
'{L_VALUE_AFTER}' => $newval,
'{L_UPDATED_BY}' => addslashes($user));
LogAction($eqdkp, $table_prefix, $log_action);
return true;
} else echo mysql_error();
444,10 → 444,10
$result = mysql_query($sql);
if (!$result) echo "!createevent" . mysql_error();
$log_action = array('header' => '{L_ACTION_EVENT_ADDED}',
'id' => mysql_insert_id(),
'{L_NAME}' => addslashes($eventname),
'{L_VALUE}' => $eventdata['value'],
'{L_ADDED_BY}' => addslashes($user));
'id' => mysql_insert_id(),
'{L_NAME}' => addslashes($eventname),
'{L_VALUE}' => $eventdata['value'],
'{L_ADDED_BY}' => addslashes($user));
LogAction($eqdkp, $table_prefix, $log_action);
return true;
} else echo mysql_error();
470,9 → 470,9
$members = FetchAllMembers($eqdkp, $table_prefix);
$name = rtrim($name);
if (!$members[$name]) {
$newmember = array('member_name'=>"'" . addslashes($name) . "'",
'member_class_id'=>'0',
'member_race_id'=>'0');
$newmember = array( 'member_name'=>"'" . addslashes($name) . "'",
'member_class_id'=>'0',
'member_race_id'=>'0');
AddNEWMember($name, nil, $newmember, $eqdkp, $table_prefix);
}
if (mysql_select_db($eqdkp)) {
505,21 → 505,21
if (!$result) echo "!updatemem" . mysql_error();
if ($report) {
$log_action = array('header' => '{L_ACTION_MEMBER_UPDATED}',
'{L_NAME_BEFORE}' => addslashes($membername),
'{L_EARNED_BEFORE}' => $olddata['member_earned'],
'{L_SPENT_BEFORE}' => $olddata['member_spent'],
'{L_ADJUSTMENT_BEFORE}' => $olddata['member_adjustment'],
'{L_LEVEL_BEFORE}' => $olddata['member_level'],
'{L_RACE_BEFORE}' => $olddata['member_race_id'],
'{L_CLASS_BEFORE}' => $olddata['member_class_id'],
'{L_NAME_AFTER}' => addslashes($membername),
'{L_EARNED_AFTER}' => !empty($change['member_earned']) ? $change['member_earned'] : $olddata['member_earned'],
'{L_SPENT_AFTER}' => !empty($change['member_spent']) ? $change['member_spent'] : $olddata['member_spent'],
'{L_ADJUSTMENT_AFTER}' => !empty($change['member_adjustment']) ? $change['member_adjustment'] : $olddata['member_adjustment'],
'{L_LEVEL_AFTER}' => !empty($change['member_level']) ? $change['member_level'] : $olddata['member_level'],
'{L_RACE_AFTER}' => !empty($change['member_race_id']) ? $change['member_race_id'] : $olddata['member_race_id'],
'{L_CLASS_AFTER}' => !empty($change['member_class_id']) ? $change['member_class_id'] : $olddata['member_class_id'],
'{L_UPDATED_BY}' => addslashes($user));
'{L_NAME_BEFORE}' => addslashes($membername),
'{L_EARNED_BEFORE}' => $olddata['member_earned'],
'{L_SPENT_BEFORE}' => $olddata['member_spent'],
'{L_ADJUSTMENT_BEFORE}' => $olddata['member_adjustment'],
'{L_LEVEL_BEFORE}' => $olddata['member_level'],
'{L_RACE_BEFORE}' => $olddata['member_race_id'],
'{L_CLASS_BEFORE}' => $olddata['member_class_id'],
'{L_NAME_AFTER}' => addslashes($membername),
'{L_EARNED_AFTER}' => !empty($change['member_earned']) ? $change['member_earned'] : $olddata['member_earned'],
'{L_SPENT_AFTER}' => !empty($change['member_spent']) ? $change['member_spent'] : $olddata['member_spent'],
'{L_ADJUSTMENT_AFTER}' => !empty($change['member_adjustment']) ? $change['member_adjustment'] : $olddata['member_adjustment'],
'{L_LEVEL_AFTER}' => !empty($change['member_level']) ? $change['member_level'] : $olddata['member_level'],
'{L_RACE_AFTER}' => !empty($change['member_race_id']) ? $change['member_race_id'] : $olddata['member_race_id'],
'{L_CLASS_AFTER}' => !empty($change['member_class_id']) ? $change['member_class_id'] : $olddata['member_class_id'],
'{L_UPDATED_BY}' => addslashes($user));
LogAction($eqdkp, $table_prefix, $log_action);
}
return true;
539,12 → 539,12
if (!$result) echo "!createraid" . mysql_error();
$raidid = mysql_insert_id();
$log_action = array('header' => '{L_ACTION_RAID_ADDED}',
'id' => $raidid,
'{L_EVENT}' => addslashes($raid['name']),
'{L_ATTENDEES}' => implode(", ", $raid['attendees']),
'{L_NOTE}' => addslashes($raid['note']),
'{L_VALUE}' => $raid['value'],
'{L_ADDED_BY}' => addslashes($user));
'id' => $raidid,
'{L_EVENT}' => addslashes($raid['name']),
'{L_ATTENDEES}' => implode(", ", $raid['attendees']),
'{L_NOTE}' => addslashes($raid['note']),
'{L_VALUE}' => $raid['value'],
'{L_ADDED_BY}' => addslashes($user));
LogAction($eqdkp, $table_prefix, $log_action);
return $raidid;
} else echo mysql_error();
580,11 → 580,11
$result = mysql_query($sql);
if (!$result) echo "!addraiditem" . mysql_error();
$log_action = array('header' => '{L_ACTION_ITEM_ADDED}',
'{L_NAME}' => addslashes($loot['ItemName']),
'{L_BUYERS}' => addslashes($loot['Player']),
'{L_RAID_ID}' => $raid_id,
'{L_VALUE}' => $loot['Costs'],
'{L_ADDED_BY}' => addslashes($user));
'{L_NAME}' => addslashes($loot['ItemName']),
'{L_BUYERS}' => addslashes($loot['Player']),
'{L_RAID_ID}' => $raid_id,
'{L_VALUE}' => $loot['Costs'],
'{L_ADDED_BY}' => addslashes($user));
LogAction($eqdkp, $table_prefix, $log_action);
} else echo mysql_error();
}
trunk/MorgDKP/plugins/morgdkp/Morgexport.php
9,17 → 9,18
require('Morgfunc.php');
 
function CommonOutput() {
global $data, $table_prefix, $events, $poolname, $eventlist;
$result = mysql_query("SELECT alias_id, alias_name, alias_member_id, member_name
FROM " . CTRT_ALIASES_TABLE . ", " . $table_prefix . 'members' .
" WHERE member_id = alias_member_id ORDER BY alias_name");
if ($result) {
global $data, $table_prefix, $events, $poolname, $eventlist, $aliaslist;
//$result = mysql_query("SELECT alias_id, alias_name, alias_member_id, member_name
// FROM " . CTRT_ALIASES_TABLE . ", " . $table_prefix . 'members' .
// " WHERE member_id = alias_member_id ORDER BY alias_name");
if ($aliaslist) {
$data .= "Aliases = {\n\t\t";
$c = 0;
while ($row = mysql_fetch_array($result)) {
// while ($row = mysql_fetch_array($result)) {
foreach ($aliaslist as $alias=>$member) {
if ($c > 0) $data .= ",\n\t\t";
$alias = converttext($row['alias_name']);
$member = converttext($row['member_name']);
$alias = converttext($alias);
$member = converttext($member);
$data .= "[\"$alias\"] = \"$member\"";
$c++;
}
52,6 → 53,21
} else echo "The file $SaveLoc is not writable";
}
 
function FetchAliasSimple($eqdkp, $table_prefix) {
if (mysql_select_db($eqdkp)) {
$result = mysql_query("SELECT alias_id, alias_name, alias_member_id, member_name, member_id
FROM " . $table_prefix . 'ctrt_aliases' . ", " . $table_prefix . 'members' .
" WHERE member_id = alias_member_id");
$temp = array();
if ($result) {
while ($row = mysql_fetch_array($result)) {
$temp[$row["alias_name"]] = $row["member_name"];
}
}
return $temp;
} else mysql_error();
}
 
$retrieve = $_REQUEST['retrieve'];
$data = '';
$timezones = array('Pacific'=>'America/Vancouver', 'Eastern'=>'America/New_York','Central'=>'America/Regina','Mountain'=>'America/Phoenix','AEST'=>'Australia/Melbourne', 'CET'=>'Europe/Berlin');
86,28 → 102,34
$events = array();
$pools = array();
$eventlist = FetchAllEvents($dbname, $table_prefix);
$resultmulti = mysql_query("SELECT config_value FROM " . $table_prefix . "plus_config WHERE config_name = 'pk_multidkp'");
$result = mysql_query("SELECT * FROM " . $table_prefix . 'multidkp');
if ($resultmulti) {
while ($row = mysql_fetch_array($result)) {
$pools[$row['multidkp_id']] = $row['multidkp_name'];
$aliaslist = FetchAliasSimple($dbname, $table_prefix);
$resultmulti = mysql_query("SHOW TABLES FROM $dbname LIKE '" . $table_prefix . "plus_config'");
$eqdkpplus = mysql_fetch_array($resultmulti);
if ($eqdkpplus[0]) {
$result = mysql_query("SELECT * FROM " . $table_prefix . 'multidkp');
if ($result) {
while ($row = mysql_fetch_array($result)) {
$pools[$row['multidkp_id']] = $row['multidkp_name'];
}
$result = mysql_query("SELECT * FROM " . $table_prefix . 'multidkp2event');
while ($row = mysql_fetch_array($result)) {
$events[$row['multidkp2event_eventname']] = array( 'pool'=>$pools[$row['multidkp2event_multi_id']],
'value'=>$eventlist[$row['multidkp2event_eventname']]['event_value']);
}
} else {
$pools[1] = $DBName[1] or "DKP";
$events[1] = $DBName[1] or "DKP";
}
$offset += count($pools) - 1;
$result = mysql_query("SELECT * FROM " . $table_prefix . 'multidkp2event');
while ($row = mysql_fetch_array($result)) {
$events[$row['multidkp2event_eventname']] = array( 'pool'=>$pools[$row['multidkp2event_multi_id']],
'value'=>$eventlist[$row['multidkp2event_eventname']]['event_value']);
}
if (!$pools[1]) $pools[1] = $DBName[1] or "DKP";
foreach ($pools as $pluspoolnum => $poolname) {
if ($i == 1) {
$dkpnum = $pluspoolnum;
} else $dkpnum = $i + $pluspoolnum;
$data .= "MorgDKP_DKP$dkpnum = {\n\tTimestamp = " . strftime("%d%m%Y%H%M") . ",\n\tPool = \"$poolname\",\n\teqdkpsite = \"$dbname\",\n\tprefix = \"$table_prefix\",\n\tPoints = {\n\t\t";
$result = mysql_query("SELECT * FROM " . $table_prefix . 'members' . " ORDER BY member_name");
$c = 0;
$added = 0;
while ($row = mysql_fetch_array($result)) {
if ($c > 0) $data .= ",\n\t\t";
if ($added) $data .= ",\n\t\t";
$member = $row['member_name'];
$sql = "SELECT " . $table_prefix . 'raids' .".raid_name, SUM(raid_value) FROM " .
$table_prefix . 'raid_attendees' . " LEFT JOIN " . $table_prefix . 'raids' . " ON ". $table_prefix . 'raid_attendees' .
135,9 → 157,12
if ($events[$adjrow['raid_name']]['pool'] == $poolname) $adjust += $adjrow['adjustment_value'];
}
$balance = $earned - $spent + $adjust;
$member = converttext($member);
$data .= "[\"$member\"] = {earn = $earned,spent = $spent,adj = $adjust,bal = $balance}";
$c++;
$added = 0;
if (!$aliaslist[$member]) {
$member = converttext($member);
$data .= "[\"$member\"] = {earn = $earned,spent = $spent,adj = $adjust,bal = $balance}";
$added = true;
}
}
$data .= "\n\t},\n\t";
CommonOutput();
146,13 → 171,17
$dkpnum = $i + $offset;
$data .= "MorgDKP_DKP$dkpnum = {\n\tTimestamp = " . strftime("%d%m%Y%H%M") . ",\n\tPool = \"$DBName[$i]\",\n\teqdkpsite = \"$dbname\",\n\tprefix = \"$table_prefix\",\n\tPoints = {\n\t\t";
$result = mysql_query("SELECT * FROM " . $table_prefix . 'members' . " ORDER BY member_name");
$c = 0;
$added = 0;
while ($row = mysql_fetch_array($result)) {
if ($c > 0) $data .= ",\n\t\t";
if ($added) $data .= ",\n\t\t";
$balance = $row['member_earned'] - $row['member_spent'] + $row['member_adjustment'];
$member = converttext($row['member_name']);
$data .= "[\"$member\"] = {earn = {$row['member_earned']},spent = {$row['member_spent']},adj = {$row['member_adjustment']},bal = $balance}";
$c++;
$added = 0;
$member = $row['member_name'];
if (!$aliaslist[$member]) {
$member = converttext($member);
$data .= "[\"$member\"] = {earn = {$row['member_earned']},spent = {$row['member_spent']},adj = {$row['member_adjustment']},bal = $balance}";
$added = true;
}
}
$data .= "\n\t},\n\t";
CommonOutput();
trunk/MorgDKP/plugins/morgdkp/Morgresults.php
23,9 → 23,9
if ($result) {
$GLOBALS['DATAOUT'] .= "Added alias: " . stripslashes($tab['alt']) . " of " . stripslashes($tab['main']) . " to database: " . $tab['eqdkp'] . "\n";
$log_action = array('header' => '{L_ACTION_CTRT_ALIAS_ADDED}',
'{L_CTRT_LABEL_ALIAS_NAME}' => $tab['alt'],
'{L_CTRT_LABEL_MEMBER_NAME}' => $tab['main'],
'{L_ADDED_BY}' => addslashes($GLOBALS['DKPUSER']));
'{L_CTRT_LABEL_ALIAS_NAME}' => $tab['alt'],
'{L_CTRT_LABEL_MEMBER_NAME}' => $tab['main'],
'{L_ADDED_BY}' => addslashes($GLOBALS['DKPUSER']));
LogAction($tab['eqdkp'], $tab['prefix'], $log_action);
} else mysql_error();
}
36,9 → 36,9
if ($result) {
$GLOBALS['DATAOUT'] .= "Deleted alias: " . stripslashes($tab['alt']) . " of " . stripslashes($tab['main']) . " from database: " . $tab['eqdkp'] . "\n";
$log_action = array('header' => '{L_ACTION_CTRT_ALIAS_DELETED}',
'{L_CTRT_LABEL_ALIAS_NAME}' => $tab['alt'],
'{L_CTRT_LABEL_MEMBER_NAME}' => $tab['main'],
'{L_ADDED_BY}' => addslashes($GLOBALS['DKPUSER']));
'{L_CTRT_LABEL_ALIAS_NAME}' => $tab['alt'],
'{L_CTRT_LABEL_MEMBER_NAME}' => $tab['main'],
'{L_ADDED_BY}' => addslashes($GLOBALS['DKPUSER']));
LogAction($tab['eqdkp'], $tab['prefix'], $log_action);
} else mysql_error();
}
107,11 → 107,11
if ($name == $isalias[0]) {
$attendees = CheckRace($attendees);
if (!$members[$name]) {
$newmember = array('member_name'=>"'" . addslashes($name) . "'",
'member_firstraid'=>TimestringtoTimestamp($raid['date']),
'member_lastraid'=>TimestringtoTimestamp($raid['date']),
'member_raidcount'=>'1',
'member_adjustment'=>'0');
$newmember = array( 'member_name'=>"'" . addslashes($name) . "'",
'member_firstraid'=>TimestringtoTimestamp($raid['date']),
'member_lastraid'=>TimestringtoTimestamp($raid['date']),
'member_raidcount'=>'1',
'member_adjustment'=>'0');
if ($attendees['level']) $newmember['member_level'] = $attendees['level'];
if ($attendees['class']) {
$newmember['member_class_id'] = $classes[$attendees['class']];
126,9 → 126,9
}
} else {
if ($races[$attendees['race']] != $members[$name]['member_race_id'] or $classes[$attendees['class']] != $members[$name]['member_class_id'] or $attendees['level'] != $members[$name]['member_level']) {
$changed = array('member_level'=>$attendees['level'],
'member_class_id'=>$classes[$attendees['class']],
'member_race_id'=>$races[$attendees['race']]);
$changed = array( 'member_level'=>$attendees['level'],
'member_class_id'=>$classes[$attendees['class']],
'member_race_id'=>$races[$attendees['race']]);
if (UpdateMember($name, $members[$name], $changed, $eqdkp, $prefix, 1)) {
$GLOBALS['DATAOUT'] .= "Updated member: $name " . $attendees['level'] . " " . $attendees['race'] . " " . $attendees['class'] . "\n";
}
155,11 → 155,11
foreach ($event['attendees'] as $anum => $aname) {
$aname = rtrim($aname);
if (!$members[$aname]) {
$newmember = array('member_name'=>"'" . addslashes($aname) . "'",
'member_firstraid'=>TimestringtoTimestamp($raid['date']),
'member_lastraid'=>TimestringtoTimestamp($raid['date']),
'member_raidcount'=>'1',
'member_adjustment'=>'0');
$newmember = array( 'member_name'=>"'" . addslashes($aname) . "'",
'member_firstraid'=>TimestringtoTimestamp($raid['date']),
'member_lastraid'=>TimestringtoTimestamp($raid['date']),
'member_raidcount'=>'1',
'member_adjustment'=>'0');
if (AddNEWMember($aname, '', $newmember, $eqdkp, $prefix)) {
$GLOBALS['DATAOUT'] .= "Added new member: $aname\n";
}
trunk/MorgDKP/MorgDKP.lua
16,7 → 16,7
 
MorgDKP = AceLibrary("AceAddon-2.0"):new("AceEvent-2.0", "AceHook-2.1", "AceConsole-2.0","AceComm-2.0", "AceDB-2.0")
 
MorgDKP.version = "6.89"
MorgDKP.version = "6.90"
MorgDKP.commPrefix = "MorgDKP"
MorgDKP.commVersion = 6.2
 
328,6 → 328,7
self.db.account.defaults.restoreautozone = nil
end
self:UpdateRaidlist()
self:PrepareRaidmembers()
self:TogglePlayerDies(self.db.account.defaults.attemptmode)
self:RegisterEvent("CHAT_MSG_ADDON", "OnAddonMsg")
self:RegisterEvent("CHAT_MSG_LOOT", "OnLootMsg")
trunk/MorgDKP/MorgDKP.toc
1,6 → 1,6
## Interface: 20400
## Author: Morg & Fryguy
## Title: MorgDKP - |cffffffffv|r|cff00ff006.89|r
## Title: MorgDKP - |cffffffffv|r|cff00ff006.90|r
## Notes: Inspects all members of raid and saves in database, as well as lists people's dkp values
## DefaultState: 1
## SavedVariables: MorgDKPDB, MorgDKPFuBarDB
trunk/MorgDKP/libs/LibBabble-Boss-3.0/LibBabble-Boss-3.0.lua
3882,7 → 3882,7
["Feugen"] = "퓨진",
["Four Horsemen Chest"] = "Four Horsemen Chest",
["Gluth"] = "글루스",
["Gothik the Harvester"] = "영혼의 착취자 고딕",
["Gothik the Harvester"] = "영혼 착취자 고딕",
["Grand Widow Faerlina"] = "귀부인 팰리나",
["Grobbulus"] = "그라불루스",
["Heigan the Unclean"] = "부정의 헤이건",
4834,6 → 4834,652
["The Blue Brothers"] = "Los Hermanos Azules",
["Warmaul Champion"] = "Campeón Mazo de Guerra",
}
elseif GAME_LOCALE == "ruRU" then
lib:SetCurrentTranslations {
--Ahn'Qiraj
["Anubisath Defender"] = "Защитник-анубисат",
["Battleguard Sartura"] = "Боевой страж Сартура",
["C'Thun"] = "Ка-Тун",
["Emperor Vek'lor"] = "Император Век'лор",
["Emperor Vek'nilash"] = "Император Век'нилаш",
["Eye of C'Thun"] = "Око Ка-Туна",
["Fankriss the Unyielding"] = "Фанкрисс Непобедимый",
["Lord Kri"] = "Лорд Кри",
["Ouro"] = "Оуро",
["Princess Huhuran"] = "Принцесса Хухуран",
["Princess Yauj"] = "Принцесса Яудж",
["The Bug Family"] = "Семейство насекомых",
["The Prophet Skeram"] = "Пророк Скерам",
["The Twin Emperors"] = "Близнецы Императора",
["Vem"] = "Вем",
["Viscidus"] = "Фиброзник",
 
--Auchindoun
--Auchenai Crypts
["Exarch Maladaar"] = "Экзарх Маладаар",
["Shirrak the Dead Watcher"] = "Ширрак Страж Мертвых",
--Mana-Tombs
["Nexus-Prince Shaffar"] = "Принц Шаффар",
["Pandemonius"] = "Пандемоний",
["Tavarok"] = "Таварок",
--Shadow Labyrinth
["Ambassador Hellmaw"] = "Посланник Адская Глотка",
["Blackheart the Inciter"] = "Подстрекатель Черное Сердце",
["Grandmaster Vorpil"] = "Гроссмейстер Ворпил",
["Murmur"] = "Бормотун",
--Sethekk Halls
["Anzu"] = "Анзу",
["Darkweaver Syth"] = "Сит Черноплет",
["Talon King Ikiss"] = "Король воронов Айкисс",
 
--Blackfathom Deeps
["Aku'mai"] = "Акумай",
["Baron Aquanis"] = "Барон Акванис",
["Gelihast"] = "Гелихаст",
["Ghamoo-ra"] = "Гхаму-ра",
["Lady Sarevess"] = "Леди Саревесс",
["Old Serra'kis"] = "Старина Серракис",
["Twilight Lord Kelris"] = "Сумеречный лорд Келрис",
 
--Blackrock Depths
["Ambassador Flamelash"] = "Посланник Огнехлыст",
["Anger'rel"] = "Гневрел",
["Anub'shiah"] = "Ануб'сиах",
["Bael'Gar"] = "Баэл-Гар",
["Chest of The Seven"] = "Сhest of The Seven",
["Doom'rel"] = "Думрел",
["Dope'rel"] = "Наиглесиас",
["Emperor Dagran Thaurissan"] = "Император Дагран Таурисан",
["Eviscerator"] = "Потрошитель",
["Fineous Darkvire"] = "Финей Темная Сила",
["General Angerforge"] = "Генерал Кузня Гнева",
["Gloom'rel"] = "Глумрел",
["Golem Lord Argelmach"] = "Повелитель големов Аргелмах",
["Gorosh the Dervish"] = "Горош Дервиш",
["Grizzle"] = "Гриззл",
["Hate'rel"] = "Хейтрел",
["Hedrum the Creeper"] = "Хедрум-ползун",
["High Interrogator Gerstahn"] = "Главный следователь Герстан",
["High Priestess of Thaurissan"] = "Верховная жрица Таурисана",
["Houndmaster Grebmar"] = "Псарь Гребмара",
["Hurley Blackbreath"] = "Харли Темнодув",
["Lord Incendius"] = "Лорд Опалитель",
["Lord Roccor"] = "Владыка Роккор",
["Magmus"] = "Магмус",
["Ok'thor the Breaker"] = "Октор Крушитель",
["Panzor the Invincible"] = "Панцер Непобедимый",
["Phalanx"] = "Фаланга",
["Plugger Spazzring"] = "Стукарь Дурозвон",
["Princess Moira Bronzebeard"] = "Принцесса Мойра Золотая Борода",
["Pyromancer Loregrain"] = "Пиромант Лоргрейн",
["Ribbly Screwspigot"] = "Риббли Винтокран",
["Seeth'rel"] = "Сит-рел",
["The Seven Dwarves"] = "The Seven Dwarves",
["Verek"] = "Верек",
["Vile'rel"] = "Вил-рел",
["Warder Stilgiss"] = "Надсмотрщик Стилгисс",
 
--Blackrock Spire
--Lower
["Bannok Grimaxe"] = "Баннок Мрачный Топор",
["Burning Felguard"] = "Пылающий страж Скверны",
["Crystal Fang"] = "Хрустальный Клык",
["Ghok Bashguud"] = "Гок Башгууд",
["Gizrul the Slavener"] = "Гизрул Поработитель",
["Halycon"] = "Халикон",
["Highlord Omokk"] = "Вождь Омокк",
["Mor Grayhoof"] = "Мор Серое Копыто",
["Mother Smolderweb"] = "Мать Дымная Паутина",
["Overlord Wyrmthalak"] = "Повелитель Вурмталак",
["Quartermaster Zigris"] = "Квартирмейстер Зигрис",
["Shadow Hunter Vosh'gajin"] = "Пленяющая Духов Восгаджин",
["Spirestone Battle Lord"] = "Полководец Острого Камня",
["Spirestone Butcher"] = "Палач Острого Камня",
["Spirestone Lord Magus"] = "Лорд-маг Острого Камня",
["Urok Doomhowl"] = "Аррок Роковой Вой",
["War Master Voone"] = "Воевода Вун",
--Upper
["General Drakkisath"] = "Генерал Драккисат",
["Goraluk Anvilcrack"] = "Горалук Разбитая Наковальня",
["Gyth"] = "Гит",
["Jed Runewatcher"] = "Джед Руногляд",
["Lord Valthalak"] = "Владыка Вальтхалак",
["Pyroguard Emberseer"] = "Пиростраж Углеглаз",
["Solakar Flamewreath"] = "Солакарский огнечервь",
["The Beast"] = "Зверь",
["Warchief Rend Blackhand"] = "Вождь Ренд Черная Рука",
 
--Blackwing Lair
["Broodlord Lashlayer"] = "Предводитель драконидов Разящий Бич",
["Chromaggus"] = "Хроммагус",
["Ebonroc"] = "Эбонрок",
["Firemaw"] = "Огненное Брюхо",
["Flamegor"] = "Пламегор",
["Grethok the Controller"] = "Греток Регулятор",
["Lord Victor Nefarius"] = "Лорд Виктор Нефариус",
["Nefarian"] = "Нефариан",
["Razorgore the Untamed"] = "Бритвосмерт Неукротимый",
["Vaelastrasz the Corrupt"] = "Веластрас Порочный",
 
--Black Temple
["Essence of Anger"] = "Сущность гнева",
["Essence of Desire"] = "Сущность желания",
["Essence of Suffering"] = "Сущность страдания",
["Gathios the Shatterer"] = "Гатиос Раскольщик",
["Gurtogg Bloodboil"] = "Гуртогг Кипящая Кровь",
["High Nethermancer Zerevor"] = "Верховный хаомант Зеревор",
["High Warlord Naj'entus"] = "Великий полководец Наджентус",
["Illidan Stormrage"] = "Иллидан Грозовая Ярость",
["Illidari Council"] = "Совет Иллидари",
["Lady Malande"] = "Леди Маланда",
["Mother Shahraz"] = "Матушка Шахраз",
["Reliquary of Souls"] = "Reliquary of Souls",
["Shade of Akama"] = "Тень Акамы",
["Supremus"] = "Супремус",
["Teron Gorefiend"] = "Терон Жестокосердный",
["The Illidari Council"] = "Совет Иллидари",
["Veras Darkshadow"] = "Верас Черная Тень",
 
--Caverns of Time
--Old Hillsbrad Foothills
["Captain Skarloc"] = "Капитан Скарлок",
["Epoch Hunter"] = "Вечный Охотник",
["Lieutenant Drake"] = "Лейтенант Дрейк",
--The Black Morass
["Aeonus"] = "Эонус",
["Chrono Lord Deja"] = "Повелитель времени Дежа",
["Medivh"] = "Медив",
["Temporus"] = "Темпорус",
 
--Coilfang Reservoir
--Serpentshrine Cavern
["Coilfang Elite"] = "Гвардеец Спиралезуба",
["Coilfang Strider"] = "Странник Спиралезуба",
["Fathom-Lord Karathress"] = "Повелитель глубин Каратресс",
["Hydross the Unstable"] = "Гидросс Нестабильный",
["Lady Vashj"] = "Леди Вайши",
["Leotheras the Blind"] = "Леотерас Слепой",
["Morogrim Tidewalker"] = "Морогрим Приливный Странник",
["Pure Spawn of Hydross"] = "Чистое порождение Гидросса",
["Shadow of Leotheras"] = "Тень Леотераса",
["Tainted Spawn of Hydross"] = "Оскверненное порождение Гидросса",
["The Lurker Below"] = "Житель глубин",
["Tidewalker Lurker"] = "Приливный крадень",
--The Slave Pens
["Mennu the Betrayer"] = "Менну Предатель",
["Quagmirran"] = "Квагмирран",
["Rokmar the Crackler"] = "Рокмар Трескун",
["Ahune"] = "Ахун",
--The Steamvault
["Hydromancer Thespia"] = "Гидромант Феспия",
["Mekgineer Steamrigger"] = "Анжинер Паровая Оснастка",
["Warlord Kalithresh"] = "Предводитель Калитреш",
--The Underbog
["Claw"] = "Коготь",
["Ghaz'an"] = "Газан",
["Hungarfen"] = "Грибсон",
["Overseer Tidewrath"] = "Наблюдатель Гнев Прилива",
["Swamplord Musel'ek"] = "Владыка болот Мусил-ик",
["The Black Stalker"] = "Черная Охотница",
 
--Dire Maul
--Arena
["Mushgog"] = "Мушгог",
["Skarr the Unbreakable"] = "Скарр Непреклонный",
["The Razza"] = "Разза",
--East
["Alzzin the Wildshaper"] = "Алззин Перевертень",
["Hydrospawn"] = "Гидротварь",
["Isalien"] = "Изалиен",
["Lethtendris"] = "Летендрис",
["Pimgib"] = "Пимгиб",
["Pusillin"] = "Пузиллин",
["Zevrim Thornhoof"] = "Зеврим Терновое Копыто",
--North
["Captain Kromcrush"] = "Капитан Кром-Крушитель",
["Cho'Rush the Observer"] = "Чо-Раш Наблюдатель",
["Guard Fengus"] = "Страж Фенгус",
["Guard Mol'dar"] = "Страж Мол'дар",
["Guard Slip'kik"] = "Страж Слип'кик",
["King Gordok"] = "Король Гордок",
["Knot Thimblejack's Cache"] = "Knot Thimblejack's Cache",
["Stomper Kreeg"] = "Топотун Криг",
--West
["Illyanna Ravenoak"] = "Ильянна Вороний Дуб",
["Immol'thar"] = "Иммолтар",
["Lord Hel'nurath"] = "Лорд Хелнурат",
["Magister Kalendris"] = "Магистр Календрис",
["Prince Tortheldrin"] = "Принц Тортелдрин",
["Tendris Warpwood"] = "Тендрис Кривое Дерево",
["Tsu'zee"] = "Цу-зи",
 
--Gnomeregan
["Crowd Pummeler 9-60"] = "Толпогон 9-60",
["Dark Iron Ambassador"] = "Посол Темной Стали",
["Electrocutioner 6000"] = "Электроразитель-6000",
["Grubbis"] = "Грязнюк",
["Mekgineer Thermaplugg"] = "Анжинер Термоштепсель",
["Techbot"] = "Технобот",
["Viscous Fallout"] = "Липкое загрязнение",
 
--Gruul's Lair
["Blindeye the Seer"] = "Слепоглаз Провидец",
["Gruul the Dragonkiller"] = "Груул Драконоубийца",
["High King Maulgar"] = "Король Молгар",
["Kiggler the Crazed"] = "Кигглер Безумный",
["Krosh Firehand"] = "Крош Огненная Рука",
["Olm the Summoner"] = "Олм Созывающий",
 
--Hellfire Citadel
--Hellfire Ramparts
["Nazan"] = "Назан",
["Omor the Unscarred"] = "Омор Неодолимый",
["Vazruden the Herald"] = "Геральд Вазруден",
["Vazruden"] = "Вазруден",
["Watchkeeper Gargolmar"] = "Начальник стражи Гарголмар",
--Magtheridon's Lair
["Hellfire Channeler"] = "Заклинатель Ярого Пламени",
["Magtheridon"] = "Магеридон",
--The Blood Furnace
["Broggok"] = "Броггок",
["Keli'dan the Breaker"] = "Келидан разрушитель",
["The Maker"] = "Созидатель",
--The Shattered Halls
["Blood Guard Porung"] = "Кровавый страж Порунг",
["Grand Warlock Nethekurse"] = "Великий чернокнижник Черное Проклятие",
["Warbringer O'mrogg"] = "Вестник войны Омрогг",
["Warchief Kargath Bladefist"] = "Вождь Каргат Стальная Рука",
 
--Hyjal Summit
["Anetheron"] = "Анетерон",
["Archimonde"] = "Архимонд",
["Azgalor"] = "Азгалор",
["Kaz'rogal"] = "Каз'рогал",
["Rage Winterchill"] = "Лютый Хлад",
 
--Karazhan
["Arcane Watchman"] = "Чародейский стражник",
["Attumen the Huntsman"] = "Аттумен Охотник",
["Chess Event"] = "Шахматы",
["Dorothee"] = "Дороти",
["Dust Covered Chest"] = "Dust Covered Chest",
["Grandmother"] = "Бабушка",
["Hyakiss the Lurker"] = "Хиакисс Тенетник",
["Julianne"] = "Джульенна",
["Kil'rek"] = "Килрек",
["King Llane Piece"] = "King Llane Piece",
["Maiden of Virtue"] = "Пресветлая дева",
["Midnight"] = "Полночь",
["Moroes"] = "Мороуз",
["Netherspite"] = "Хаотиан Злобный",
["Nightbane"] = "Ночная Погибель",
["Prince Malchezaar"] = "Принц Малчезар",
["Restless Skeleton"] = "Недремлющий скелет",
["Roar"] = "Хохотун",
["Rokad the Ravager"] = "Рокад Опустошитель",
["Romulo & Julianne"] = "Ромуло и Джульенна",
["Romulo"] = "Ромуло",
["Shade of Aran"] = "Призрак Арана",
["Shadikith the Glider"] = "Шадикит Скользящий",
["Strawman"] = "Балбес",
["Terestian Illhoof"] = "Терестиан Больное Копыто",
["The Big Bad Wolf"] = "Серый Волк",
["The Crone"] = "Карга",
["The Curator"] = "Хранитель",
["Tinhead"] = "Медноголовый",
["Tito"] = "Тито",
["Warchief Blackhand Piece"] = "Warchief Blackhand Piece",
 
-- Magisters' Terrace
["Kael'thas Sunstrider"] = "Кель Солнечный Скиталец",
["Priestess Delrissa"] = "Жрица Делрисса",
["Selin Fireheart"] = "Селин Огненное Сердце",
["Vexallus"] = "Вексалиус",
 
--Maraudon
["Celebras the Cursed"] = "Келебрас Проклятый",
["Gelk"] = "Джелк",
["Kolk"] = "Колк",
["Landslide"] = "Сель",
["Lord Vyletongue"] = "Лорд Злоязыкий",
["Magra"] = "Магра",
["Maraudos"] = "Мародос",
["Meshlok the Harvester"] = "Мешлок Жнец",
["Noxxion"] = "Ноксион",
["Princess Theradras"] = "Принцесса Терадраса",
["Razorlash"] = "Бритвохлест",
["Rotgrip"] = "Гнилопасть",
["Tinkerer Gizlock"] = "Ремонтник Гизлок",
["Veng"] = "Венг",
 
--Molten Core
["Baron Geddon"] = "Барон Геддон",
["Cache of the Firelord"] = "Cache of the Firelord",
["Garr"] = "Гарр",
["Gehennas"] = "Гееннас",
["Golemagg the Incinerator"] = "Големагг Поджигатель",
["Lucifron"] = "Люцифрон",
["Magmadar"] = "Магмадар",
["Majordomo Executus"] = "Сенешаль Экзекутус",
["Ragnaros"] = "Рагнарос",
["Shazzrah"] = "Шаззрах",
["Sulfuron Harbinger"] = "Сульфуронский мститель",
 
--Naxxramas
["Anub'Rekhan"] = "Ануб'рекхан",
["Deathknight Understudy"] = "Дублер рыцаря Смерти",
["Feugen"] = "Фойген",
["Four Horsemen Chest"] = "Cундук Four Horsemen",
["Gluth"] = "Глут",
["Gothik the Harvester"] = "Готик Жнец",
["Grand Widow Faerlina"] = "Великая вдова Фэрлина",
["Grobbulus"] = "Гроббулюс",
["Heigan the Unclean"] = "Хейган Нечистый",
["Highlord Mograine"] = "Верховный лорд Могрейн",
["Instructor Razuvious"] = "Наставник Разувиос",
["Kel'Thuzad"] = "Кел-Тузед",
["Lady Blaumeux"] = "Леди Бломе",
["Loatheb"] = "Лоатеб",
["Maexxna"] = "Мэксна",
["Noth the Plaguebringer"] = "Нот Чумной",
["Patchwerk"] = "Патчверк",
["Sapphiron"] = "Сафирон",
["Sir Zeliek"] = "Сэр Зелиек",
["Stalagg"] = "Сталагг",
["Thaddius"] = "Таддиус",
["Thane Korth'azz"] = "Тан Кортазз",
["The Four Horsemen"] = "The Four Horsemen",
 
--Onyxia's Lair
["Onyxia"] = "Ониксия",
 
--Ragefire Chasm
["Bazzalan"] = "Баззалан",
["Jergosh the Invoker"] = "Джергош Заклинатель",
["Maur Grimtotem"] = "Маур Мрачный Тотем",
["Taragaman the Hungerer"] = "Тарагаман Алчущий",
 
--Razorfen Downs
["Amnennar the Coldbringer"] = "Амненнар Хладоносец",
["Glutton"] = "Обжора",
["Mordresh Fire Eye"] = "Мордреш Огненный Взор",
["Plaguemaw the Rotting"] = "Чумобрюх Гнилой",
["Ragglesnout"] = "Круглорыл",
["Tuten'kash"] = "Тутен'каш",
 
--Razorfen Kraul
["Agathelos the Raging"] = "Агателос Яростный",
["Blind Hunter"] = "Слепой охотник",
["Charlga Razorflank"] = "Чарлга Острый Бок",
["Death Speaker Jargba"] = "Вестник смерти Джаргба",
["Earthcaller Halmgar"] = "Халмгар Зовущий Землю",
["Overlord Ramtusk"] = "Владыка Бараний Клык",
 
--Ruins of Ahn'Qiraj
["Anubisath Guardian"] = "Анубисат-страж",
["Ayamiss the Hunter"] = "Айамисс Охотник",
["Buru the Gorger"] = "Буру Обжора",
["General Rajaxx"] = "Генерал Раджакс",
["Kurinnaxx"] = "Куриннакс",
["Lieutenant General Andorov"] = "Генерал-лейтенант Андоров",
["Moam"] = "Моам",
["Ossirian the Unscarred"] = "Оссириан Неуязвимый",
 
--Scarlet Monastery
--Armory
["Herod"] = "Ирод",
--Cathedral
["High Inquisitor Fairbanks"] = "Великий инквизитор Фэрбенкс",
["High Inquisitor Whitemane"] = "Великий инквизитор Белогрив",
["Scarlet Commander Mograine"] = "Командир Алого ордена Могрейн",
--Graveyard
["Azshir the Sleepless"] = "Азшир Бессонный",
["Bloodmage Thalnos"] = "Волшебник Крови Талнос",
["Fallen Champion"] = "Павший защитник",
["Interrogator Vishas"] = "Следователь Вишас",
["Ironspine"] = "Стальной Хребет",
["Headless Horseman"] = "Всадник без головы",
--Library
["Arcanist Doan"] = "Чародей Доан",
["Houndmaster Loksey"] = "Псарь Локси",
 
--Scholomance
["Blood Steward of Kirtonos"] = "Кровавая прислужница Киртоноса",
["Darkmaster Gandling"] = "Темный магистр Гандлинг",
["Death Knight Darkreaver"] = "Темный Губитель, рыцарь Смерти",
["Doctor Theolen Krastinov"] = "Доктор Теолен Крастинов",
["Instructor Malicia"] = "Наставник Малиция",
["Jandice Barov"] = "Джандис Бароу",
["Kirtonos the Herald"] = "Киртонос Глашатай",
["Kormok"] = "Кормок",
["Lady Illucia Barov"] = "Леди Иллюция Бароу",
["Lord Alexei Barov"] = "Лорд Алексей Баров",
["Lorekeeper Polkelt"] = "Хранитель мудрости Полкелт",
["Marduk Blackpool"] = "Мардук Чернопруд",
["Ras Frostwhisper"] = "Рас Снегошепот",
["Rattlegore"] = "Громоклин",
["The Ravenian"] = "Равениан",
["Vectus"] = "Вектус",
 
--Shadowfang Keep
["Archmage Arugal"] = "Верховный маг Аругал",
["Arugal's Voidwalker"] = "Демон Хаоса Аругала",
["Baron Silverlaine"] = "Барон Сильверлейн",
["Commander Springvale"] = "Командир Ручьедол",
["Deathsworn Captain"] = "Капитан Служителей Смерти",
["Fenrus the Devourer"] = "Фенрус Пожиратель",
["Odo the Blindwatcher"] = "Одо Слепостраж",
["Razorclaw the Butcher"] = "Мясник Острокоготь",
["Wolf Master Nandos"] = "Волчарь Нандос",
 
--Stratholme
["Archivist Galford"] = "Архивариус Гэлфорд",
["Balnazzar"] = "Бальназар",
["Baron Rivendare"] = "Барон Райвендер",
["Baroness Anastari"] = "Баронесса Анастари",
["Black Guard Swordsmith"] = "Оружейник Черной Гвардии",
["Cannon Master Willey"] = "Канонир мастер Уилли",
["Crimson Hammersmith"] = "Багровый Молотобоец",
["Fras Siabi"] = "Фрас Сиаби",
["Hearthsinger Forresten"] = "Хартзингер Форрестен",
["Magistrate Barthilas"] = "Судья Бартилас",
["Maleki the Pallid"] = "Малекай Бледный",
["Nerub'enkan"] = "Неруб-энкан",
["Postmaster Malown"] = "Почтальон Мэлоун",
["Ramstein the Gorger"] = "Рамштейна Яростного",
["Skul"] = "Череп",
["Stonespine"] = "Каменный Гребень",
["The Unforgiven"] = "Непрощенный",
["Timmy the Cruel"] = "Тимми Жестокий",
 
--Sunwell Plateau
["Kalecgos"] = "Калецгос",
["Sathrovarr the Corruptor"] = "Сатроварр Осквернитель",
["Brutallus"] = "Бруталл",
["Felmyst"] = "Сквернотуман",
["Kil'jaeden"] = "Kil'jaeden",
["M'uru"] = "М'ару",
["Entropius"] = "Энтропий",
["The Eredar Twins"] = "The Eredar Twins",
["Lady Sacrolash"] = "Lady Sacrolash",
["Grand Warlock Alythess"] = "Grand Warlock Alythess",
 
--Tempest Keep
--The Arcatraz
["Dalliah the Doomsayer"] = "Далия Глашатай Судьбы",
["Harbinger Skyriss"] = "Вестник Скайрис",
["Warden Mellichar"] = "Страж Мелличар",
["Wrath-Scryer Soccothrates"] = "Демон-провидец Соккотрат",
["Zereketh the Unbound"] = "Зерекет Освобожденный",
--The Botanica
["Commander Sarannis"] = "Командир Сараннис",
["High Botanist Freywinn"] = "Старший ботаник Фрейвин",
["Laj"] = "Ладж",
["Thorngrin the Tender"] = "Торнгрин Нежный",
["Warp Splinter"] = "Узлодревень",
--The Eye
["Al'ar"] = "Алар",
["Cosmic Infuser"] = "Космический даритель",
["Devastation"] = "Разоритель",
["Grand Astromancer Capernian"] = "Старший астромант Каперниан",
["High Astromancer Solarian"] = "Верховный астромант Солариан",
["Infinity Blades"] = "Клинки Бесконечности",
["Kael'thas Sunstrider"] = "Кель Солнечный Скиталец",
["Lord Sanguinar"] = "Лорд Сангвинар",
["Master Engineer Telonicus"] = "Старший инженер Телоникус",
["Netherstrand Longbow"] = "Длинный лук Берега Хаоса",
["Phaseshift Bulwark"] = "Фазовый колет",
["Solarium Agent"] = "Агент Солнечной террасы",
["Solarium Priest"] = "Жрец Солариана",
["Staff of Disintegration"] = "Посох Распыления",
["Thaladred the Darkener"] = "Таладред Затемнитель",
["Void Reaver"] = "Пустотный разбойник",
["Warp Slicer"] = "Искореженная ломтерезка",
--The Mechanar
["Gatewatcher Gyro-Kill"] = "Страж ворот Смертекрут",
["Gatewatcher Iron-Hand"] = "Страж ворот Железнорук",
["Mechano-Lord Capacitus"] = "Механический лорд Способие",
["Nethermancer Sepethrea"] = "Хаомант Сепетея",
["Pathaleon the Calculator"] = "Паталеон Вычислитель",
 
--The Deadmines
["Brainwashed Noble"] = "Обманутый дворянин",
["Captain Greenskin"] = "Капитан Зеленая Шкура",
["Cookie"] = "Пышка",
["Edwin VanCleef"] = "Эдвин Ван Клиф",
["Foreman Thistlenettle"] = "Старшина Чертополохх",
["Gilnid"] = "Гилнид",
["Marisa du'Paige"] = "Мариса дю Пэж",
["Miner Johnson"] = "Шахтер Джонсон",
["Mr. Smite"] = "Ударр",
["Rhahk'Zor"] = "Рак'Зор",
["Sneed"] = "Снид",
["Sneed's Shredder"] = "Резак Снида",
 
--The Stockade
["Bazil Thredd"] = "Базиль Тредд",
["Bruegal Ironknuckle"] = "Бругал Железный Шарнир",
["Dextren Ward"] = "Декстрен Вард",
["Hamhock"] = "Хэмхок",
["Kam Deepfury"] = "Кэм Темная Ярость",
["Targorr the Dread"] = "Таргорр Ужасный",
 
--The Temple of Atal'Hakkar
["Atal'alarion"] = "Атал'аларион",
["Avatar of Hakkar"] = "Аватара Хаккара",
["Dreamscythe"] = "Жнец Снов",
["Gasher"] = "Гашер",
["Hazzas"] = "Хаззас",
["Hukku"] = "Хукку",
["Jade"] = "Нефрит",
["Jammal'an the Prophet"] = "Джаммалан Пророк",
["Kazkaz the Unholy"] = "Казказ Нечистый",
["Loro"] = "Лоро",
["Mijan"] = "Миджан",
["Morphaz"] = "Морфаз",
["Ogom the Wretched"] = "Огом Презренный",
["Shade of Eranikus"] = "Тень Эраникуса",
["Veyzhak the Cannibal"] = "Вейжак Каннибал",
["Weaver"] = "Ткачик",
["Zekkis"] = "Зеккис",
["Zolo"] = "Золо",
["Zul'Lor"] = "Зул-Лор",
 
--Uldaman
["Ancient Stone Keeper"] = "Древний каменный хранитель",
["Archaedas"] = "Архедас",
["Baelog"] = "Бэлог",
["Digmaster Shovelphlange"] = "Мастер Лопаторукий",
["Galgann Firehammer"] = "Галганн Огненный Молот",
["Grimlok"] = "Гримлок",
["Ironaya"] = "Железнайя",
["Obsidian Sentinel"] = "Обсидиановый страж",
["Revelosh"] = "Ревелош",
 
--Wailing Caverns
["Boahn"] = "Боан",
["Deviate Faerie Dragon"] = "Искаженный лесной дракончик",
["Kresh"] = "Криг",
["Lady Anacondra"] = "Леди Анакондра",
["Lord Cobrahn"] = "Лорд Кобран",
["Lord Pythas"] = "Лорд Пифас",
["Lord Serpentis"] = "Лорд Серпентис",
["Mad Magglish"] = "Безумный Магглиш",
["Mutanus the Devourer"] = "Мутанус-пожиратель",
["Skum"] = "Шкам",
["Trigore the Lasher"] = "Тригор Хлестун",
["Verdan the Everliving"] = "Вердан Бессмертный",
 
--World Bosses
["Avalanchion"] = "Лавинион",
["Azuregos"] = "Азурегос",
["Baron Charr"] = "Барон Рыбс",
["Baron Kazum"] = "Барон Казум",
["Doom Lord Kazzak"] = "Каззак Владыка Рока",
["Doomwalker"] = "Владыка Рока",
["Emeriss"] = "Эмерисс",
["High Marshal Whirlaxis"] = "Маршал Кольцекрут",
["Lethon"] = "Летон",
["Lord Skwol"] = "Лорд Сквол",
["Prince Skaldrenox"] = "Принц Скальдренокс",
["Princess Tempestria"] = "Принцесса Бурилла",
["Taerar"] = "Таэрар",
["The Windreaver"] = "Ветробой",
["Ysondre"] = "Исондра",
 
--Zul'Aman
["Akil'zon"] = "Акилзон",
["Halazzi"] = "Халаззи",
["Jan'alai"] = "Джаналайя",
["Malacrass"] = "Malacrass",
["Nalorakk"] = "Налоракк",
["Zul'jin"] = "Зулджин",
["Hex Lord Malacrass"] = "Повелитель проклятий Малакрасс",
 
--Zul'Farrak
["Antu'sul"] = "Анту'сул",
["Chief Ukorz Sandscalp"] = "Вождь Укорз Песчаная Проплешина",
["Dustwraith"] = "Пыльный Призрак",
["Gahz'rilla"] = "Газрилла",
["Hydromancer Velratha"] = "Гидромант Велрата",
["Murta Grimgut"] = "Мурта Мрачное Брюхо",
["Nekrum Gutchewer"] = "Некрум Брюхогрыз",
["Oro Eyegouge"] = "Оро Вырвиглаз",
["Ruuzlu"] = "Руузлу",
["Sandarr Dunereaver"] = "Сандарр Барханный Разбойник",
["Sandfury Executioner"] = "Палач из клана Песчаной Бури",
["Sergeant Bly"] = "Сержант Блай",
["Shadowpriest Sezz'ziz"] = "Сумеречный жрец Сезз'зиз",
["Theka the Martyr"] = "Тека Мученик",
["Witch Doctor Zum'rah"] = "Знахарь Зум'рах",
["Zerillis"] = "Зериллис",
["Zul'Farrak Dead Hero"] = "Мертвый Герой Зул'Фаррака",
 
--Zul'Gurub
["Bloodlord Mandokir"] = "Мэндокир Повелитель Крови",
["Gahz'ranka"] = "Газранка",
["Gri'lek"] = "Грилек",
["Hakkar"] = "Хаккар",
["Hazza'rah"] = "Хазза'рах",
["High Priest Thekal"] = "Верховный жрец Текал",
["High Priest Venoxis"] = "Верховный жрец Веноксис",
["High Priestess Arlokk"] = "Верховная жрица Арлокк",
["High Priestess Jeklik"] = "Верховная жрица Джеклик",
["High Priestess Mar'li"] = "Верховная жрица Мар'ли",
["Jin'do the Hexxer"] = "Джин'до Наводящий Порчу",
["Renataki"] = "Ренатаки",
["Wushoolay"] = "Вушулай",
 
--Ring of Blood (where? an instnace? should be in other file?)
["Brokentoe"] = "Пальцехруст",
["Mogor"] = "Могор",
["Murkblood Twin"] = "Близнец Темной Крови",
["Murkblood Twins"] = "Близнецы Темной Крови",
["Rokdar the Sundered Lord"] = "Рокдар Покинутый Лорд",
["Skra'gath"] = "Скрагат",
["The Blue Brothers"] = "The Blue Brothers",
["Warmaul Champion"] = "Защитник Молота Боя",
}
else
error(("%s: Locale %q not supported"):format(MAJOR_VERSION, GAME_LOCALE))
end
trunk/MorgDKP/libs/Dewdrop-2.0/Dewdrop-2.0.lua
97,6 → 97,17
KEY_BUTTON2 = "鼠标右键"
DISABLED = "禁用"
DEFAULT_CONFIRM_MESSAGE = "是否执行'%s'?"
elseif GetLocale() == "ruRU" then
CLOSE = "Закрыть"
CLOSE_DESC = "Закрыть меню."
VALIDATION_ERROR = "Ошибка проверки данных."
USAGE_TOOLTIP = "Используйте: %s."
RANGE_TOOLTIP = "Используйте колесо мыши для прокрутки ползунка."
RESET_KEYBINDING_DESC = "Нажмите клавишу Escape для очистки клавиши."
KEY_BUTTON1 = "ЛКМ"
KEY_BUTTON2 = "ПКМ"
DISABLED = "Отключено"
DEFAULT_CONFIRM_MESSAGE = "Вы уверены что вы хотите выполнять `%s'?"
end
 
Dewdrop.KEY_BUTTON1 = KEY_BUTTON1
trunk/MorgDKP/libs/LibBabble-Zone-3.0/LibBabble-Zone-3.0.lua
1883,6 → 1883,204
["Tirisfal"] = "Tirisfal",
["Sunken Temple"] = "El Templo de Sunken",
}
elseif GAME_LOCALE == "ruRU" then
lib:SetCurrentTranslations {
["Azeroth"] = "Азерот",
["Eastern Kingdoms"] = "Восточные королевства",
["Kalimdor"] = "Калимдор",
["Outland"] = "Запределье",
["Cosmic map"] = "Карта Вселенной",
 
["Ahn'Qiraj"] = "Ан'Кираж",
["Alterac Mountains"] = "Альтеракские горы",
["Alterac Valley"] = "Альтеракская долина",
["Arathi Basin"] = "Низина Арати",
["Arathi Highlands"] = "Нагорье Арати",
["Ashenvale"] = "Ясеневый лес",
["Auberdine"] = "Аубердин",
["Azshara"] = "Азшара",
["Badlands"] = "Бесплодные земли",
["The Barrens"] = "Степи",
["Blackfathom Deeps"] = "Непроглядная Пучина",
["Blackrock Depths"] = "Глубины Черной Горы",
["Blackrock Mountain"] = "Черная гора",
["Blackrock Spire"] = "Вершина Черной горы",
["Blackwing Lair"] = "Логово Крыла Тьмы",
["Blasted Lands"] = "Выжженные земли",
["Booty Bay"] = "Пиратская Бухта",
["Burning Steppes"] = "Пылающие степи",
["Darkshore"] = "Темные берега",
["Darnassus"] = "Дарнасс",
["The Deadmines"] = "Мертвые копи",
["Deadwind Pass"] = "Перевал Мертвого Ветра",
["Deeprun Tram"] = "Подземный поезд",
["Desolace"] = "Пустоши",
["Dire Maul"] = "Забытый Город",
["Dire Maul (East)"] = "Забытый Город: Восток",
["Dire Maul (West)"] = "Забытый Город: Запад",
["Dire Maul (North)"] = "Забытый Город: Север",
["Dun Morogh"] = "Дун Морог",
["Durotar"] = "Дуротар",
["Duskwood"] = "Сумеречный лес",
["Dustwallow Marsh"] = "Пылевые топи",
["Eastern Plaguelands"] = "Восточное Лихоземье",
["Elwynn Forest"] = "Элвиннский лес",
["Everlook"] = "Круговзор",
["Felwood"] = "Оскверненный лес",
["Feralas"] = "Фералас",
["The Forbidding Sea"] = "Зловещее море",
["Gadgetzan"] = "Прибамбасск",
["Gates of Ahn'Qiraj"] = "Врата Ан'Киража",
["Gnomeregan"] = "Гномреган",
["The Great Sea"] = "Великое море",
["Grom'gol Base Camp"] = "Лагерь Гром'гол",
["Hall of Legends"] = "Зал Легенд",
["Hillsbrad Foothills"] = "Предгорья Хилсбрада",
["The Hinterlands"] = "Внутренние земли",
["Hyjal"] = "Хиджал",
["Hyjal Summit"] = "Вершина Хиджала",
["Ironforge"] = "Стальгорн",
["Loch Modan"] = "Лок Модан",
["Lower Blackrock Spire"] = "Нижний Ярус Черной горы",
["Maraudon"] = "Мародон",
["Menethil Harbor"] = "Гавань Менетил",
["Molten Core"] = "Огненные Недра",
["Moonglade"] = "Лунная поляна",
["Mulgore"] = "Мулгор",
["Naxxramas"] = "Наксрамас",
["Onyxia's Lair"] = "Логово Ониксии",
["Orgrimmar"] = "Оргриммар",
["Ratchet"] = "Кабестан",
["Ragefire Chasm"] = "Огненная пропасть",
["Razorfen Downs"] = "Курганы Иглошкурых",
["Razorfen Kraul"] = "Лабиринты Иглошкурых",
["Redridge Mountains"] = "Красногорье",
["Ruins of Ahn'Qiraj"] = "Руины Ан'Киража",
["Scarlet Monastery"] = "Монастырь Алого Ордена",
["Scholomance"] = "Некроситет",
["Searing Gorge"] = "Тлеющее ущелье",
["Shadowfang Keep"] = "Крепость Темного Клыка",
["Silithus"] = "Силитус",
["Silverpine Forest"] = "Серебряный бор",
["The Stockade"] = "Тюрьма",
["Stonard"] = "Каменор",
["Stonetalon Mountains"] = "Когтистые горы",
["Stormwind City"] = "Штормград",
["Stormwind"] = "Штормград",
["Stranglethorn Vale"] = "Тернистая долина",
["Stratholme"] = "Стратхольм",
["Swamp of Sorrows"] = "Болото Печали",
["Tanaris"] = "Танарис",
["Teldrassil"] = "Тельдрассил",
["Temple of Ahn'Qiraj"] = "Ан'Кираж",
["The Temple of Atal'Hakkar"] = "Храм Атал'Хаккара",
["Theramore Isle"] = "Остров Терамор",
["Thousand Needles"] = "Тысяча Игл",
["Thunder Bluff"] = "Громовой Утес",
["Tirisfal Glades"] = "Тирисфальские леса",
["Uldaman"] = "Ульдаман",
["Un'Goro Crater"] = "Кратер Ун'Горо",
["Undercity"] = "Подгород",
["Upper Blackrock Spire"] = "Верхний Ярус Черной горы",
["Wailing Caverns"] = "Пещеры Стенаний",
["Warsong Gulch"] = "Ущелье Песни Войны",
["Western Plaguelands"] = "Западное Лихоземье",
["Westfall"] = "Западный Край",
["Wetlands"] = "Болотина",
["Winterspring"] = "Зимние Ключи",
["Zul'Farrak"] = "Зул'Фаррак",
["Zul'Gurub"] = "Зул'Гуруб",
 
["Champions' Hall"] = "Зал Защитника",
["Hall of Champions"] = "Hall of Champions",
["Blade's Edge Arena"] = "Арена Острогорья",
["Nagrand Arena"] = "Арена Награнда",
["Ruins of Lordaeron"] = "Руины Лордерона",
["Twisting Nether"] = "Круговерть Пустоты",
["The Veiled Sea"] = "Сокрытое Море",
["The North Sea"] = "Северное море",
["Armory"] = "Оружейная",
["Library"] = "Библиотека",
["Cathedral"] = "Собор",
["Graveyard"] = "Кладбище",
 
-- Burning Crusade
 
-- Subzones used for displaying instances.
["Plaguewood"] = "Проклятый лес",
["Hellfire Citadel"] = "Цитадель Адского Пламени",
["Auchindoun"] = "Аукиндон",
["The Bone Wastes"] = "Костяные пустоши",
["Ring of Observance"] = "Ритуальный Круг",
["Coilfang Reservoir"] = "Резервуар Кривого Клыка",
["Amani Pass"] = "Перевал Амани",
 
["Azuremyst Isle"] = "Остров Лазурной Дымки",
["Bloodmyst Isle"] = "Остров Кровавой Дымки",
["Eversong Woods"] = "Леса Вечной Песни",
["Ghostlands"] = "Призрачные земли",
["The Exodar"] = "Экзодар",
["Silvermoon City"] = "Луносвет",
["Shadowmoon Valley"] = "Долина Призрачной Луны",
["Black Temple"] = "Черный храм",
["Terokkar Forest"] = "Лес Тероккар",
["Auchenai Crypts"] = "Аукенайские гробницы",
["Mana-Tombs"] = "Гробницы Маны",
["Shadow Labyrinth"] = "Темный Лабиринт",
["Sethekk Halls"] = "Сетеккские залы",
["Hellfire Peninsula"] = "Полуостров Адского Пламени",
["The Dark Portal"] = "Темный портал",
["Hellfire Ramparts"] = "Бастионы Адского Пламени",
["The Blood Furnace"] = "Кузня Крови",
["The Shattered Halls"] = "Разрушенные залы",
["Magtheridon's Lair"] = "Логово Магтеридона",
["Nagrand"] = "Награнд",
["Zangarmarsh"] = "Зангартопь",
["The Slave Pens"] = "Узилище",
["The Underbog"] = "Нижетопь",
["The Steamvault"] = "Паровое Подземелье",
["Serpentshrine Cavern"] = "Змеиное святилище",
["Blade's Edge Mountains"] = "Острогорье",
["Gruul's Lair"] = "Логово Груула",
["Netherstorm"] = "Пустоверть",
["Tempest Keep"] = "Крепость Бурь",
["The Mechanar"] = "Механар",
["The Botanica"] = "Ботаника",
["The Arcatraz"] = "Аркатрац",
["The Eye"] = "Око",
["Eye of the Storm"] = "Око Бури",
["Shattrath City"] = "Шаттрат",
["Shattrath"] = "Шаттрат",
["Karazhan"] = "Каражан",
["Caverns of Time"] = "Пещеры Времени",
["Old Hillsbrad Foothills"] = "Старые предгорья Хилсбрада",
["The Black Morass"] = "Черные топи",
["Night Elf Village"] = "Деревня ночных эльфов",
["Horde Encampment"] = "Стоянка Орды",
["Alliance Base"] = "База Альянса",
["Zul'Aman"] = "Зул'Аман",
["Quel'thalas"] = "Кель'Талас",
["Isle of Quel'Danas"] = "Остров Кель'Данас",
["Sunwell Plateau"] = "Плато Солнечного Колодца",
["Magisters' Terrace"] = "Терраса Магистров",
 
-- Blade's Edge Plateau
["Forge Camp: Terror"] = "Лагерь Легиона: Ужас",
["Vortex Pinnacle"] = "Нагорье Смерчей",
["Rivendark's Perch"] = "Гнездо Чернокрыла",
["Ogri'la"] = "Огри'ла",
["Obsidia's Perch"] = "Гнездо Обсидии",
["Skyguard Outpost"] = "Застава Стражи Небес",
["Shartuul's Transporter"] = "Транспортер Шартуула",
["Forge Camp: Wrath"] = "Лагерь Легиона: Гнев",
["Bash'ir Landing"] = "Лагерь Баш'ира",
["Crystal Spine"] = "Хрустальное поле",
["Insidion's Perch"] = "Гнездо Инсидиона",
["Furywing's Perch"] = "Гнездовье Ярокрыла",
 
["Tirisfal"] = "Тирисфальские леса",
["Sunken Temple"] = "Затонувший храм",
}
else
error(("%s: Locale %q not supported"):format(MAJOR_VERSION, GAME_LOCALE))
end
trunk/MorgDKP/libs/Tablet-2.0/Tablet-2.0.lua
116,6 → 116,20
COLOR_DESC = "Establece el color de fondo"
LOCK = "Bloquear"
LOCK_DESC = "Bloquea el tooltip en su posici\195\179n actual. Clic+Alt para el men\195\186 y arrastra+Alt para arrastrarlo cuando est\195\161 bloqueado"
elseif GetLocale() == "ruRU" then
SCROLL_UP = "Прокрутка вверх"
SCROLL_DOWN = "Прокрутка вниз"
HINT = "Совет"
DETACH = "Отделить"
DETACH_DESC = "Отделить планшет от его источника."
SIZE = "Размер"
SIZE_DESC = "Масштаб планшета."
CLOSE_MENU = "Закрыть меню"
CLOSE_MENU_DESC = "Закрыть меню."
COLOR = "Цвет фона"
COLOR_DESC = "Установить цвет фона."
LOCK = "Зафиксировать"
LOCK_DESC = "Зафиксировать планшет в его текущем позиции. Alt+ПКМ для меню или Alt+перетаскивание для перетаскивания когда планшет зафиксирован."
end
 
local start = GetTime()
trunk/MorgDKP/libs/Babble-Class-2.2/Babble-Class-2.2.lua
182,6 → 182,28
}
end)
 
BabbleClass:RegisterTranslations("ruRU", function()
return {
["Warlock"] = "Чернокнижник",
["Warrior"] = "Воин",
["Hunter"] = "Охотник",
["Mage"] = "Маг",
["Priest"] = "Жрец",
["Druid"] = "Друид",
["Paladin"] = "Паладин",
["Shaman"] = "Шаман",
["Rogue"] = "Разбойник",
 
["WARLOCK"] = "Чернокнижница",
["WARRIOR"] = "Воительница",
["HUNTER"] = "Охотница",
["MAGE"] = "Волшебница",
["PRIEST"] = "Жрица",
["SHAMAN"] = "Шаманка",
["ROGUE"] = "Разбойница",
}
end)
 
BabbleClass:Debug()
BabbleClass:SetStrictness(true)
 
trunk/MorgDKP/libs/FuBarPlugin-2.0/FuBarPlugin-2.0.lua
197,6 → 197,30
OTHER = "Otros"
CLOSE = "Cerrar"
CLOSE_DESC = "Cierra el men\195\186."
elseif GetLocale() == "ruRU" then
SHOW_ICON = "Показ иконки"
SHOW_ICON_DESC = "Показывать иконку плагина на панели."
SHOW_TEXT = "Показ текста"
SHOW_TEXT_DESC = "Показывать текст плагина на панели."
SHOW_COLORED_TEXT = "Показ цветового текста"
SHOW_COLORED_TEXT_DESC = "Позволить плагину использовать его цвета в тексте."
DETACH_TOOLTIP = "Отделить подсказку"
DETACH_TOOLTIP_DESC = "Отделить всплывающую подсказку от панели."
LOCK_TOOLTIP = "Закрепить подсказку"
LOCK_TOOLTIP_DESC = "Закрепить позицию всплывающей подсказки. Когда всплывающая подсказка закреплена, используйте Alt для отображения ее у мыши."
POSITION = "Позиция"
POSITION_DESC = "Позиция плагина на панели."
POSITION_LEFT = "Слева"
POSITION_RIGHT = "Справа"
POSITION_CENTER = "По центру"
ATTACH_TO_MINIMAP = "Закрепить у мини-карты"
ATTACH_TO_MINIMAP_DESC = "Закрепить плагин у мини-карты вместо панели."
HIDE_FUBAR_PLUGIN = "Скрыть плагин"
HIDE_FUBAR_PLUGIN_CMD = "Скрыть"
HIDE_FUBAR_PLUGIN_DESC = "Скрыть плагин с панели или мини-карты, но оставить аддон в рабочем состоянии."
OTHER = "Другое"
CLOSE = "Закрыть"
CLOSE_DESC = "Закрыть меню."
end
 
local AceOO = AceLibrary("AceOO-2.0")