diff Editor.lua @ 305:0211bcdfab70 stable

Merge 1.1 beta 12 to stable
author Flick
date Wed, 14 Nov 2012 16:47:27 -0800
parents 6fbb55e5c624
children
line wrap: on
line diff
--- a/Editor.lua	Fri Aug 05 16:28:13 2011 -0700
+++ b/Editor.lua	Wed Nov 14 16:47:27 2012 -0800
@@ -494,12 +494,12 @@
         set   = "SetNumPages",
       },
       mindcontrol = {
-        name = L["Mind Control Support"],
-        desc = L["When possessing a target (e.g. via Mind Control), map the first 12 buttons of this bar to the possessed target's actions."],
+        name = L["Override Button Support"],
+        desc = L["Override the first 12 buttons on this bar with abilities gained from certain game quests and events."],
         order = 2,
         type = "toggle",
-        set = "SetMindControl",
-        get = "GetMindControl",
+        set = "SetMindControl", -- called 'mind control' for legacy reasons
+        get = "GetMindControl", -- called 'mind control' for legacy reasons
       },
       vehicle = {
         name = L["Vehicle Support"],
@@ -1037,8 +1037,9 @@
     { "pet",     { {pet = L["With Pet"]}, {nopet = L["Without Pet"]} } },
     { "target",  { {harm = L["Hostile Target"]}, {help = L["Friendly Target"]}, {notarget = L["No Target"]} } },
     { "focus",   { {focusharm = L["Hostile Focus"]}, {focushelp = L["Friendly Focus"]}, {nofocus = L["No Focus"]} } },
-    { "possess", { {possess = L["Mind Control"]} } },
     { "vehicle", { {vehicle = L["In a Vehicle"]} } },
+    { "possess", { {possess = L["Ability Override"]} } },
+    { "extrabar",{ {extrabar = L["Has Special Action"]} } },
     { "group",   { {raid = L["Raid"]}, {party = L["Party"]}, {solo = L["Solo"]} } },
     { "combat",  { {combat = L["In Combat"]}, {nocombat = L["Out of Combat"]} } },
   }