From eab909e60ec7de8c1c763e20d1db99fe8345c72b Mon Sep 17 00:00:00 2001 From: Dystopian Date: Tue, 28 Nov 2017 22:32:51 +0300 Subject: [PATCH] Unify settings and keybinds categories (#5815) --- .../fnc_cbaSettings_loadFromConfig.sqf | 4 +- addons/common/stringtable.xml | 156 +++++++++--------- addons/gestures/stringtable.xml | 30 ++-- addons/noradio/XEH_preInit.sqf | 2 +- addons/optionsmenu/XEH_preInit.sqf | 4 +- 5 files changed, 98 insertions(+), 98 deletions(-) diff --git a/addons/common/functions/fnc_cbaSettings_loadFromConfig.sqf b/addons/common/functions/fnc_cbaSettings_loadFromConfig.sqf index a68d8ddc9f..4260765baf 100644 --- a/addons/common/functions/fnc_cbaSettings_loadFromConfig.sqf +++ b/addons/common/functions/fnc_cbaSettings_loadFromConfig.sqf @@ -90,8 +90,8 @@ if (_category == "") then { // WARNING_1("Setting [%1] - no category",_varName); _category = "Uncategorized"; }; -if (((_varName select [0, 4]) == "ACE_") && {(_category select [0, 3]) != "ACE"}) then {_category = format ["ACE - %1", _category];}; -if (((_varName select [0, 5]) == "ACEX_") && {(_category select [0, 4]) != "ACEX"}) then {_category = format ["ACEX - %1", _category];}; +if (((_varName select [0, 4]) == "ACE_") && {(_category select [0, 3]) != "ACE"}) then {_category = format ["ACE %1", _category];}; +if (((_varName select [0, 5]) == "ACEX_") && {(_category select [0, 4]) != "ACEX"}) then {_category = format ["ACEX %1", _category];}; private _code = compile format ['["%1", _this] call FUNC(cbaSettings_settingChanged)', _varName]; diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index 2bf4182585..0318c6ea64 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -999,94 +999,94 @@ 不要强行 - ACE3 Equipment - ACE-Ausrüstung - ACE3 Wyposażenie - Equipamentos ACE3 - ACE3 Снаряжение - ACE3 Vybavení - ACE3 Equipo - Equipaggiamento ACE3 - ACE3 Equipement - ACE3 装備 - ACE3 장비 - ACE3 裝備按鍵 - ACE3 装备按键 + ACE Equipment + ACE Ausrüstung + ACE Wyposażenie + ACE Equipamentos + ACE Снаряжение + ACE Vybavení + ACE Equipo + ACE Equipaggiamento + ACE Equipement + ACE 装備 + ACE 장비 + ACE 裝備按鍵 + ACE 装备按键 - ACE3 Common - ACE3 Allgemein - ACE3 Ogólne - Comum ACE3 - ACE3 Общие - ACE3 Común - ACE3 Obecné - Comune ACE3 - ACE3 Commun - ACE3 全般 - ACE3 일반 - ACE3 通用按鍵 - ACE3 通用按键 + ACE Common + ACE Allgemein + ACE Ogólne + ACE Comum + ACE Общие + ACE Común + ACE Obecné + ACE Comune + ACE Commun + ACE 全般 + ACE 일반 + ACE 通用按鍵 + ACE 通用按键 - ACE3 Weapons - ACE3 Waffen - ACE3 Broń - Armamento ACE3 - ACE3 Оружие - ACE3 Zbraně - ACE3 Armas - Armi ACE3 - ACE3 Armes - ACE3 武器 - ACE3 무기 - ACE3 武器按鍵 - ACE3 武器按键 + ACE Weapons + ACE Waffen + ACE Broń + ACE Armamento + ACE Оружие + ACE Zbraně + ACE Armas + ACE Armi + ACE Armes + ACE 武器 + ACE 무기 + ACE 武器按鍵 + ACE 武器按键 - ACE3 Movement - ACE3 Bewegung - ACE3 Ruch - Movimento ACE3 - ACE3 Перемещение - ACE3 Movimiento - ACE3 Pohyb - Movimento ACE3 - ACE3 Mouvement - ACE3 移動 - ACE3 움직임 - ACE3 動作按鍵 - ACE3 动作按键 + ACE Movement + ACE Bewegung + ACE Ruch + ACE Movimento + ACE Перемещение + ACE Movimiento + ACE Pohyb + ACE Movimento + ACE Mouvement + ACE 移動 + ACE 움직임 + ACE 動作按鍵 + ACE 动作按键 - ACE3 Scope Adjustment - ACE3 Visiereinstellung - ACE3 Regulacja optyki - Ajuste de luneta ACE3 - ACE3 Прицелы - ACE3 Nastavení optiky - ACE3 Ajuste de miras - Regolazione Ottiche ACE3 - ACE3 Ajustement de la lunette - ACE3 スコープ調節 - ACE3 조준경 조정 - ACE3 瞄準鏡調節按鍵 - ACE3 瞄准镜调节按键 + ACE Scope Adjustment + ACE Visiereinstellung + ACE Regulacja optyki + ACE Ajuste de luneta + ACE Прицелы + ACE Nastavení optiky + ACE Ajuste de miras + ACE Regolazione Ottiche + ACE Ajustement de la lunette + ACE スコープ調節 + ACE 조준경 조정 + ACE 瞄準鏡調節按鍵 + ACE 瞄准镜调节按键 - ACE3 Vehicles - ACE3 Fahrzeuge - ACE3 Pojazdy - Veículos ACE3 - ACE3 Транспорт - ACE3 Vozidla - ACE3 Vehículos - Veicoli ACE3 - ACE3 Vehicules - ACE3 車両 - ACE3 차량 - ACE3 載具按鍵 - ACE3 载具按键 + ACE Vehicles + ACE Fahrzeuge + ACE Pojazdy + ACE Veículos + ACE Транспорт + ACE Vozidla + ACE Vehículos + ACE Veicoli + ACE Vehicules + ACE 車両 + ACE 차량 + ACE 載具按鍵 + ACE 载具按键 No Room to unload diff --git a/addons/gestures/stringtable.xml b/addons/gestures/stringtable.xml index 05c5d98e90..fce2270cbb 100644 --- a/addons/gestures/stringtable.xml +++ b/addons/gestures/stringtable.xml @@ -2,20 +2,20 @@ - ACE3 Gestures - ACE3 Gesten - ACE3 Gesty - ACE3 Posunky - ACE3 Gestes - ACE3 Kézjelek - Gesti ACE3 - ACE3 Gestos - ACE3 Жесты - ACE3 Gestos - ACE3 ジェスチャー - ACE3 수신호 - ACE3 手势 - ACE3 手勢 + ACE Gestures + ACE Gesten + ACE Gesty + ACE Posunky + ACE Gestes + ACE Kézjelek + ACE Gesti + ACE Gestos + ACE Жесты + ACE Gestos + ACE ジェスチャー + ACE 수신호 + ACE 手势 + ACE 手勢 ACE Gestures @@ -24,7 +24,7 @@ ACE Posunky ACE Gestes ACE Kézjelek - Gesti ACE + ACE Gesti ACE Gestos ACE Жесты ACE Gestos diff --git a/addons/noradio/XEH_preInit.sqf b/addons/noradio/XEH_preInit.sqf index 052b189ae2..5be74ddf1b 100644 --- a/addons/noradio/XEH_preInit.sqf +++ b/addons/noradio/XEH_preInit.sqf @@ -27,7 +27,7 @@ if (hasInterface) then { }, true] call CBA_fnc_addPlayerEventHandler; }; -[QGVAR(enabled), "CHECKBOX", [LSTRING(setting), LSTRING(setting_tooltip)], format ["ACE - %1", localize ELSTRING(common,DisplayName)], true, true, { +[QGVAR(enabled), "CHECKBOX", [LSTRING(setting), LSTRING(setting_tooltip)], format ["ACE %1", localize ELSTRING(common,DisplayName)], true, true, { params ["_enabled"]; if (_enabled) then { diff --git a/addons/optionsmenu/XEH_preInit.sqf b/addons/optionsmenu/XEH_preInit.sqf index e11044cdfd..46d58b5a8a 100644 --- a/addons/optionsmenu/XEH_preInit.sqf +++ b/addons/optionsmenu/XEH_preInit.sqf @@ -7,8 +7,8 @@ PREP_RECOMPILE_START; PREP_RECOMPILE_END; if (hasInterface) then { - [[format ["ACE3 %1", localize LSTRING(DumpDebug)], localize LSTRING(DumpDebugTooltip)], QGVAR(MainMenuHelperDumpDebug)] call CBA_fnc_addPauseMenuOption; - [[format ["ACE3 %1", localize LSTRING(headBugFix)], localize LSTRING(headBugFixTooltip)], QGVAR(MainMenuHelperHeadBugFix)] call CBA_fnc_addPauseMenuOption; + [[format ["ACE %1", localize LSTRING(DumpDebug)], localize LSTRING(DumpDebugTooltip)], QGVAR(MainMenuHelperDumpDebug)] call CBA_fnc_addPauseMenuOption; + [[format ["ACE %1", localize LSTRING(headBugFix)], localize LSTRING(headBugFixTooltip)], QGVAR(MainMenuHelperHeadBugFix)] call CBA_fnc_addPauseMenuOption; }; ADDON = true;