changeset 6:43f45e032db8

Found a bug in the Combat binding lock down code, which was caused by the renames. Also renamed some of the locale strings in Localisation.lua
author madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
date Tue, 12 Jun 2012 12:56:57 +0000
parents 8428fa7cf0e4
children 4580ffe9b9a5
files CyborgMMO7.lua Localisation.lua
diffstat 2 files changed, 34 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/CyborgMMO7.lua	Tue May 29 10:26:40 2012 +0000
+++ b/CyborgMMO7.lua	Tue Jun 12 12:56:57 2012 +0000
@@ -118,7 +118,7 @@
 		CyborgMMO_EnteredWorld = true;
     elseif(event == "PLAYER_ENTER_COMBAT") then
 		msg("PLAYER_ENTER_COMBAT");
-		Close();
+		CyborgMMO_Close();
 	elseif(event == nil) then
 		msg("Event is nil");
 	else
--- a/Localisation.lua	Tue May 29 10:26:40 2012 +0000
+++ b/Localisation.lua	Tue Jun 12 12:56:57 2012 +0000
@@ -382,58 +382,58 @@
 		CyborgMMO_OptionPageRebindTitle="MMO Keybinds:-",
 		CyborgMMO_ToolTipLine1="Warning! If your spell assignments are not working you may not have the correct profile assigned.",
 		CyborgMMO_ToolTipLine2="To assign the correct profile:",
-		CyborgMMO_ToolTipLine3="\t1) Click on the M.M.O.7 tray icon in the Windows system tray. ",
-		CyborgMMO_ToolTipLine4="\t2) Locate the profile called MMO7_WoWAddon and left click it. ",
-		CyborgMMO_ToolTipLine5="\t3) When the M.M.O.7 tray icon turns green, the profile is active. ",
+		CyborgMMO_ToolTipLine3="1) Click on the M.M.O.7 tray icon in the Windows system tray. ",
+		CyborgMMO_ToolTipLine4="2) Locate the profile called MMO7_WoWAddon and left click it. ",
+		CyborgMMO_ToolTipLine5="3) When the M.M.O.7 tray icon turns green, the profile is active. ",
 		CyborgMMO_ToolTipLine6="Once the profile is active, reload WoW and press the Mode button on the M.M.O.7 to synchronise the device."
 	},
 	["frFR"] = {
-		CyborgButtonTitle="Bouton Cyborg",
-		MiniMapButtonTitle="Bouton minimap",
-		OptionPageTitle="Cyborg MMO7",
+		CyborgMMO_OptionPageCyborgButtonTitle="Bouton Cyborg",
+		CyborgMMO_OptionPageMiniMapButtonTitle="Bouton minimap",
+		CyborgMMO_OptionPageTitle="Cyborg MMO7",
 		CyborgMMO_OptionPageSetDefaults="Par défaut",
-		CyborgSizeSliderTitle="Dimension de la tête Cyborg",
-		PluginSizeSliderTitle="Dimension de la fenêtre d'interface"
+		CyborgMMO_OptionPageCyborgSizeSliderTitle="Dimension de la tête Cyborg",
+		CyborgMMO_OptionPagePluginSizeSliderTitle="Dimension de la fenêtre d'interface"
 	},
 	["deDE"] = {
-		CyborgButtonTitle="Cyborg-Taste",
-		MiniMapButtonTitle="MiniMap-Taste",
-		OptionPageTitle="Cyborg MMO7",
+		CyborgMMO_OptionPageCyborgButtonTitle="Cyborg-Taste",
+		CyborgMMO_OptionPageMiniMapButtonTitle="MiniMap-Taste",
+		CyborgMMO_OptionPageTitle="Cyborg MMO7",
 		CyborgMMO_OptionPageSetDefaults="Standard",
-		CyborgSizeSliderTitle="Größe des Cyborg-Kopfes",
-		PluginSizeSliderTitle="Größe des Schnittstellenfensters"
+		CyborgMMO_OptionPageCyborgSizeSliderTitle="Größe des Cyborg-Kopfes",
+		CyborgMMO_OptionPagePluginSizeSliderTitle="Größe des Schnittstellenfensters"
 	},
 	["zhCN"] = {
-		CyborgButtonTitle="Cyborg ??",
-		MiniMapButtonTitle="“????”??",
-		OptionPageTitle="Cyborg MMO7",
+		CyborgMMO_OptionPageCyborgButtonTitle="Cyborg ??",
+		CyborgMMO_OptionPageMiniMapButtonTitle="“????”??",
+		CyborgMMO_OptionPageTitle="Cyborg MMO7",
 		CyborgMMO_OptionPageSetDefaults="??",
-		CyborgSizeSliderTitle="Cyborg ????",
-		PluginSizeSliderTitle="??????"
+		CyborgMMO_OptionPageCyborgSizeSliderTitle="Cyborg ????",
+		CyborgMMO_OptionPagePluginSizeSliderTitle="??????"
 	},
 	["zhTW"] = {
-		CyborgButtonTitle="Cyborg ??",
-		MiniMapButtonTitle="MiniMap ??",
-		OptionPageTitle="Cyborg MMO7",
+		CyborgMMO_OptionPageCyborgButtonTitle="Cyborg ??",
+		CyborgMMO_OptionPageMiniMapButtonTitle="MiniMap ??",
+		CyborgMMO_OptionPageTitle="Cyborg MMO7",
 		CyborgMMO_OptionPageSetDefaults="??",
-		CyborgSizeSliderTitle="Cyborg ???",
-		PluginSizeSliderTitle="??????"
+		CyborgMMO_OptionPageCyborgSizeSliderTitle="Cyborg ???",
+		CyborgMMO_OptionPagePluginSizeSliderTitle="??????"
 	},
 	["esES"] = {
-		CyborgButtonTitle="Botón Cyborg",
-		MiniMapButtonTitle="Botón Minimapa",
-		OptionPageTitle="Cyborg MMO7",
+		CyborgMMO_OptionPageCyborgButtonTitle="Botón Cyborg",
+		CyborgMMO_OptionPageMiniMapButtonTitle="Botón Minimapa",
+		CyborgMMO_OptionPageTitle="Cyborg MMO7",
 		CyborgMMO_OptionPageSetDefaults="Predeterminado",
-		CyborgSizeSliderTitle="Tamaño de la cabeza de Cyborg",
-		PluginSizeSliderTitle="Tamaño de la ventana de la interfaz"
+		CyborgMMO_OptionPageCyborgSizeSliderTitle="Tamaño de la cabeza de Cyborg",
+		CyborgMMO_OptionPagePluginSizeSliderTitle="Tamaño de la ventana de la interfaz"
 	},
 	["esMX"] = {
-		CyborgButtonTitle="Botón de Cyborg",
-		MiniMapButtonTitle="Botón de Minimapa",
-		OptionPageTitle="Cyborg MMO7",
+		CyborgMMO_OptionPageCyborgButtonTitle="Botón de Cyborg",
+		CyborgMMO_OptionPageMiniMapButtonTitle="Botón de Minimapa",
+		CyborgMMO_OptionPageTitle="Cyborg MMO7",
 		CyborgMMO_OptionPageSetDefaults="Modo predeterminado",
-		CyborgSizeSliderTitle="Tamaño de la cabeza de Cyborg",
-		PluginSizeSliderTitle="Tamaño de la ventana de interfaz"
+		CyborgMMO_OptionPageCyborgSizeSliderTitle="Tamaño de la cabeza de Cyborg",
+		CyborgMMO_OptionPagePluginSizeSliderTitle="Tamaño de la ventana de interfaz"
 	}
 }