Merge branch 'master' into release-3.18.0

CBATeam · Oct 8, 2024 · 5433402 · 5433402
2 parents 801183d + a42a8b5
commit 5433402
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/addons/diagnostic/stringtable.xml b/addons/diagnostic/stringtable.xml
@@ -157,7 +157,7 @@
             <Chinesesimp>4 个空格</Chinesesimp>
             <Czech>4 mezery</Czech>
             <Italian>4 Spazi</Italian>
-            <Korean>4 공간</Korean>
+            <Korean>네 공간</Korean>
             <Japanese>スペース4個</Japanese>
         </Key>
     </Package>

diff --git a/addons/jr/stringtable.xml b/addons/jr/stringtable.xml
@@ -29,7 +29,7 @@
             <Chinese>機槍用消音器</Chinese>
             <Chinesesimp>机枪用消音器</Chinesesimp>
             <Turkish>Community Base Addons - MG Susturucusu</Turkish>
-            <Korean>소음기(기관총)</Korean>
+            <Korean>소음기 (기관총)</Korean>
         </Key>
     </Package>
 </Project>
diff --git a/addons/settings/fnc_addSetting.sqf b/addons/settings/fnc_addSetting.sqf
@@ -7,7 +7,7 @@ Description:
 
 Parameters:
     _setting     - Unique setting name. Matches resulting variable name <STRING>
-    _settingType - Type of setting. Can be "CHECKBOX", "EDITBOX", "LIST", "SLIDER" or "COLOR" <STRING>
+    _settingType - Type of setting. Can be "CHECKBOX", "EDITBOX", "LIST", "SLIDER", "COLOR" or "TIME" <STRING>
     _title       - Display name or display name + tooltip (optional, default: same as setting name) <STRING, ARRAY>
     _category    - Category for the settings menu + optional sub-category <STRING, ARRAY>
     _valueInfo   - Extra properties of the setting depending of _settingType. See examples below <ANY>

diff --git a/addons/settings/fnc_init.sqf b/addons/settings/fnc_init.sqf
@@ -7,7 +7,7 @@ Description:
 
 Parameters:
     _setting     - Unique setting name. Matches resulting variable name <STRING>
-    _settingType - Type of setting. Can be "CHECKBOX", "EDITBOX", "LIST", "SLIDER" or "COLOR" <STRING>
+    _settingType - Type of setting. Can be "CHECKBOX", "EDITBOX", "LIST", "SLIDER", "COLOR" or "TIME" <STRING>
     _title       - Display name or display name + tooltip (optional, default: same as setting name) <STRING, ARRAY>
     _category    - Category for the settings menu + optional sub-category <STRING, ARRAY>
     _valueInfo   - Extra properties of the setting depending of _settingType. See examples below <ANY>

diff --git a/addons/ui/fnc_initDisplayRemoteMissions.sqf b/addons/ui/fnc_initDisplayRemoteMissions.sqf
@@ -158,6 +158,7 @@ _display setVariable [QFUNC(filter), {
             _ctrlMissions lbSetColor [_index, _color];
             _ctrlMissions lbSetPicture [_index, _picture];
             _ctrlMissions lbSetPictureRight [_index, _pictureRight];
+            _ctrlMissions lbSetTooltip [_index, format ["%1", _data]];
         };
     } forEach _missions;