diff --git a/ElvUI_SLE/dev/elvprot.lua b/ElvUI_SLE/dev/elvprot.lua index 4768c70..678ce77 100644 --- a/ElvUI_SLE/dev/elvprot.lua +++ b/ElvUI_SLE/dev/elvprot.lua @@ -53,6 +53,8 @@ function E:BeginFoolsDayEvent() tinsert(self.massiveShakeObjects, LeftBG) tinsert(self.massiveShakeObjects, RightBG) tinsert(self.massiveShakeObjects, ActionBG) + tinsert(self.massiveShakeObjects, RaidUtility_ShowButton) + tinsert(self.massiveShakeObjects, RaidUtilityPanel) end diff --git a/ElvUI_SLE/dev/staticpopups.lua b/ElvUI_SLE/dev/staticpopups.lua index e2fe86f..087dfb7 100644 --- a/ElvUI_SLE/dev/staticpopups.lua +++ b/ElvUI_SLE/dev/staticpopups.lua @@ -1,17 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -E.PopupDialogs["ELVUI_SLE_REPOOC"] = { - text = L["Repooc configuration requires PixelPerfect to be enabled. Hit accept to enable Pixel Perfect, hit cancel to not use Repooc's Config."], - button1 = ACCEPT, - button2 = CANCEL, - OnAccept = function(self) - E:SetupPixelPerfect(true) - E:RepoocSetup() - end, - timeout = 0, - whileDead = 1, -} - E.PopupDialogs["VERSION_MISMATCH"] = { text = L["Your version of ElvUI is older than recommended to use with Shadow & Light Edit. Please, download the latest version from tukui.org."], button1 = CLOSE, diff --git a/ElvUI_SLE/locales/english.lua b/ElvUI_SLE/locales/english.lua index 51bba36..a45f61c 100644 --- a/ElvUI_SLE/locales/english.lua +++ b/ElvUI_SLE/locales/english.lua @@ -28,6 +28,7 @@ L["Your version of ElvUI is older than recommended to use with Shadow & Light Ed L["Reset All"] = true L["Reset all Shadow & Light options and movers to their defaults"] = true L["Reset these options to defaults"] = true +L["Your version of ElvUI S&L is out of date. You can download the latest version from http://www.tukui.org"] = true --Install-- L["Shadow & Light Settings"] = true @@ -38,6 +39,8 @@ L["Darth's Config"] = true L["Darth's Defaults Set"] = true L["Repooc's Config"] = true L["Repooc's Defaults Set"] = true +L["Affinitii's Config"] = true +L["Affinitii's Defaults Set"] = true --Auras-- L["Options for customizing auras near the minimap."] = true @@ -90,7 +93,7 @@ L["SLE_CONTACTS"] = [=[Bug reports, suggestions and other stuff accepted via: - Private Massage on TukUI.org to Darth Predator or Repooc - AddOn's page/ticket system on curse.com - Forums on tukui.org, Addons/Help section -- AddOn's repo github.com]=] +- AddOn's repo on github.com]=] L["DP_1"] = "DT Panel 1" L["DP_2"] = "DT Panel 2" L["DP_3"] = "DT Panel 3" @@ -159,6 +162,15 @@ L['Right-click to drop the item.'] = true --Import Section L["SLE_IMPORTS"] = "|cffFF0000Note:|r Use the filter imports with caution as these will overwrite any custom ones made!\nImporting a class filter will overwrite any modifications you have made to that class filter." +L["Import Options"] = true +L["Author Specific Imports"] = true +L['Select Author'] = true +L["Please be aware that importing any of the filters will require a reload of the UI for the settings to take effect.\nOnce you click a filter button, your screen will reload automatically."] = true +L["Import"] = true +L["This will import non class specific filters from this author."] = true +L["This will import All Class specific filters from this author."] = true +L['Import All'] = true + --Marks-- L["Raid Marks"] = true @@ -239,6 +251,7 @@ L["ELVUI_SLE_CREDITS"] = "We would like to point out the following people for he L["Submodules and Coding:"] = true L["ELVUI_SLE_CODERS"] = [=[Elv Tukz +Affinitii Azilroka Blazeflack Boradan diff --git a/ElvUI_SLE/locales/russian.lua b/ElvUI_SLE/locales/russian.lua index efc1482..94b4353 100644 --- a/ElvUI_SLE/locales/russian.lua +++ b/ElvUI_SLE/locales/russian.lua @@ -28,6 +28,7 @@ L["Your version of ElvUI is older than recommended to use with Shadow & Light Ed L["Reset All"] = "Сбросить все" L["Reset all Shadow & Light options and movers to their defaults"] = "Сбросить все настройки и фиксаторы редакции на умолчания" L["Reset these options to defaults"] = "Восстановить умолчания для этих опций" +L["Your version of ElvUI S&L is out of date. You can download the latest version from http://www.tukui.org"] = "Ваша версия ElvUI S&L устарела. Вы можете скачать последнюю версию на http://www.tukui.org" --Install-- L["Shadow & Light Settings"] = "Установки Тени и Света" @@ -38,6 +39,8 @@ L["Darth's Config"] = "Опции Darth'а" L["Darth's Defaults Set"] = "Установлены настройки Darth'а" L["Repooc's Config"] = "Опции Repooc'а" L["Repooc's Defaults Set"] = "Установлены настройки Repooc'а" +L["Affinitii's Config"] = "Опции Affinitii" +L["Affinitii's Defaults Set"] = "Установлены настройки Affinitii" --Auras-- L["Options for customizing auras near the minimap."] = "Опции для настройки аур около миникарты" @@ -165,6 +168,17 @@ L["Sets size of buttons"] = "Устанавливает размер кнопо L["Direction"] = "Направление" L["Change the direction of buttons growth from the skull marker"] = "Изменяет направление роста кнопок от метки \"череп\"." +--Import Section +L["SLE_IMPORTS"] = "|cffFF0000Важно:|r Используйте импортирование фильтров осторожно, так как они удалят ваши собсвенные фильтры!\nИмпортирование классового фильтра перезапишет любые изменения, которые Вы в него вносили." +L["Import Options"] = "Импорт Настроек" +L["Author Specific Imports"] = "Импорт специфических настроек авторов" +L['Select Author'] = "Выберите автора" +L["Please be aware that importing any of the filters will require a reload of the UI for the settings to take effect.\nOnce you click a filter button, your screen will reload automatically."] = "Пожалуйста, учтите, что импортирование любого фильтра потребует перезагрузки интерфейса для вступления в силу.\nКак только вы нажмете на кнопку, Ваш интерфейс перезагрузится автоматически." +L["Import"] = "Импорт" +L["This will import non class specific filters from this author."] = "Это импортирует не привязанные к классу фильтры этого автора." +L["This will import All Class specific filters from this author."] = "Это импортирует все классовые фильтры этого автора." +L['Import All'] = "Импорт всего" + --Minimap-- L["Minimap Options"] = "Опции миникарты" L['MINIMAP_DESC'] = "Эти опции влияют на различные функции миникарты. Некоторые опции погут не работать, если вы отключите миникарты в основных настройках ElvUI." @@ -242,6 +256,7 @@ L["ELVUI_SLE_CREDITS"] = "Мы бы хотели отметить следующ L["Submodules and Coding:"] = "Субмодули и кодинг:" L["ELVUI_SLE_CODERS"] = [=[Elv Tukz +Affinitii Azilroka Blazeflack Boradan diff --git a/ElvUI_SLE/modules/imports/options.lua b/ElvUI_SLE/modules/imports/options.lua index bd4861d..4d7542f 100644 --- a/ElvUI_SLE/modules/imports/options.lua +++ b/ElvUI_SLE/modules/imports/options.lua @@ -209,19 +209,19 @@ local function UpdateAuthor() BigWigs = { type = 'execute', order = 3, - name = L['Big Wigs'], + name = "Big Wigs", func = function(info, value) AI:LoadAddons("Affinitii, BigWigs"); ReloadUI(); end, }, Hermes = { type = 'execute', order = 4, - name = L['Hermes'], + name = "Hermes", func = function(info, value) AI:LoadAddons("Affinitii, Hermes"); ReloadUI(); end, }, xCT = { type = 'execute', order = 5, - name = L['xCT+'], + name = "xCT+", func = function(info, value) AI:LoadAddons("Affinitii, xCT+"); ReloadUI(); end, }, }, @@ -340,19 +340,19 @@ local function UpdateAuthor() BigWigs = { type = 'execute', order = 2, - name = L['Big Wigs'], + name = "Big Wigs", func = function(info, value) AI:LoadAddons("Affinitii, BigWigs"); end, }, Hermes = { type = 'execute', order = 2, - name = L['Hermes'], + name = "Hermes", func = function(info, value) AI:LoadAddons("Affinitii, Hermes"); end, }, xCT = { type = 'execute', order = 2, - name = L['xCT+'], + name = "xCT+", func = function(info, value) AI:LoadAddons("Affinitii, xCT+"); end, },]] }, @@ -465,7 +465,7 @@ local function UpdateAuthor() xCT = { type = 'execute', order = 2, - name = L['xCT+'], + name = "xCT+", func = function(info, value) AI:LoadAddons("Darth, xCT+"); end, }, }, diff --git a/ElvUI_SLE/modules/install/install.lua b/ElvUI_SLE/modules/install/install.lua index 4a47510..f61f3d8 100644 --- a/ElvUI_SLE/modules/install/install.lua +++ b/ElvUI_SLE/modules/install/install.lua @@ -1707,7 +1707,7 @@ function E:RepoocSetup() --The function to switch from classic ElvUI settings to end function E:AffinitiiSetup(loadAddons) --The function to switch from class ElvUI settings to Affinitii's - InstallStepComplete.message = L["Affiniti's Defaults Set"] + InstallStepComplete.message = L["Affinitii's Defaults Set"] InstallStepComplete:Show() if not E.db.movers then E.db.movers = {}; end local xOffset = GetScreenWidth() * 0.34375