diff locale/enUS.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/locale/enUS.lua	Fri Aug 05 16:28:13 2011 -0700
+++ b/locale/enUS.lua	Wed Nov 14 16:47:27 2012 -0800
@@ -103,8 +103,8 @@
 "ID List",
 "Specify a comma-separated list of IDs for each button in the bar (in order). Separate multiple pages with semicolons (;)",
 "Invalid action ID list string",
-"Mind Control Support",
-"When possessing a target (e.g. via Mind Control), map the first 12 buttons of this bar to the possessed target's actions.",
+"Override Button Support",
+"Override the first 12 buttons on this bar with abilities gained from certain game quests and events.",
 "Vehicle Support",
 "When on a vehicle, map the first 6 buttons of this bar to the vehicle actions. The vehicle-exit button is mapped to the 7th button. Pitch controls are not supported.",
 "Show Page #",
@@ -133,7 +133,8 @@
 "Hostile Focus",
 "Friendly Focus",
 "No Focus",
-"Mind Control",
+"Ability Override",
+"Has Special Action",
 "In a Vehicle",
 "Raid",
 "Party",
@@ -233,10 +234,6 @@
 "State",
 "State Scale Override",
 
--- MultiCastButton.lua
-"Totem Bar",
-"All %s buttons are in use for this bar, cannot create any more buttons",
-
 -- PetActionButton.lua
 "Pet Action Bar",
 "Pet action ID range is 1-10",
@@ -247,6 +244,9 @@
 -- VehicleExitButton.lua
 "Exit Vehicle Floater",
 
+-- ExtraActionButton.lua
+"Special Action Button",
+
 }) do
   L[s] = true
 end