From db02168283fff76ccf8278647a64011c87e68d35 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 9 Jun 2021 16:33:53 -0500 Subject: [PATCH 001/111] Prep v3.15.4 --- README.md | 2 +- addons/main/script_version.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3fa06ec6b0..4d96968c37 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Community Base Addons [![](https://img.shields.io/travis/CBATeam/CBA_A3.svg?style=flat-square)](https://travis-ci.org/CBATeam/CBA_A3) [![](https://img.shields.io/badge/Changelog-Link-orange.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) -[![](https://img.shields.io/badge/Release-3.15.3-blue.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) +[![](https://img.shields.io/badge/Release-3.15.4-blue.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) [![](https://img.shields.io/badge/Github-Wiki-lightgrey.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/wiki) [![](https://img.shields.io/badge/BIF-Thread-lightgrey.svg?style=flat-square)](https://forums.bistudio.com/topic/168277-cba-community-base-addons-arma-3) [![](https://img.shields.io/badge/Function-Documentation-yellow.svg?style=flat-square)](https://cbateam.github.io/CBA_A3/docs/files/overview-txt.html) diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 9d74eb59b9..efc8abdcde 100755 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 3 #define MINOR 15 -#define PATCHLVL 3 -#define BUILD 000000 +#define PATCHLVL 4 +#define BUILD 210609 From 9c2664966f123405cea2c982d94808c4b3bcb1a5 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 17 Jun 2021 12:58:42 -0500 Subject: [PATCH 002/111] Prep v3.15.4 RC2 --- addons/main/script_version.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index efc8abdcde..b9646f2f1a 100755 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 3 #define MINOR 15 #define PATCHLVL 4 -#define BUILD 210609 +#define BUILD 000000 From 46de1064ced04b45f20168bb3e3cd16e3e2cd051 Mon Sep 17 00:00:00 2001 From: jokoho482 Date: Sat, 19 Jun 2021 16:06:09 +0200 Subject: [PATCH 003/111] Replace some Compile preprocessFileLineNumbers with compileScript --- addons/diagnostic/fnc_initExtendedDebugConsole.sqf | 2 +- addons/ui/test_preload.sqf | 6 +++--- addons/xeh/fnc_preInit.sqf | 2 +- addons/xeh/fnc_preStart.sqf | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/diagnostic/fnc_initExtendedDebugConsole.sqf b/addons/diagnostic/fnc_initExtendedDebugConsole.sqf index 29f7fc83da..0692610769 100644 --- a/addons/diagnostic/fnc_initExtendedDebugConsole.sqf +++ b/addons/diagnostic/fnc_initExtendedDebugConsole.sqf @@ -57,7 +57,7 @@ _expression ctrlAddEventHandler ["KeyDown", { [ctrlParent _buttonLocalExec, _buttonLocalExec], "RscDisplayDebugPublic", 0 - ] call compile preprocessFileLineNumbers "\A3\Ui_f\scripts\GUI\RscDebugConsole.sqf"; + ] call compileScript ["\A3\Ui_f\scripts\GUI\RscDebugConsole.sqf"]; playSound "SoundClick"; }; diff --git a/addons/ui/test_preload.sqf b/addons/ui/test_preload.sqf index f0bdb44980..35c640c2d3 100644 --- a/addons/ui/test_preload.sqf +++ b/addons/ui/test_preload.sqf @@ -9,7 +9,7 @@ isNil { with uiNamespace do { // 3DEN AmmoBox_list = nil; - ["onLoad", [controlNull]] call compile preprocessFile "\a3\3den\UI\Attributes\AmmoBox.sqf"; + ["onLoad", [controlNull]] call compileScript ["\a3\3den\UI\Attributes\AmmoBox.sqf"]; }; }; @@ -47,13 +47,13 @@ isNil { _curator addCuratorAddons call EGVAR(common,addons); missionNamespace setVariable ["RscAttrbuteInventory_weaponAddons", nil]; - ["onLoad", [displayNull], objNull] call compile preprocessFile "\a3\ui_f_curator\UI\RscCommon\RscAttributeInventory.sqf"; + ["onLoad", [displayNull], objNull] call compileScript ["\a3\ui_f_curator\UI\RscCommon\RscAttributeInventory.sqf"]; _vanilla = RscAttributeInventory_list; GVAR(curatorItemCache) = nil; call FUNC(preloadCurator); missionNamespace setVariable ["RscAttrbuteInventory_weaponAddons", GVAR(curatorItemCache)]; - ["onLoad", [displayNull], objNull] call compile preprocessFile "\a3\ui_f_curator\UI\RscCommon\RscAttributeInventory.sqf"; + ["onLoad", [displayNull], objNull] call compileScript ["\a3\ui_f_curator\UI\RscCommon\RscAttributeInventory.sqf"]; _cba = RscAttributeInventory_list; TEST_TRUE([_vanilla] isEqualTo [_cba],QFUNC(preloadCurator)); diff --git a/addons/xeh/fnc_preInit.sqf b/addons/xeh/fnc_preInit.sqf index 475ec1a61b..7a57e6e518 100644 --- a/addons/xeh/fnc_preInit.sqf +++ b/addons/xeh/fnc_preInit.sqf @@ -26,7 +26,7 @@ SLX_XEH_DisableLogging = uiNamespace getVariable ["SLX_XEH_DisableLogging", fals XEH_LOG("PreInit started. v" + getText (configFile >> "CfgPatches" >> "cba_common" >> "versionStr")); SLX_XEH_STR = ""; // does nothing, never changes, backwards compatibility -SLX_XEH_COMPILE = compileFinal "diag_log text format ['[CBA-XEH] old SLX_XEH_COMPILE macro used on %1', _this]; compile preprocessFileLineNumbers _this"; //backwards compat +SLX_XEH_COMPILE = compileFinal "diag_log text format ['[CBA-XEH] old SLX_XEH_COMPILE macro used on %1', _this]; compileScript [_this]"; //backwards compat SLX_XEH_COMPILE_NEW = CBA_fnc_compileFunction; //backwards comp SLX_XEH_DUMMY = "Logic"; // backwards comp diff --git a/addons/xeh/fnc_preStart.sqf b/addons/xeh/fnc_preStart.sqf index 6d8b6ef88f..832e3b0ae2 100644 --- a/addons/xeh/fnc_preStart.sqf +++ b/addons/xeh/fnc_preStart.sqf @@ -23,7 +23,7 @@ with uiNamespace do { XEH_LOG("PreStart started."); - SLX_XEH_COMPILE = compileFinal "diag_log text format ['[CBA-XEH] old SLX_XEH_COMPILE macro used on %1', _this]; compile preprocessFileLineNumbers _this"; //backwards compat + SLX_XEH_COMPILE = compileFinal "diag_log text format ['[CBA-XEH] old SLX_XEH_COMPILE macro used on %1', _this]; compileScript [_this]"; //backwards compat SLX_XEH_COMPILE_NEW = CBA_fnc_compileFunction; //backwards comp PREP(initDisplay3DEN); From 231fff843c81fe0800369bee085fd2721d7ae33b Mon Sep 17 00:00:00 2001 From: commy2 Date: Wed, 30 Jun 2021 12:15:07 +0200 Subject: [PATCH 004/111] Fix Callsign Attribute Compatibility (#1471) --- addons/common/Cfg3DEN.hpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/common/Cfg3DEN.hpp b/addons/common/Cfg3DEN.hpp index 8e5cc2eb53..8d0071f993 100644 --- a/addons/common/Cfg3DEN.hpp +++ b/addons/common/Cfg3DEN.hpp @@ -27,7 +27,13 @@ class Cfg3DEN { class Init { class Attributes { class Callsign { - expression = "[_this, _value] call CBA_fnc_setCallsign"; + expression = "\ + if (isNil 'CBA_fnc_setCallsign') then {\ + _this setGroupID [_value];\ + } else {\ + [_this, _value] call CBA_fnc_setCallsign;\ + };\ + "; }; }; }; From 338e2a9587279e8e4a9cf5973fa1909beb7b1587 Mon Sep 17 00:00:00 2001 From: diaverso Date: Mon, 12 Jul 2021 19:40:23 +0200 Subject: [PATCH 005/111] Added Spanish translations --- addons/ui/stringtable.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index 1278514887..4641a4584b 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -14,6 +14,7 @@ Community Base Addons - Kullanıcı Arayüzü Community Base Addons - Interfaccia utente Community Base Addons - Uživatelské prostředí + Community Base Addons - Interfaz de usuario User Interface @@ -43,6 +44,7 @@ Barra di avanzamento Ukazatel průběhu Индикатор выполнения + Barra de progreso Position of the progress bar. @@ -56,6 +58,7 @@ Posizione della barra di avanzamento Pozici ukazatele průběhu. Позиция индикатора выполнения. + Posición de la barra de progreso. Store Server Passwords @@ -68,6 +71,7 @@ Ukládat hesla serveru 儲存伺服器密碼 Запоминать пароли серверов + Almacenar contraseñas del servidor Setting to store the passwords entered when connecting to a multiplayer server. @@ -80,6 +84,7 @@ Uloží zadané heslo, když se připojujete k multiplayerovému serveru. 設定是否當連線到伺服器時儲存密碼 Параметр запоминания паролей сервера при входе на них. + Configuración para almacenar las contraseñas ingresadas al conectarse a un servidor multijugador. Save passwords @@ -92,6 +97,7 @@ Ukládat hesla 記住密碼 Сохранять пароли + Guardar contraseñas Passwords are stored when connecting to a multiplayer server. @@ -104,6 +110,7 @@ Hesla jsou uložena, když se připojujete k multiplayerovému serveru. 連線到伺服器時將記住密碼 Пароли будут сохраняться при входе на сервера. + Las contraseñas se almacenan cuando se conecta a un servidor multijugador Do not save passwords @@ -116,6 +123,7 @@ Neukládat hesla 不保存密碼 Не сохранять пароли + No guarde las contraseñas Passwords are not stored when connecting to a multiplayer server. Already stored passwords will not be automatically entered. @@ -128,6 +136,7 @@ Hesla nejsou ukládána, když se připojujete k multiplayerovému serveru. Hesla, která již byla uložena, nebudou automaticky zadávána. 當連線到伺服器時將不保存密碼。已有的保存密碼將不會自動填入。 Пароли не сохраняются при входе на сервера. Уже сохранённые пароли не будут автоматически вставлены. + Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas no se ingresarán automáticamente. Delete passwords @@ -140,6 +149,7 @@ Smazat hesla 刪除密碼 Удалить пароли + Eliminar contraseñas Passwords are not stored when connecting to a multiplayer server. Already stored passwords are deleted from the profile. @@ -152,6 +162,7 @@ Hesla nejsou ukládána, když se připojujete k multiplayerovému serveru. Hesla, která již byla uložena, jsou smazána z profilu. 當連線到伺服器時將不保存密碼。已有的保存密碼將會刪除。 Пароли не сохраняются при входе на сервера. Уже сохранённые пароли будут удалены. + Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas se eliminan del perfil. Notification @@ -164,6 +175,7 @@ 通知 Notification Уведомление + Notificación Textual feedback to the player. @@ -176,6 +188,7 @@ 回饋文字給玩家 Notification textuelle au joueur. Текстовая информация для игрока. + Comentarios textuales para el jugador Show all missions @@ -188,6 +201,7 @@ 顯示所有任務 Afficher toutes les missions Показать все миссии + Mostrar todas las misiones Show custom missions @@ -200,6 +214,7 @@ 顯示目前任務 Afficher les missions personnalisées Показать пользовательские миссии + Mostrar misiones personalizadas Notification Lifetime @@ -211,6 +226,7 @@ Durée de vie des notifications Продолжительность уведомления Długość żywotności powiadomień + Duración de la notificación Notification display duration in seconds. @@ -222,6 +238,7 @@ Durée d'affichage des notifications, en secondes. Время в секундах, в течении которого будет видно уведомление. Ilość czasu przez który widoczne jest powiadomienie + Duración de la visualización de notificaciones en segundos Contact the server admin. @@ -232,22 +249,26 @@ Contacter l'administrateur du serveur. Уведомить администратора сервера. Kontakt z administratorem serwera + Póngase en contacto con el administrador del servidor Lobby Manager Lobby Manager Menadżer Lobby Gestionnaire de Lobby + Gerente de lobby Adjusting group order... Reihenfolge der Gruppen wird angepasst ... Modification de l'ordre des groupes... + Ajustar el orden del grupo... Back up mission before using this tool. Erstelle vor Gebrauch eine Sicherungskopie. Sauvegardez la mission avant d'utiliser cet outil. + Haga una copia de seguridad de la misión antes de usar esta herramienta From 4bc61dfa0750bcad6a25e598b7affb84febd2dcf Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 13 Jul 2021 10:21:48 -0500 Subject: [PATCH 006/111] Prep v3.15.5 --- README.md | 2 +- addons/main/script_version.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4d96968c37..2fcbe18b67 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Community Base Addons [![](https://img.shields.io/travis/CBATeam/CBA_A3.svg?style=flat-square)](https://travis-ci.org/CBATeam/CBA_A3) [![](https://img.shields.io/badge/Changelog-Link-orange.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) -[![](https://img.shields.io/badge/Release-3.15.4-blue.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) +[![](https://img.shields.io/badge/Release-3.15.5-blue.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) [![](https://img.shields.io/badge/Github-Wiki-lightgrey.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/wiki) [![](https://img.shields.io/badge/BIF-Thread-lightgrey.svg?style=flat-square)](https://forums.bistudio.com/topic/168277-cba-community-base-addons-arma-3) [![](https://img.shields.io/badge/Function-Documentation-yellow.svg?style=flat-square)](https://cbateam.github.io/CBA_A3/docs/files/overview-txt.html) diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index b9646f2f1a..ffd4670596 100755 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 3 #define MINOR 15 -#define PATCHLVL 4 +#define PATCHLVL 5 #define BUILD 000000 From b765f6473a5f9f96c02e9f048af2baf4c051e4ff Mon Sep 17 00:00:00 2001 From: Killswitch Date: Fri, 23 Jul 2021 15:14:46 +0200 Subject: [PATCH 007/111] deploy.py: Pylint fixes (#1423) --- tools/deploy.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) mode change 100644 => 100755 tools/deploy.py diff --git a/tools/deploy.py b/tools/deploy.py old mode 100644 new mode 100755 index 571b64600f..89686387a6 --- a/tools/deploy.py +++ b/tools/deploy.py @@ -1,54 +1,58 @@ #!/usr/bin/env python3 +""" #################################### # CBA automatic deployment script # # ================================ # # This is not meant to be run # # directly! # #################################### +""" import os import sys -import shutil import traceback import subprocess as sp -from pygithub3 import Github - +try: + from pygithub3 import Github +except ImportError: + from github import Github +# https://github.com/CBATeam/CBA_A3/issues/754 TRANSLATIONISSUE = 754 -TRANSLATIONBODY = """**[CBA Translation Guide](https://github.com/CBATeam/CBA_A3/wiki/Translation-Guide)** +TRANSLATIONBODY = "**[CBA Translation Guide]" \ + "(https://github.com/CBATeam/CBA_A3/wiki/Translation-Guide)**\n" \ + "\n{}" -{} -""" REPOUSER = "CBATeam" REPONAME = "CBA_A3" -REPOPATH = "{}/{}".format(REPOUSER,REPONAME) +REPOPATH = "{}/{}".format(REPOUSER, REPONAME) def update_translations(token): + """Update the CBA translation issue on GitHub""" diag = sp.check_output(["python3", "tools/stringtablediag.py", "--markdown"]) diag = str(diag, "utf-8") repo = Github(token).get_repo(REPOPATH) issue = repo.get_issue(TRANSLATIONISSUE) issue.edit(body=TRANSLATIONBODY.format(diag)) - -def main(): +def main(): # pylint: disable=missing-function-docstring print("Obtaining token ...") try: token = os.environ["GH_TOKEN"] - except: + except KeyError: print("Could not obtain token.") print(traceback.format_exc()) return 1 else: - print("Token sucessfully obtained.") + print("Token successfully obtained.") print("\nUpdating translation issue ...") try: update_translations(token) - except: + except Exception: # pylint: disable=broad-except print("Failed to update translation issue.") print(traceback.format_exc()) return 1 From c02785c9e3912a79940ded96577a11d22b268597 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 23 Jul 2021 08:16:11 -0500 Subject: [PATCH 008/111] Tools - Add VScode tasks, Fix make.py for HEMTT, Fix unicode error in check strings (#1469) --- .gitignore | 1 + tools/.vscode/tasks.json | 72 ++++++++++++++++++++++++++++++++++++++++ tools/check_strings.py | 2 +- tools/make.py | 2 +- 4 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 tools/.vscode/tasks.json diff --git a/.gitignore b/.gitignore index a7e7f79078..5b388ddcd6 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ Thumbs.db *.log /store/function_library/* /store/wiki/* +.vscode/* *.7z diff --git a/tools/.vscode/tasks.json b/tools/.vscode/tasks.json new file mode 100644 index 0000000000..ac1a736186 --- /dev/null +++ b/tools/.vscode/tasks.json @@ -0,0 +1,72 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Validate SQF", + "command": "${config:python.pythonPath}", + "options": { + "cwd": "${workspaceFolder}/tools" + }, + "args": [ + "sqf_validator.py" + ] + }, + { + "label": "Validate Config", + "command": "${config:python.pythonPath}", + "options": { + "cwd": "${workspaceFolder}/tools" + }, + "args": [ + "config_style_checker.py" + ] + }, + { + "label": "Check Strings", + "command": "${config:python.pythonPath}", + "options": { + "cwd": "${workspaceFolder}/tools" + }, + "args": [ + "check_strings.py" + ] + }, + { + "label": "Test All", + "dependsOn": [ + "Validate SQF", + "Validate Config", + "Check Strings" + ], + "group": { + "kind": "test", + "isDefault": true + }, + }, + { + "label": "Build: make.py (pboProject)", + "command": "${config:python.pythonPath}", + "options": { + "cwd": "${workspaceFolder}/tools" + }, + "args": [ + "make.py", "ci" + ], + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "Build: Hemtt Release", + "command": "hemtt.exe", + "options": { + "cwd": "${workspaceFolder}" + }, + "args": [ + "build", "--release", "--ci" + ], + "group": "build" + } + ] +} \ No newline at end of file diff --git a/tools/check_strings.py b/tools/check_strings.py index 4163ed8846..2598e30375 100755 --- a/tools/check_strings.py +++ b/tools/check_strings.py @@ -26,7 +26,7 @@ def getStringUsage(filepath): # print("Checking {0} from {1}".format(filepath,selfmodule)) fileStrings = [] - with open(filepath, 'r') as file: + with open(filepath, 'r', encoding="latin-1") as file: content = file.read() srch = re.compile(r'(STR_CBA_[_a-zA-Z0-9]*)', re.IGNORECASE) diff --git a/tools/make.py b/tools/make.py index 91020364d1..5180216e34 100644 --- a/tools/make.py +++ b/tools/make.py @@ -362,7 +362,7 @@ def copy_important_files(source_dir,destination_dir): def copy_optionals_for_building(mod,pbos): - src_directories = os.listdir(optionals_root) + src_directories = next(os.walk(optionals_root))[1] current_dir = os.getcwd() print_blue("\nChecking optionals folder...") From d998c076fd12b0b3acea222385abb6958346cc6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Fri, 23 Jul 2021 15:17:08 +0200 Subject: [PATCH 009/111] Add missing includes for SQFC (#1473) Co-authored-by: PabstMirror --- include/a3/ui_f/hpp/defineResinclDesign.inc | 1063 +++++++++++++++++++ sqfc.json | 2 +- 2 files changed, 1064 insertions(+), 1 deletion(-) create mode 100644 include/a3/ui_f/hpp/defineResinclDesign.inc diff --git a/include/a3/ui_f/hpp/defineResinclDesign.inc b/include/a3/ui_f/hpp/defineResinclDesign.inc new file mode 100644 index 0000000000..0c669371e9 --- /dev/null +++ b/include/a3/ui_f/hpp/defineResinclDesign.inc @@ -0,0 +1,1063 @@ +#define IDC_SEARCH 645 +#define IDC_SEARCH_BUTTON 646 + +//--- RscDisplayMain +#define IDC_MAIN_GAMEMODES 201 +#define IDC_MAIN_MP_SCENARIOS 202 +#define IDC_MAIN_ARSENAL 203 +#define IDC_MAIN_COMMUNITYGUIDES 204 +#define IDC_MAIN_PROFILE 205 +#define IDC_MAIN_CAMPAIGN_MP 206 + +#define IDC_MAIN_MOUSEAREA 999 +#define IDC_MAIN_BACKGROUND_PICTURE 998 +#define IDC_MAIN_BACKGROUND_BLACK 997 + +#define IDC_MAIN_GROUP_SINGLEPLAYER 1001 +#define IDC_MAIN_GROUP_MULTIPLAYER 1002 +#define IDC_MAIN_GROUP_TUTORIALS 1003 +#define IDC_MAIN_GROUP_OPTIONS 1004 +#define IDC_MAIN_GROUP_SESSION 1005 + +#define IDC_MAIN_TITLE_SINGLEPLAYER 1011 +#define IDC_MAIN_TITLE_MULTIPLAYER 1012 +#define IDC_MAIN_TITLE_TUTORIALS 1013 +#define IDC_MAIN_TITLE_OPTIONS 1014 +#define IDC_MAIN_TITLE_SESSION 1015 + +#define IDC_MAIN_TITLEICON_SINGLEPLAYER 1111 +#define IDC_MAIN_TITLEICON_MULTIPLAYER 1112 +#define IDC_MAIN_TITLEICON_TUTORIALS 1113 +#define IDC_MAIN_TITLEICON_OPTIONS 1114 +#define IDC_MAIN_TITLEICON_SESSION 1115 + +#define IDC_MAIN_SPOTLIGHT_GROUP_1 1020 +#define IDC_MAIN_SPOTLIGHT_GROUP_2 1021 +#define IDC_MAIN_SPOTLIGHT_GROUP_3 1022 +#define IDC_MAIN_SPOTLIGHT_PICTURE 1023 +#define IDC_MAIN_SPOTLIGHT_VIDEO 1024 +#define IDC_MAIN_SPOTLIGHT_HOVER 1025 +#define IDC_MAIN_SPOTLIGHT_BUTTON 1026 +#define IDC_MAIN_SPOTLIGHT_ACTION 1027 +#define IDC_MAIN_SPOTLIGHT_TEXT 1028 +#define IDC_MAIN_SPOTLIGHT_TEXTBCG 1029 + +#define IDC_MAIN_SPOTLIGHT_PREV 1060 +#define IDC_MAIN_SPOTLIGHT_NEXT 1061 + +#define IDC_MAIN_INFO_MODS 1030 +#define IDC_MAIN_INFO_DLCS 1031 +#define IDC_MAIN_INFO_DLCSOWNED 10311 +#define IDC_MAIN_INFO_NEWS 1032 +#define IDC_MAIN_INFO_VERSION 1033 + +#define IDC_MAIN_INFO_BACKGROUND 1034 +#define IDC_MAIN_INFO_BACKGROUND_ICON 1035 +#define IDC_MAIN_INFO_ICON 1036 +#define IDC_MAIN_INFO_BUTTON 1037 +#define IDC_MAIN_INFO_BUTTON_DEV 1038 +#define IDC_MAIN_INFO_NOTIFICATION 1039 + +#define IDC_MAIN_VERSION_DEV 1050 + +#define BARCOLOR 0, 0, 0, 0.75 +#define INFO_BACKGROUND_COLOR BARCOLOR +#define INFO_ICON_COLOR 1, 1, 1, 0.5 + +//--- RscDisplayDebug +#define IDC_RSCDISPLAYDEBUG_DESIGNHTML 11735 +#define IDC_RSCDISPLAYDEBUG_TEXTEXPRESSION 11736 +#define IDC_RSCDISPLAYDEBUG_TEXTVAR1 11737 +#define IDC_RSCDISPLAYDEBUG_TEXTVAR2 11738 +#define IDC_RSCDISPLAYDEBUG_TEXTVAR3 11739 +#define IDC_RSCDISPLAYDEBUG_TEXTVAR4 11740 +#define IDC_RSCDISPLAYDEBUG_TEXTWATCH 11741 +#define IDC_RSCDISPLAYDEBUG_DIAGTEXT 11747 +#define IDC_RSCDISPLAYDEBUG_DRAWTEXT 11748 +#define IDC_RSCDISPLAYDEBUG_CA_TITLE 11838 +#define IDC_RSCDISPLAYDEBUG_CA_PLAYER 12145 +#define IDC_RSCDISPLAYDEBUG_CA_VERSION 12146 +#define IDC_RSCDISPLAYDEBUG_DIAGLIST 12236 +#define IDC_RSCDISPLAYDEBUG_DIAGLIST_SEARCH 12238 +#define IDC_RSCDISPLAYDEBUG_DRAWLIST 12237 +#define IDC_RSCDISPLAYDEBUG_DIAGFRAME 12535 +#define IDC_RSCDISPLAYDEBUG_DRAWFRAME 12536 +#define IDC_RSCDISPLAYDEBUG_FRAMELOG 12537 +#define IDC_RSCDISPLAYDEBUG_G_EXPRESSION 13035 +#define IDC_RSCDISPLAYDEBUG_G_DIAG 13036 +#define IDC_RSCDISPLAYDEBUG_G_DESIGN 13037 +#define IDC_RSCDISPLAYDEBUG_G_WATCH 13038 +#define IDC_RSCDISPLAYDEBUG_G_DRAW 13039 +#define IDC_RSCDISPLAYDEBUG_DIAGBUTTON 13138 +#define IDC_RSCDISPLAYDEBUG_DRAWBUTTON 13139 +#define IDC_RSCDISPLAYDEBUG_DEBUGFLOW 13140 +#define IDC_RSCDISPLAYDEBUG_DEBUGANIM 13141 +#define IDC_RSCDISPLAYDEBUG_B_CAMERANEW 13142 +#define IDC_RSCDISPLAYDEBUG_CREATEJIRAISSUE 13143 +#define IDC_RSCDISPLAYDEBUG_DEBUGGUI 13144 +#define IDC_RSCDISPLAYDEBUG_DEBUGFUNCTIONS 13145 +#define IDC_RSCDISPLAYDEBUG_DEBUGCONFIG 13154 +#define IDC_RSCDISPLAYDEBUG_B_CAMERA 13155 +#define IDC_RSCDISPLAYDEBUG_BUTTONSCRIPT1 13157 +#define IDC_RSCDISPLAYDEBUG_BUTTONSCRIPT2 13158 +#define IDC_RSCDISPLAYDEBUG_BUTTONSCRIPT3 13159 +#define IDC_RSCDISPLAYDEBUG_BUTTONSCRIPT4 13160 +#define IDC_RSCDISPLAYDEBUG_BUTTONSCRIPT5 13161 +#define IDC_RSCDISPLAYDEBUG_BUTTONSCRIPT6 13163 +#define IDC_RSCDISPLAYDEBUG_DEBUGCAPTURE 13164 + +//--- RscDisplayAnimViewer +#define IDC_RSCDISPLAYANIMVIEWER_TITLE 1000 +#define IDC_RSCDISPLAYANIMVIEWER_BACKGROUND 1001 +#define IDC_RSCDISPLAYANIMVIEWER_TEXTACTION 1002 +#define IDC_RSCDISPLAYANIMVIEWER_TEXTPOSE 1003 +#define IDC_RSCDISPLAYANIMVIEWER_TEXTMOVEMENT 1004 +#define IDC_RSCDISPLAYANIMVIEWER_TEXTSTANCE 1005 +#define IDC_RSCDISPLAYANIMVIEWER_TEXTITEM 1006 +#define IDC_RSCDISPLAYANIMVIEWER_DESCRIPTION 1100 +#define IDC_RSCDISPLAYANIMVIEWER_MISC 1500 +#define IDC_RSCDISPLAYANIMVIEWER_ACTION 2100 +#define IDC_RSCDISPLAYANIMVIEWER_POSE 2101 +#define IDC_RSCDISPLAYANIMVIEWER_MOVEMENT 2102 +#define IDC_RSCDISPLAYANIMVIEWER_STANCE 2103 +#define IDC_RSCDISPLAYANIMVIEWER_ITEM 2104 +#define IDC_RSCDISPLAYANIMVIEWER_SOLDIER 2106 +#define IDC_RSCDISPLAYANIMVIEWER_BUTTONCLOSE 2700 + +#define IDC_RSCDISPLAYANIMVIEWER_MOUSEAREA 999 +#define IDC_RSCDISPLAYANIMVIEWER 1320 + +//--- RscDisplayFunctionsViewer +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_TITLEBACKGROUND 1000 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_BACKGROUNDLEFT 1001 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_BACKGROUNDRIGHT 1002 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_BACKGROUNDMETA 1003 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_TITLETEXT 1004 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_AUTHOR 1005 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_CODESTRUCTURED 1100 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_TITLEICON 1200 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_CODE 1400 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_NAME 1401 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_FUNCTIONS 1500 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_SOURCES 2100 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_TAGS 2101 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_CATEGORIES 2102 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_PREVIEW 2300 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_BUTTONRECOMPILE_ALL 2400 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_BUTTONRECOMPILE_SELECTED 2401 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_BUTTONCLOSE 2700 + +#define IDC_RSCDISPLAYFUNCTIONSVIEWER 1321 + +//--- Loading +#define IDC_LOADING_MAPBACKTOP 1000 +#define IDC_LOADING_MAPNAME 1001 +#define IDC_LOADING_MAPAUTHOR 1002 +#define IDC_LOADING_MAPBACKBOTTOM 1003 +#define IDC_LOADING_MISSIONBACKGROUNDTOP 1005 +#define IDC_LOADING_MISSIONNAME 1006 +#define IDC_LOADING_MISSIONAUTHOR 1007 +#define IDC_LOADING_PROGRESSMAP 1008 +#define IDC_LOADING_DISCLAIMERNAME 1009 +#define IDC_LOADING_MISSIONPICTUREBACK 1010 +#define IDC_LOADING_MISSIONGAMETYPE 1012 +#define IDC_LOADING_PROGRESSMISSION 1013 +#define IDC_LOADING_MISSIONDESCRIPTION 1100 +#define IDC_LOADING_DISCLAIMERDESCRIPTION 1101 +#define IDC_LOADING_MAPDESCRIPTION 1102 +#define IDC_LOADING_MISSION 2300 +#define IDC_LOADING_DISCLAIMER 2301 +//--- Loading - DLC part +#define IDC_LOADING_DLCNAME 3207 +#define IDC_LOADING_DLCAUTHOR 3208 +#define IDC_LOADING_DLCPICTUREBACK 3209 +#define IDC_LOADING_DLCDESCRIPTION 3296 +#define IDC_LOADING_DLCPICTURE 3393 +#define IDC_LOADING_DLCSTRIPE 3395 +#define IDC_LOADING_DLCICON 3396 + +#define IDC_LOADING_MAP 999 + +//--- LoadingStart +#define IDC_LOADINGSTART_BLACK 1000 +#define IDC_LOADINGSTART_LOGO 1200 +#define IDC_LOADINGSTART_NOISE 1201 +#define IDC_LOADINGSTART_LOADINGSTART 2310 + +//--- RscDisplayDebriefing +#define IDC_RSCDISPLAYDEBRIEFING_LISTGROUP 21903 //Defined manually +#define IDC_RSCDISPLAYDEBRIEFING_LOACTEMPLATE 21904 +#define IDC_RSCDISPLAYDEBRIEFING_TIMEBACKGROUND 20594 +#define IDC_RSCDISPLAYDEBRIEFING_MAINBACKGROUND 20595 +#define IDC_RSCDISPLAYDEBRIEFING_RATINGBACKGROUND 20596 +#define IDC_RSCDISPLAYDEBRIEFING_PLAYERNAME 20599 +#define IDC_RSCDISPLAYDEBRIEFING_TITLE 20600 +#define IDC_RSCDISPLAYDEBRIEFING_SUBTITLE 20601 +#define IDC_RSCDISPLAYDEBRIEFING_OBJECTIVESBACKGROUND 20602 +#define IDC_RSCDISPLAYDEBRIEFING_STATBACKGROUND 20603 +#define IDC_RSCDISPLAYDEBRIEFING_DESCRIPTIONBACKGROUND 20604 +#define IDC_RSCDISPLAYDEBRIEFING_LOADSBACKGROUND 20605 +#define IDC_RSCDISPLAYDEBRIEFING_RATINGTEXT 20606 +#define IDC_RSCDISPLAYDEBRIEFING_RATING 20607 +#define IDC_RSCDISPLAYDEBRIEFING_RATINGBEST 20608 +#define IDC_RSCDISPLAYDEBRIEFING_TIMETEXT 20609 +#define IDC_RSCDISPLAYDEBRIEFING_TIME 20610 +#define IDC_RSCDISPLAYDEBRIEFING_TIMEBEST 20611 +#define IDC_RSCDISPLAYDEBRIEFING_LOADSTEXT 20612 +#define IDC_RSCDISPLAYDEBRIEFING_LOADS 20613 +#define IDC_RSCDISPLAYDEBRIEFING_LOADSBEST 20614 +#define IDC_RSCDISPLAYDEBRIEFING_DLCOVERVIEWBACKGROUND 20615 +#define IDC_RSCDISPLAYDEBRIEFING_DLCOVERVIEWTEXT 20616 +#define IDC_RSCDISPLAYDEBRIEFING_DLCCOUNTDOWN 20617 +#define IDC_RSCDISPLAYDEBRIEFING_TABSBACKGROUND 20618 +#define IDC_RSCDISPLAYDEBRIEFING_DLCBAR 20619 +#define IDC_RSCDISPLAYDEBRIEFING_DESCRIPTIONTEXT 20693 +#define IDC_RSCDISPLAYDEBRIEFING_CUSTOMTEXT 20694 +#define IDC_RSCDISPLAYDEBRIEFING_SIDE1 20696 +#define IDC_RSCDISPLAYDEBRIEFING_SIDE2 20697 +#define IDC_RSCDISPLAYDEBRIEFING_SIDE3 20698 +#define IDC_RSCDISPLAYDEBRIEFING_SIDE4 20699 +#define IDC_RSCDISPLAYDEBRIEFING_SIDE5 20700 +#define IDC_RSCDISPLAYDEBRIEFING_PICTURE 20793 +#define IDC_RSCDISPLAYDEBRIEFING_MISSIONPICTURE 20794 +#define IDC_RSCDISPLAYDEBRIEFING_DLCOVERVIEWPICTURE 20795 +#define IDC_RSCDISPLAYDEBRIEFING_DLCLOCKICON 20798 +#define IDC_RSCDISPLAYDEBRIEFING_SECTION 21093 +#define IDC_RSCDISPLAYDEBRIEFING_SUMMARY 21893 +#define IDC_RSCDISPLAYDEBRIEFING_DESCRIPTION 21894 +#define IDC_RSCDISPLAYDEBRIEFING_OBJECTIVES 21895 +#define IDC_RSCDISPLAYDEBRIEFING_STAT 21896 +#define IDC_RSCDISPLAYDEBRIEFING_CUSTOM 21897 +#define IDC_RSCDISPLAYDEBRIEFING_DATA 21898 +#define IDC_RSCDISPLAYDEBRIEFING_SIDES 21899 +#define IDC_RSCDISPLAYDEBRIEFING_DLCGENERALGROUP 21900 +#define IDC_RSCDISPLAYDEBRIEFING_LOAC 21901 +#define IDC_RSCDISPLAYDEBRIEFING_DLCBUTTONALLASSETS 21995 +#define IDC_RSCDISPLAYDEBRIEFING_DLCBUTTONKARTS 21996 +#define IDC_RSCDISPLAYDEBRIEFING_DLCBUTTONHELI 21997 +#define IDC_RSCDISPLAYDEBRIEFING_DLCBUTTONMARKSMEN 21998 +#define IDC_RSCDISPLAYDEBRIEFING_DLCBUTTONAPEX 22000 + +//--- RscDisplayDebriefing - DLC item template +#define IDC_RSCDISPLAYDEBRIEFING_ITEMBACKGROUND 20623 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMBACKGROUNDBLACK 20624 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMNAME 20625 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMTEXTSESSIONTIME 20626 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMSESSIONTIME 20627 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMTEXTTOTALTIME 20628 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMTOTALTIME 20629 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMDESCRIPTION 20630 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMPICTURE 20796 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMDLCLOGO 20797 +#define IDC_RSCDISPLAYDEBRIEFING_RSCDISPLAYDEBRIEFING_ITEMTEMPLATE 21902 +#define IDC_RSCDISPLAYDEBRIEFING_BUTTONPURCHASE 21999 + +//--- RscDisplayDebriefing_LOACTemplate +#define IDC_RSCDISPLAYDEBRIEFING_LOACTEMPLATE_BACKGROUND 52605 +#define IDC_RSCDISPLAYDEBRIEFING_LOACTEMPLATE_TITLE 52705 +#define IDC_RSCDISPLAYDEBRIEFING_LOACTEMPLATE_TEXT 52706 +#define IDC_RSCDISPLAYDEBRIEFING_LOACTEMPLATE_PICTURE 52805 +#define IDC_RSCDISPLAYDEBRIEFING_LOACTEMPLATE_TEXTGROUP 53905 + + +//--- RscDebugConsole +#define IDC_RSCDEBUGCONSOLE_TITLE 11884 +#define IDC_RSCDEBUGCONSOLE_EXPRESSIONBACKGROUND 11885 +#define IDC_RSCDEBUGCONSOLE_WATCHBACKGROUND 11886 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUTBACKGROUND1 11887 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUTBACKGROUND2 11888 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUTBACKGROUND3 11889 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUTBACKGROUND4 11890 +#define IDC_RSCDEBUGCONSOLE_LINK 11891 +#define IDC_RSCDEBUGCONSOLE_EXPRESSIONTEXT 11892 +#define IDC_RSCDEBUGCONSOLE_WATCHTEXT 11893 +#define IDC_RSCDEBUGCONSOLE_EXPRESSION 12284 +#define IDC_RSCDEBUGCONSOLE_WATCHINPUT1 12285 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUT1 12286 +#define IDC_RSCDEBUGCONSOLE_WATCHINPUT2 12287 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUT2 12288 +#define IDC_RSCDEBUGCONSOLE_WATCHINPUT3 12289 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUT3 12290 +#define IDC_RSCDEBUGCONSOLE_WATCHINPUT4 12291 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUT4 12293 +#define IDC_RSCDEBUGCONSOLE_RSCDEBUGCONSOLE 13184 +#define IDC_RSCDEBUGCONSOLE_BUTTONCODEPERFORMANCE 13284 +#define IDC_RSCDEBUGCONSOLE_BUTTONEXECUTEALL 13285 +#define IDC_RSCDEBUGCONSOLE_BUTTONEXECUTESERVER 13286 +#define IDC_RSCDEBUGCONSOLE_BUTTONSPECTATORCAMERA 13287 +#define IDC_RSCDEBUGCONSOLE_BUTTONSPLENDIDCAMERA 13288 +#define IDC_RSCDEBUGCONSOLE_BUTTONFUNCTIONS 13289 +#define IDC_RSCDEBUGCONSOLE_BUTTONCONFIG 13290 +#define IDC_RSCDEBUGCONSOLE_BUTTONANIMATIONS 13291 +#define IDC_RSCDEBUGCONSOLE_BUTTONGUI 13292 +#define IDC_RSCDEBUGCONSOLE_BUTTONEXECUTELOCAL 13484 +#define IDC_RSCDEBUGCONSOLE_EXPRESSIONOUTPUT 13190 +#define IDC_RSCDEBUGCONSOLE_EXPRESSIONOUTPUTBACKGROUND 13191 + + + +//--- RscDisplayOptionsLayout +#define IDC_RSCDISPLAYOPTIONSLAYOUT_TITLE 1000 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_BACKGROUND 1001 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_TAGSTEXT 1002 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_PRESETSLABEL 1003 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_MOUSEAREA 1004 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_CENTERW 1005 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_CENTERH 1006 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_TOOLTIP 1100 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_TAGS 2100 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_PRESETS 2101 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_BUTTONSAVE 2400 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_BUTTONOK 2600 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_BUTTONCANCEL 2700 + +//--- RscDisplayRespawn +#define IDC_RSCDISPLAYRESPAWN_TITLE 1000 +#define IDC_RSCDISPLAYRESPAWN_LISTBACKGROUND 1001 +#define IDC_RSCDISPLAYRESPAWN_SECTION 1002 +#define IDC_RSCDISPLAYRESPAWN_BLACK 1003 +#define IDC_RSCDISPLAYRESPAWN_CONTENTBACKGROUND 1004 +#define IDC_RSCDISPLAYRESPAWN_BLACKCONTENT 1005 +#define IDC_RSCDISPLAYRESPAWN_PLAYERSNAME 1006 +#define IDC_RSCDISPLAYRESPAWN_CONTENT 1100 +#define IDC_RSCDISPLAYRESPAWN_LIST 1500 +#define IDC_RSCDISPLAYRESPAWN_CONTENTGROUP 2300 +#define IDC_RSCDISPLAYRESPAWN_BUTTONOK 2600 +#define IDC_RSCDISPLAYRESPAWN_BUTTONCANCEL 2700 + +#define IDC_RSCDISPLAYRESPAWN_MAP 1050 + +//--- RscDisplaySelectIsland +#define IDC_RSCDISPLAYSELECTISLAND_TITLE 1000 +#define IDC_RSCDISPLAYSELECTISLAND_NAME 1002 +#define IDC_RSCDISPLAYSELECTISLAND_AUTHOR 1003 +#define IDC_RSCDISPLAYSELECTISLAND_NAMEBACKGROUND 1004 +#define IDC_RSCDISPLAYSELECTISLAND_ISLANDPANORAMA 1200 +#define IDC_RSCDISPLAYSELECTISLAND_INTERLACING 1201 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD1 1202 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD2 1203 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD3 1204 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD4 1205 +#define IDC_RSCDISPLAYSELECTISLAND_ISLANDGROUP 2300 +#define IDC_RSCDISPLAYSELECTISLAND_BUTTONCONTINUE 2600 +#define IDC_RSCDISPLAYSELECTISLAND_BUTTONCANCEL 2700 + +//--- RscSpectator +#define IDC_RSCSPECTATOR_PLAYERNAMEBACKGROUND 1000 +#define IDC_RSCSPECTATOR_PLAYERGROUP 1001 +#define IDC_RSCSPECTATOR_PLAYERNAME 1002 +#define IDC_RSCSPECTATOR_PLAYERDESCRIPTION 1100 +#define IDC_RSCSPECTATOR_PLAYERICON 1200 +#define IDC_RSCSPECTATOR_PLAYER 2300 + +//--- RscMissionEnd +#define IDC_RSCMISSIONEND_TITLE 8942 +#define IDC_RSCMISSIONEND_SUBTITLE 8943 +#define IDC_RSCMISSIONEND_SIDE1 9045 +#define IDC_RSCMISSIONEND_SIDE2 9046 +#define IDC_RSCMISSIONEND_SIDE3 9047 +#define IDC_RSCMISSIONEND_SIDE4 9048 +#define IDC_RSCMISSIONEND_SIDE5 9049 +#define IDC_RSCMISSIONEND_PICTURE 9142 +#define IDC_RSCMISSIONEND_SIDES 10248 + +//--- RscNotification +#define IDC_RSCNOTIFICATION_TITLE 12135 +#define IDC_RSCNOTIFICATION_PICTUREBACKGROUND 12136 +#define IDC_RSCNOTIFICATION_SCORE 12137 +#define IDC_RSCNOTIFICATION_DESCRIPTIONBACKGROUND 12138 +#define IDC_RSCNOTIFICATION_DESCRIPTION 12235 +#define IDC_RSCNOTIFICATION_PICTURE 12335 +#define IDC_RSCNOTIFICATION_NOTIFICATION 13435 + +#define IDC_RSCNOTIFICATION_NOTIFICATIONAREA 312 + +//--- RscCommMenuItems +#define IDC_RSCCOMMMENUITEMS_SLOT1BACKGROUND 1000 +#define IDC_RSCCOMMMENUITEMS_SLOT2BACKGROUND 1001 +#define IDC_RSCCOMMMENUITEMS_SLOT3BACKGROUND 1002 +#define IDC_RSCCOMMMENUITEMS_SLOT4BACKGROUND 1003 +#define IDC_RSCCOMMMENUITEMS_SLOT5BACKGROUND 1004 +#define IDC_RSCCOMMMENUITEMS_SLOT6BACKGROUND 1005 +#define IDC_RSCCOMMMENUITEMS_SLOT7BACKGROUND 1006 +#define IDC_RSCCOMMMENUITEMS_SLOT8BACKGROUND 1007 +#define IDC_RSCCOMMMENUITEMS_SLOT9BACKGROUND 1008 +#define IDC_RSCCOMMMENUITEMS_SLOT0BACKGROUND 1009 +#define IDC_RSCCOMMMENUITEMS_SLOT1TEXT 1010 +#define IDC_RSCCOMMMENUITEMS_SLOT1 1200 +#define IDC_RSCCOMMMENUITEMS_SLOT2 1201 +#define IDC_RSCCOMMMENUITEMS_SLOT3 1202 +#define IDC_RSCCOMMMENUITEMS_SLOT4 1203 +#define IDC_RSCCOMMMENUITEMS_SLOT5 1204 +#define IDC_RSCCOMMMENUITEMS_SLOT6 1205 +#define IDC_RSCCOMMMENUITEMS_SLOT7 1206 +#define IDC_RSCCOMMMENUITEMS_SLOT8 1207 +#define IDC_RSCCOMMMENUITEMS_SLOT9 1208 +#define IDC_RSCCOMMMENUITEMS_SLOT0 1209 +#define IDC_RSCCOMMMENUITEMS_SLOT2TEXT 1210 +#define IDC_RSCCOMMMENUITEMS_SLOT3TEXT 1211 +#define IDC_RSCCOMMMENUITEMS_SLOT4TEXT 1212 +#define IDC_RSCCOMMMENUITEMS_SLOT5TEXT 1213 +#define IDC_RSCCOMMMENUITEMS_SLOT6TEXT 1214 +#define IDC_RSCCOMMMENUITEMS_SLOT7TEXT 1215 +#define IDC_RSCCOMMMENUITEMS_SLOT8TEXT 1216 +#define IDC_RSCCOMMMENUITEMS_SLOT9TEXT 1217 +#define IDC_RSCCOMMMENUITEMS_SLOT0TEXT 1218 +#define IDC_RSCCOMMMENUITEMS_RSCCOMMMENUITEMS 2300 + +//--- RscRespawnCounter +#define IDC_RSCRESPAWNCOUNTER_MPTABLE 1000 +#define IDC_RSCRESPAWNCOUNTER_TITLE 1001 +#define IDC_RSCRESPAWNCOUNTER_TITLEBACKGROUND 1002 +#define IDC_RSCRESPAWNCOUNTER_PLAYERRESPAWNTIME 1003 +#define IDC_RSCRESPAWNCOUNTER_DESCRIPTION 1100 + +//--- RscFiringDrillTime +#define IDC_RSCFIRINGDRILLTIME_CURRENTBACKGROUND 1100 +#define IDC_RSCFIRINGDRILLTIME_BEST 1101 +#define IDC_RSCFIRINGDRILLTIME_PREVIOUS 1102 +#define IDC_RSCFIRINGDRILLTIME_BONUS 1103 +#define IDC_RSCFIRINGDRILLTIME_CURRENT 1104 +#define IDC_RSCFIRINGDRILLTIME_PENALTY 1105 +#define IDC_RSCFIRINGDRILLTIME_TIME 2300 + +//--- RscFiringDrillCheckpoint +#define IDC_RSCFIRINGDRILLCHECKPOINT_CHECKPOINTBACKGROUND 1000 +#define IDC_RSCFIRINGDRILLCHECKPOINT_TARGETBACKGROUND 1001 +#define IDC_RSCFIRINGDRILLCHECKPOINT_STANCEBACKGROUND 1002 +#define IDC_RSCFIRINGDRILLCHECKPOINT_WEAPONBACKGROUND 1003 +#define IDC_RSCFIRINGDRILLCHECKPOINT_CHECKPOINTTEXT 1004 +#define IDC_RSCFIRINGDRILLCHECKPOINT_TARGETTEXTTOTAL 1005 +#define IDC_RSCFIRINGDRILLCHECKPOINT_TARGETTEXTCURRENT 1006 +#define IDC_RSCFIRINGDRILLCHECKPOINT_CHECKPOINTPICTURE 1200 +#define IDC_RSCFIRINGDRILLCHECKPOINT_STANCEPICTURE 1201 +#define IDC_RSCFIRINGDRILLCHECKPOINT_WEAPONPICTURE 1202 +#define IDC_RSCFIRINGDRILLCHECKPOINT_TARGETPICTURE 1203 +#define IDC_RSCFIRINGDRILLCHECKPOINT_CHECKPOINT 2300 + +//--- RscAdvancedHint +#define IDC_RSCADVANCEDHINT_TITLE 11657 +#define IDC_RSCADVANCEDHINT_HINT 11757 +#define IDC_RSCADVANCEDHINT_HINTGROUP 12957 + +//--- RscSectorCapture +#define IDC_RSCSECTORCAPTURE_WEST 1001 +#define IDC_RSCSECTORCAPTURE_EAST 1002 +#define IDC_RSCSECTORCAPTURE_GUER 1003 +#define IDC_RSCSECTORCAPTURE_CIV 1004 +#define IDC_RSCSECTORCAPTURE_NAME 1005 +#define IDC_RSCSECTORCAPTURE_BACKGROUND 1200 +#define IDC_RSCSECTORCAPTURE_SECTORCAPTURE 2300 + +//--- RscMissionStatus +#define IDC_RSCMISSIONSTATUS_BARBRIDGE 13983 +#define IDC_RSCMISSIONSTATUS_BARWEST 13984 +#define IDC_RSCMISSIONSTATUS_BAREAST 13985 +#define IDC_RSCMISSIONSTATUS_BARGUER 13986 +#define IDC_RSCMISSIONSTATUS_BARCIV 13987 +#define IDC_RSCMISSIONSTATUS_BARUNKNOWN 13988 +#define IDC_RSCMISSIONSTATUS_SLOT1BACKGROUND 13989 +#define IDC_RSCMISSIONSTATUS_SLOT1PROGRESS 13990 +#define IDC_RSCMISSIONSTATUS_SLOT2BACKGROUND 13991 +#define IDC_RSCMISSIONSTATUS_SLOT2PROGRESS 13992 +#define IDC_RSCMISSIONSTATUS_SLOT3BACKGROUND 13993 +#define IDC_RSCMISSIONSTATUS_SLOT3PROGRESS 13994 +#define IDC_RSCMISSIONSTATUS_SLOT4BACKGROUND 13995 +#define IDC_RSCMISSIONSTATUS_SLOT4PROGRESS 13996 +#define IDC_RSCMISSIONSTATUS_SLOT5BACKGROUND 13997 +#define IDC_RSCMISSIONSTATUS_SLOT5PROGRESS 13998 +#define IDC_RSCMISSIONSTATUS_SLOT6BACKGROUND 13999 +#define IDC_RSCMISSIONSTATUS_SLOT6PROGRESS 14000 +#define IDC_RSCMISSIONSTATUS_SLOT7BACKGROUND 14001 +#define IDC_RSCMISSIONSTATUS_SLOT7PROGRESS 14002 +#define IDC_RSCMISSIONSTATUS_SLOT8BACKGROUND 14003 +#define IDC_RSCMISSIONSTATUS_SLOT8PROGRESS 14004 +#define IDC_RSCMISSIONSTATUS_SLOT9BACKGROUND 14005 +#define IDC_RSCMISSIONSTATUS_SLOT9PROGRESS 14006 +#define IDC_RSCMISSIONSTATUS_SLOT0BACKGROUND 14007 +#define IDC_RSCMISSIONSTATUS_SLOT0PROGRESS 14008 +#define IDC_RSCMISSIONSTATUS_SLOT1TEXT 14093 +#define IDC_RSCMISSIONSTATUS_SLOT2TEXT 14094 +#define IDC_RSCMISSIONSTATUS_SLOT3TEXT 14095 +#define IDC_RSCMISSIONSTATUS_SLOT4TEXT 14096 +#define IDC_RSCMISSIONSTATUS_SLOT5TEXT 14097 +#define IDC_RSCMISSIONSTATUS_SLOT6TEXT 14098 +#define IDC_RSCMISSIONSTATUS_SLOT7TEXT 14099 +#define IDC_RSCMISSIONSTATUS_SLOT8TEXT 14100 +#define IDC_RSCMISSIONSTATUS_SLOT9TEXT 14101 +#define IDC_RSCMISSIONSTATUS_SLOT0TEXT 14102 +#define IDC_RSCMISSIONSTATUS_SLOT1 14183 +#define IDC_RSCMISSIONSTATUS_SLOT2 14184 +#define IDC_RSCMISSIONSTATUS_SLOT3 14185 +#define IDC_RSCMISSIONSTATUS_SLOT4 14186 +#define IDC_RSCMISSIONSTATUS_SLOT5 14187 +#define IDC_RSCMISSIONSTATUS_SLOT6 14188 +#define IDC_RSCMISSIONSTATUS_SLOT7 14189 +#define IDC_RSCMISSIONSTATUS_SLOT8 14190 +#define IDC_RSCMISSIONSTATUS_SLOT9 14191 +#define IDC_RSCMISSIONSTATUS_SLOT0 14192 +#define IDC_RSCMISSIONSTATUS_RSCMISSIONSTATUS 15283 + +//--- RscFeedback +#define IDC_RSCFEEDBACK_RSCFEEDBACK 6455 + +//--- RscDisplayCommunityGuide +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_TITLE 29956 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_PLAYERSNAME 29957 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_BRIEFINGNAME 29958 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_AUTHOR 29959 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_OVERVIEWTEXT 30056 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_OVERVIEWPICTURE 30156 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_GUIDELIST 30456 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_OVERVIEWCONTROLSGROUP 31256 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_BUTTONPLAY 31556 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_BUTTONCANCEL 31656 + +//--- RscDisplayArsenal +#define IDC_RSCDISPLAYARSENAL_MOUSEAREA 899 +#define IDC_RSCDISPLAYARSENAL_MOUSEBLOCK 898 +#define IDC_RSCDISPLAYARSENAL_TABS 1800 +#define IDC_RSCDISPLAYARSENAL_FRAMELEFT 1801 +#define IDC_RSCDISPLAYARSENAL_FRAMERIGHT 1802 +#define IDC_RSCDISPLAYARSENAL_LINEICON 1803 +#define IDC_RSCDISPLAYARSENAL_LINETABLEFT 1804 +#define IDC_RSCDISPLAYARSENAL_LINETABLEFTSELECTED 1805 +#define IDC_RSCDISPLAYARSENAL_LINETABRIGHT 1806 +#define IDC_RSCDISPLAYARSENAL_ICON 900 +#define IDC_RSCDISPLAYARSENAL_ICONBACKGROUND 830 +#define IDC_RSCDISPLAYARSENAL_TAB 930 +#define IDC_RSCDISPLAYARSENAL_LIST 960 +#define IDC_RSCDISPLAYARSENAL_SORT 800 +#define IDC_RSCDISPLAYARSENAL_LISTDISABLED 860 +#define IDC_RSCDISPLAYARSENAL_LOAD 990 +#define IDC_RSCDISPLAYARSENAL_LOADCARGO 991 +#define IDC_RSCDISPLAYARSENAL_ARROWLEFT 992 +#define IDC_RSCDISPLAYARSENAL_ARROWRIGHT 993 +#define IDC_RSCDISPLAYARSENAL_BACKGROUNDLEFT 994 +#define IDC_RSCDISPLAYARSENAL_BACKGROUNDRIGHT 995 +#define IDC_RSCDISPLAYARSENAL_MESSAGE 996 + +#define IDC_RSCDISPLAYARSENAL_TAB_PRIMARYWEAPON 0 +#define IDC_RSCDISPLAYARSENAL_TAB_SECONDARYWEAPON 1 +#define IDC_RSCDISPLAYARSENAL_TAB_HANDGUN 2 +#define IDC_RSCDISPLAYARSENAL_TAB_UNIFORM 3 +#define IDC_RSCDISPLAYARSENAL_TAB_VEST 4 +#define IDC_RSCDISPLAYARSENAL_TAB_BACKPACK 5 +#define IDC_RSCDISPLAYARSENAL_TAB_HEADGEAR 6 +#define IDC_RSCDISPLAYARSENAL_TAB_GOGGLES 7 +#define IDC_RSCDISPLAYARSENAL_TAB_NVGS 8 +#define IDC_RSCDISPLAYARSENAL_TAB_BINOCULARS 9 +#define IDC_RSCDISPLAYARSENAL_TAB_MAP 10 +#define IDC_RSCDISPLAYARSENAL_TAB_GPS 11 +#define IDC_RSCDISPLAYARSENAL_TAB_RADIO 12 +#define IDC_RSCDISPLAYARSENAL_TAB_COMPASS 13 +#define IDC_RSCDISPLAYARSENAL_TAB_WATCH 14 +#define IDC_RSCDISPLAYARSENAL_TAB_FACE 15 +#define IDC_RSCDISPLAYARSENAL_TAB_VOICE 16 +#define IDC_RSCDISPLAYARSENAL_TAB_INSIGNIA 17 +#define IDC_RSCDISPLAYARSENAL_TAB_ITEMOPTIC 18 +#define IDC_RSCDISPLAYARSENAL_TAB_ITEMACC 19 +#define IDC_RSCDISPLAYARSENAL_TAB_ITEMMUZZLE 20 +#define IDC_RSCDISPLAYARSENAL_TAB_ITEMBIPOD 25 +#define IDC_RSCDISPLAYARSENAL_TAB_CARGOMAG 21 +#define IDC_RSCDISPLAYARSENAL_TAB_CARGOTHROW 22 +#define IDC_RSCDISPLAYARSENAL_TAB_CARGOPUT 23 +#define IDC_RSCDISPLAYARSENAL_TAB_CARGOMISC 24 +#define IDC_RSCDISPLAYARSENAL_TAB_CARGOMAGALL 26 + +#define IDC_RSCDISPLAYARSENAL_WEAPON_WEAPONBACKGROUND 29489 +#define IDC_RSCDISPLAYARSENAL_WEAPON_WEAPONTEXT 29589 +#define IDC_RSCDISPLAYARSENAL_WEAPON_WEAPON 30789 + +#define IDC_RSCDISPLAYARSENAL_INFO_INFOBACKGROUND 24515 +#define IDC_RSCDISPLAYARSENAL_INFO_INFONAME 24516 +#define IDC_RSCDISPLAYARSENAL_INFO_INFOAUTHOR 24517 +#define IDC_RSCDISPLAYARSENAL_INFO_DLCBACKGROUND 24518 +#define IDC_RSCDISPLAYARSENAL_INFO_DLCICON 24715 +#define IDC_RSCDISPLAYARSENAL_INFO_INFO 25815 + +#define IDC_RSCDISPLAYARSENAL_STATS_STATSBACKGROUND 27347 +#define IDC_RSCDISPLAYARSENAL_STATS_STAT1 27348 +#define IDC_RSCDISPLAYARSENAL_STATS_STAT2 27349 +#define IDC_RSCDISPLAYARSENAL_STATS_STAT3 27350 +#define IDC_RSCDISPLAYARSENAL_STATS_STAT4 27351 +#define IDC_RSCDISPLAYARSENAL_STATS_STAT5 27352 +#define IDC_RSCDISPLAYARSENAL_STATS_STATTEXT1 27353 +#define IDC_RSCDISPLAYARSENAL_STATS_STATTEXT2 27354 +#define IDC_RSCDISPLAYARSENAL_STATS_STATTEXT3 27355 +#define IDC_RSCDISPLAYARSENAL_STATS_STATTEXT4 27356 +#define IDC_RSCDISPLAYARSENAL_STATS_STATTEXT5 27357 +#define IDC_RSCDISPLAYARSENAL_STATS_STATS 28644 + +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_CONTROLBAR 44046 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONSAVE 44146 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONLOAD 44147 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONEXPORT 44148 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONIMPORT 44149 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONRANDOM 44150 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONINTERFACE 44151 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONOK 44346 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONTRY 44347 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONCLOSE 44448 + +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_TITLE 34619 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_COLUMN1 34620 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_TEXTNAME 34621 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_MAINBACKGROUND 34622 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_COLUMN2 34623 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_COLUMN3 34624 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_COLUMN4 34625 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_COLUMN5 34626 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_EDITNAME 35020 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_VALUENAME 35119 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_TEMPLATE 35919 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_BUTTONOK 36019 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_BUTTONCANCEL 36020 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_BUTTONDELETE 36021 + +#define IDC_RSCDISPLAYARSENAL_SPACE_SPACEARSENALBACKGROUND 26603 +#define IDC_RSCDISPLAYARSENAL_SPACE_SPACEGARAGEBACKGROUND 26604 +#define IDC_RSCDISPLAYARSENAL_SPACE_SPACEARSENAL 26803 +#define IDC_RSCDISPLAYARSENAL_SPACE_SPACEGARAGE 26804 +#define IDC_RSCDISPLAYARSENAL_SPACE_SPACE 27903 + +//--- RscDisplayGarage +#define IDC_RSCDISPLAYGARAGE_TAB_CAR 0 +#define IDC_RSCDISPLAYGARAGE_TAB_ARMOR 1 +#define IDC_RSCDISPLAYGARAGE_TAB_HELI 2 +#define IDC_RSCDISPLAYGARAGE_TAB_PLANE 3 +#define IDC_RSCDISPLAYGARAGE_TAB_NAVAL 4 +#define IDC_RSCDISPLAYGARAGE_TAB_STATIC 5 + +#define IDC_RSCDISPLAYGARAGE_TAB_SUBCREW 18 //--- Match he numbers with Arsenal right panel IDCs +#define IDC_RSCDISPLAYGARAGE_TAB_SUBANIMATION 19 +#define IDC_RSCDISPLAYGARAGE_TAB_SUBTEXTURE 20 + +#define IDC_RSCDISPLAYGARAGE3DEN_TAB_SUBANIMATION 0 +#define IDC_RSCDISPLAYGARAGE3DEN_TAB_SUBTEXTURE 1 + +//--- RscDisplayCreateJIRAIssue +#define IDC_RSCDISPLAYCREATEJIRAISSUE_BACKGROUND 29997 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_SCREENSHOTPATHTITLE 29998 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_TITLE 30097 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_BUTTONMISSION 30098 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_BUTTONMAP 30099 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_BUTTONOBJECT 30100 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_BUTTONEMPTY 30101 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_SCREENSHOTPATH 30397 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_BUTTONCANCEL 31697 + +//--- RscDisplayDLCContentBrowser - main display +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_TITLEBACKGROUND 37179 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_MAINBACKGROUND 37180 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_TITLE 37099 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_PLAYERSNAME 37100 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONCANCEL 38799 //MUF - todo - was exported, but not added to config +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_LISTGROUP 38400 +//--- RscDisplayDLCContentBrowser - General +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_OVERVIEWBACKGROUND 37101 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_OVERVIEWTEXT 37102 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_TABSBACKGROUND 37106 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_OVERVIEWDLCNAME 37137 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_OVERVIEWPICTURE 37299 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_GENERALGROUP 38399 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONASSETS 38499 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONSINGLEPLAYER 38500 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONMULTIPLAYER 38501 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONFEATURES 38502 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONPURCHASE 38503 +//--- RscDisplayDLCContentBrowser - item template +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMBACKGROUND 37129 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMBACKGROUNDBLACK 37130 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMNAME 37131 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMTEXTSESSIONTIME 37132 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMSESSIONTIME 37133 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMTEXTTOTALTIME 37134 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMTOTALTIME 37135 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMDESCRIPTION 37136 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMPICTURE 37300 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMPREMIUMICON 37311 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_RSCDISPLAYDLCCONTENTBROWSER_ITEMTEMPLATE 38401 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONTRY 38504 +//--- RscDisplayDLCContentBrowser - dlc selection group +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_KARTSPURCHASED 37103 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_HELIPURCHASED 37104 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_MARKSMENPURCHASED 37105 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_KARTSBACKGROUND 37108 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_KARTSNAME 37109 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_HELIBACKGROUND 37110 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_HELINAME 37111 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_MARKSMENBACKGROUND 37112 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_MARKSMENNAME 37113 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUNDLEBACKGROUND 37114 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUNDLENAME 37115 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_KARTSLOGO 37301 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_HELILOGO 37302 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_MARKSMENLOGO 37303 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUNDLELOGO 37304 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_KARTSOVERLAY 37305 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_HELIOVERLAY 37306 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_MARKSMENOVERLAY 37307 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUNDLEOVERLAY 37308 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLCSELECTIONGROUP 38402 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_APEXBACKGROUND 37116 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_APEXNAME 37117 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_APEXPURCHASED 37118 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_APEXLOGO 37309 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_APEXOVERLAY 37310 + + +//--- GroundSupport_ProcedureVisualization +#define IDC_GROUNDSUPPORT_PROCEDUREVISUALIZATION_PROGRESS 68374 +#define IDC_GROUNDSUPPORT_PROCEDUREVISUALIZATION_TEXT 68375 + +//--- RscDisplaySelectIsland +#define IDC_RSCDISPLAYSELECTISLAND_TITLE 24691 +#define IDC_RSCDISPLAYSELECTISLAND_NAME 24693 +#define IDC_RSCDISPLAYSELECTISLAND_AUTHOR 24694 +#define IDC_RSCDISPLAYSELECTISLAND_NAMEBACKGROUND 24695 +#define IDC_RSCDISPLAYSELECTISLAND_ISLANDPANORAMA 24891 +#define IDC_RSCDISPLAYSELECTISLAND_INTERLACING 24892 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD1 24893 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD2 24894 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD3 24895 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD4 24896 +#define IDC_RSCDISPLAYSELECTISLAND_ISLANDGROUP 25991 +#define IDC_RSCDISPLAYSELECTISLAND_BUTTONCONTINUE3D 26091 +#define IDC_RSCDISPLAYSELECTISLAND_BUTTONCONTINUE 26291 +#define IDC_RSCDISPLAYSELECTISLAND_BUTTONCANCEL 26391 + +//--- RscDisplayPurchaseNotification +#define IDC_RSCDISPLAYPURCHASENOTIFICATION_TITLE 46662 +#define IDC_RSCDISPLAYPURCHASENOTIFICATION_TEXT 46663 +#define IDC_RSCDISPLAYPURCHASENOTIFICATION_DLCLIST 46762 +#define IDC_RSCDISPLAYPURCHASENOTIFICATION_PNPICTURE 46862 +#define IDC_RSCDISPLAYPURCHASENOTIFICATION_PNCONTROLSGROUP 47962 +#define IDC_RSCDISPLAYPURCHASENOTIFICATION_BUTTONOK 48262 + +//--- RscDiary +#define IDC_TASKTOOLTIP 47060 +#define IDC_TASKTOOLTIP_BACKGROUND 47061 +#define IDC_TASKTOOLTIP_TITLE 47062 +#define IDC_TASKTOOLTIP_SUBTITLE 47063 +#define IDC_TASKTOOLTIP_BUTTON 47064 +#define IDC_TASKTOOLTIP_ASSIGNEDICON 47065 +#define IDC_TASKTOOLTIP_ASSIGNEDCOUNTER 47066 + +//--- RscRespawnControlsGroup +#define IDC_RSCRESPAWNCONTROLS_RESPAWNCONTROLSGROUP 88800 +#define IDC_RSCRESPAWNCONTROLS_LOCBACKGROUND 88802 +#define IDC_RSCRESPAWNCONTROLS_ROLEBACKGROUND 88803 +#define IDC_RSCRESPAWNCONTROLS_GEARBACKGROUND 88804 +#define IDC_RSCRESPAWNCONTROLS_HEADERBACKGROUND 88801 +#define IDC_RSCRESPAWNCONTROLS_BUTTONSPECTATE 88811 +#define IDC_RSCRESPAWNCONTROLS_LOCLIST 88808 +#define IDC_RSCRESPAWNCONTROLS_ROLELIST 88809 +#define IDC_RSCRESPAWNCONTROLS_COUNTERTEXT 88826 +#define IDC_RSCRESPAWNCONTROLS_COUNTER 88806 +#define IDC_RSCRESPAWNCONTROLS_AUTORESPAWN 88830 +#define IDC_RSCRESPAWNCONTROLS_TEAMTEXT 88827 +#define IDC_RSCRESPAWNCONTROLS_TEAM 88805 +#define IDC_RSCRESPAWNCONTROLS_TICKETSTEXT 88828 +#define IDC_RSCRESPAWNCONTROLS_TICKETS 88807 +#define IDC_RSCRESPAWNCONTROLS_HEADERRESPAWNBUTTON 88829 +#define IDC_RSCRESPAWNCONTROLS_WARNING 88831 +#define IDC_RSCRESPAWNCONTROLS_COMBOLOADOUT 88813 +#define IDC_RSCRESPAWNCONTROLS_BUTTONDETAILS 88814 +#define IDC_RSCRESPAWNCONTROLS_BACKGROUNDPRIMARYWEAPON 88822 +#define IDC_RSCRESPAWNCONTROLS_BACKGROUNDSECONDARYWEAPON 88823 +#define IDC_RSCRESPAWNCONTROLS_BACKGROUNDOPTICS 88824 +#define IDC_RSCRESPAWNCONTROLS_BACKGROUNDITEM 88825 +#define IDC_RSCRESPAWNCONTROLS_PICTUREPRIMARYWEAPON 88815 +#define IDC_RSCRESPAWNCONTROLS_PICTURESECONDARYWEAPON 88816 +#define IDC_RSCRESPAWNCONTROLS_PICTUREOPTICS 88817 +#define IDC_RSCRESPAWNCONTROLS_PICTUREITEM 88818 +#define IDC_RSCRESPAWNCONTROLS_LOCTITLE 88819 +#define IDC_RSCRESPAWNCONTROLS_ROLETITLE 88820 +#define IDC_RSCRESPAWNCONTROLS_GEARTITLE 88821 +#define IDC_RSCRESPAWNCONTROLS_LOCDISABLED 88832 +#define IDC_RSCRESPAWNCONTROLS_ROLEDISABLED 88833 +#define IDC_RSCRESPAWNCONTROLS_LOADOUTDISABLED 88834 + +#define IDC_RSCRESPAWNCONTROLS_RESPAWNDETAILSCONTROLSGROUP 88850 +#define IDC_RSCRESPAWNCONTROLS_BACKGROUNDDETAILS 88851 +#define IDC_RSCRESPAWNCONTROLS_DETAILSTITLE 88852 +#define IDC_RSCRESPAWNCONTROLS_BUTTONDETAILSCLOSE 88853 + +#define IDC_RSCRESPAWNCONTROLS_RESPAWNDETAILSLISTCONTROLSGROUP 88860 +#define IDC_RSCRESPAWNCONTROLS_DETAILSLIST 88861 + +#define IDC_RSCRESPAWNCONTROLS_OVERHEADERBACKGROUND 88870 +#define IDC_RSCRESPAWNCONTROLS_OVERHEADERLEFT 88871 +#define IDC_RSCRESPAWNCONTROLS_OVERHEADERRIGHT 88872 + +#define IDC_RSCRESPAWNCONTROLS_REVIVEINFO 88874 +#define IDC_RSCRESPAWNCONTROLS_REVIVEINFO_TITLE 88875 +#define IDC_RSCRESPAWNCONTROLS_REVIVEINFO_OPTION 88876 + +#define IDC_RSCRESPAWNCONTROLS_RESPAWNINFO 88877 +#define IDC_RSCRESPAWNCONTROLS_RESPAWNINFO_TITLE 88878 +#define IDC_RSCRESPAWNCONTROLS_RESPAWNINFO_OPTION 88879 + +//--- RscRevive +#define IDC_RSCREVIVE_REVIVEPROGRESSBACKGROUND 4817 +#define IDC_RSCREVIVE_REVIVEPROGRESS 4818 +#define IDC_RSCREVIVE_REVIVEKEYPROGRESS 4819 +#define IDC_RSCREVIVE_REVIVEBAR 4820 +#define IDC_RSCREVIVE_REVIVETEXT 4917 +#define IDC_RSCREVIVE_REVIVECOUNTDOWN 4918 +#define IDC_RSCREVIVE_REVIVEINFO 4919 +#define IDC_RSCREVIVE_REVIVEKEYBACKGROUND 4920 +#define IDC_RSCREVIVE_REVIVEKEY 4921 +#define IDC_RSCREVIVE_REVIVEMEDIKIT 5017 +#define IDC_RSCREVIVE_REVIVEMEDIKITPROGRESS 5018 +#define IDC_RSCREVIVE_REVIVEDEATH 5019 +#define IDC_RSCREVIVE_REVIVERESPAWN 6117 +#define IDC_RSCREVIVE_REVIVETEXT2 6118 + +//--- DynamicGroups +#define IDC_DYNAMICGROUPS_HEADER 9377 +#define IDC_DYNAMICGROUPS_BACKGROUNDMANAGE 9379 +#define IDC_DYNAMICGROUPS_TEXTPLAYERNAME 9380 +#define IDC_DYNAMICGROUPS_BACKGROUNDGROUPNAME 9381 +#define IDC_DYNAMICGROUPS_BACKGROUNDPLAYERS 9382 +#define IDC_DYNAMICGROUPS_TEXTPLAYERSIDE 9383 +#define IDC_DYNAMICGROUPS_TEXTPLAYERCOUNT 9384 +#define IDC_DYNAMICGROUPS_TEXTPLAYERSCORE 9386 +#define IDC_DYNAMICGROUPS_TEXTPLAYERNAMEFILL 9387 +#define IDC_DYNAMICGROUPS_TEXTPLAYERSIDEFILL 9388 +#define IDC_DYNAMICGROUPS_TEXTPLAYERSCOREFILL 9389 +#define IDC_DYNAMICGROUPS_TEXTPRIVATE 9390 +#define IDC_DYNAMICGROUPS_GROUPICON 9577 +#define IDC_DYNAMICGROUPS_PICTURESIDE 9578 +#define IDC_DYNAMICGROUPS_EDITGROUPNAME 9777 +#define IDC_DYNAMICGROUPS_LISTBOXGROUPS 9877 +#define IDC_DYNAMICGROUPS_LISTBOXMANAGE 9878 +#define IDC_DYNAMICGROUPS_LISTBOXPLAYERS 9880 +#define IDC_DYNAMICGROUPS_BUTTONJOIN 9977 +#define IDC_DYNAMICGROUPS_BUTTONCREATELEAVEKICK 9978 +#define IDC_DYNAMICGROUPS_BUTTONPROMOTEDISBAND 9979 +#define IDC_DYNAMICGROUPS_BUTTONINVITE 9980 +#define IDC_DYNAMICGROUPS_TABBUTTONGROUPS 9981 +#define IDC_DYNAMICGROUPS_TABBUTTONPLAYERS 9983 +#define IDC_DYNAMICGROUPS_SECTIONMANAGE 10677 +#define IDC_DYNAMICGROUPS_SECTIONGROUPS 10679 +#define IDC_DYNAMICGROUPS_CHECKBOXPRIVATE 11177 + +//--- RscHvtPhase +#define IDC_RSCHVTPHASE_PERSISTENT 6610 +#define IDC_RSCHVTPHASE_DYNAMIC 6611 +#define IDC_RSCHVTPHASE_DOWNLOADTITLE 6612 +#define IDC_RSCHVTPHASE_DOWNLOADCONTENT 6613 +#define IDC_RSCHVTPHASE_MULTIPLIER 6614 +#define IDC_RSCHVTPHASE_RANGEBACKGROUND 6615 +#define IDC_RSCHVTPHASE_TIMER 6616 +#define IDC_RSCHVTPHASE_PROGRESSBAR 6620 +#define IDC_RSCHVTPHASE_DOWNLOADSPEED 6621 +#define IDC_RSCHVTPHASE_RANGE 6810 +#define IDC_RSCHVTPHASE_CARRIERPICTURE 6811 +#define IDC_RSCHVTPHASE_DOWNLOAD 7910 + +//--- RscPhaseRules +#define IDC_RSCPHASERULES_PHASE1NUMBER 9131 +#define IDC_RSCPHASERULES_PHASE1TEXT 9132 +#define IDC_RSCPHASERULES_PHASE2TEXT 9133 +#define IDC_RSCPHASERULES_PHASE2NUMBER 9134 +#define IDC_RSCPHASERULES_PHASE3TEXT 9135 +#define IDC_RSCPHASERULES_PHASE3NUMBER 9136 +#define IDC_RSCPHASERULES_PHASE1INFO 9137 +#define IDC_RSCPHASERULES_PHASE2INFO 9138 +#define IDC_RSCPHASERULES_PHASE3INFO 9139 +#define IDC_RSCPHASERULES_PHASERULES 10431 + +//--- RscDisplayEGSpectator +#define IDD_RSCDISPLAYEGSPECTATOR 60492 +#define IDC_RSCDISPLAYEGSPECTATOR_GAMETIMETEXT 42609 +#define IDC_RSCDISPLAYEGSPECTATOR_GAMEPHASETEXT 48610 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEBBACKGROUND 42611 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEATASK 42612 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEABACKGROUND 42613 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEBTASK 42614 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEACOLORBACKGROUND 42615 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEBCOLORBACKGROUND 42616 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEACOLOR 42617 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEBCOLOR 42618 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEAPROGRESSGROUP 48909 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEBPROGRESSGROUP 43910 +#define IDC_RSCDISPLAYEGSPECTATOR_MOUSEHANDLER 42989 +#define IDC_RSCDISPLAYEGSPECTATOR_TABS 43609 +#define IDC_RSCDISPLAYEGSPECTATOR_LIST 43109 +#define IDC_RSCDISPLAYEGSPECTATOR_LISTGROUP 43909 +#define IDC_RSCDISPLAYEGSPECTATOR_CAMERATYPESBACKGROUND 52610 +#define IDC_RSCDISPLAYEGSPECTATOR_FREE 52809 +#define IDC_RSCDISPLAYEGSPECTATOR_FOLLOW 52810 +#define IDC_RSCDISPLAYEGSPECTATOR_FPS 52811 +#define IDC_RSCDISPLAYEGSPECTATOR_CAMERATYPESGROUP 52909 +#define IDC_RSCDISPLAYEGSPECTATOR_MAP 62609 +#define IDC_RSCDISPLAYEGSPECTATOR_MAPHEADER 62610 +#define IDC_RSCDISPLAYEGSPECTATOR_MAPFOOTER 62611 +#define IDC_RSCDISPLAYEGSPECTATOR_MAPTITLE 62612 +#define IDC_RSCDISPLAYEGSPECTATOR_SPECTATORSCOUNT 62613 +#define IDC_RSCDISPLAYEGSPECTATOR_SPECTATORSICON 62809 +#define IDC_RSCDISPLAYEGSPECTATOR_MAPGROUP 63909 +#define IDC_RSCDISPLAYEGSPECTATOR_HELPBACKGROUND 72812 +#define IDC_RSCDISPLAYEGSPECTATOR_HELP 73189 +#define IDC_RSCDISPLAYEGSPECTATOR_UPPERBACKGROUND 82609 +#define IDC_RSCDISPLAYEGSPECTATOR_NAME 82610 +#define IDC_RSCDISPLAYEGSPECTATOR_LOWERLEFTBACKGROUND 82611 +#define IDC_RSCDISPLAYEGSPECTATOR_LOWERRIGHTBACKGROUND 82612 +#define IDC_RSCDISPLAYEGSPECTATOR_AVATARBACKGROUND 82613 +#define IDC_RSCDISPLAYEGSPECTATOR_KILLS_COUNT 82614 +#define IDC_RSCDISPLAYEGSPECTATOR_LANDKILLS_COUNT 82615 +#define IDC_RSCDISPLAYEGSPECTATOR_ARMOREDKILLS_COUNT 82616 +#define IDC_RSCDISPLAYEGSPECTATOR_AIRKILLS_COUNT 82617 +#define IDC_RSCDISPLAYEGSPECTATOR_DEATHS_COUNT 82618 +#define IDC_RSCDISPLAYEGSPECTATOR_TOTAL_COUNT 82619 +#define IDC_RSCDISPLAYEGSPECTATOR_AVATAR 82809 +#define IDC_RSCDISPLAYEGSPECTATOR_UNITTYPE 82810 +#define IDC_RSCDISPLAYEGSPECTATOR_KILLS 82811 +#define IDC_RSCDISPLAYEGSPECTATOR_LANDKILLS 82812 +#define IDC_RSCDISPLAYEGSPECTATOR_ARMOREDKILLS 82813 +#define IDC_RSCDISPLAYEGSPECTATOR_AIRKILLS 82814 +#define IDC_RSCDISPLAYEGSPECTATOR_DEATHS 82815 +#define IDC_RSCDISPLAYEGSPECTATOR_TOTAL 82816 +#define IDC_RSCDISPLAYEGSPECTATOR_WEAPONPICTURE 82817 +#define IDC_RSCDISPLAYEGSPECTATOR_VEHICLETYPE 82818 +#define IDC_RSCDISPLAYEGSPECTATOR_FOCUSINFO 83909 + +//--- RscEGProgress +#define IDC_RSCEGPROGRESS_DOWNLOADICONBACKGROUND 9170 +#define IDC_RSCEGPROGRESS_OBJECTIVELETTER 9171 +#define IDC_RSCEGPROGRESS_ACTIVITYBACKGROUND 9172 +#define IDC_RSCEGPROGRESS_PROGRESSBARBACKGROUND 9173 +#define IDC_RSCEGPROGRESS_TITLE 9174 +#define IDC_RSCEGPROGRESS_PROGRESSBAR 9180 +#define IDC_RSCEGPROGRESS_OBJECTIVEBACKGROUND 9370 +#define IDC_RSCEGPROGRESS_ACTIVITY 9372 +#define IDC_RSCEGPROGRESS_DOWNLOADICON 9374 +#define IDC_RSCEGPROGRESS_OBJECTIVEBACKGROUNDCOLOURED 9375 +#define IDC_RSCEGPROGRESS_DOWNLOAD 9376 + +//--- RscDisplayQuickPlay +#define IDC_RSCDISPLAYQUICKPLAY_TITLE 18702 +#define IDC_RSCDISPLAYQUICKPLAY_PLAYERSNAME 18703 +#define IDC_RSCDISPLAYQUICKPLAY_MODTEXT 18704 +#define IDC_RSCDISPLAYQUICKPLAY_CONTENTBACKGROUND 18705 +#define IDC_RSCDISPLAYQUICKPLAY_MAXPINGTEXT 18706 +#define IDC_RSCDISPLAYQUICKPLAY_BESTMATCHTEXT 18707 +#define IDC_RSCDISPLAYQUICKPLAY_MODBACKGROUND 18708 +#define IDC_RSCDISPLAYQUICKPLAY_GAMETYPEDESCRIPTION 18713 +#define IDC_RSCDISPLAYQUICKPLAY_GAMETYPETITLEBACKGROUND 18714 +#define IDC_RSCDISPLAYQUICKPLAY_GAMETYPETITLE 18715 +#define IDC_RSCDISPLAYQUICKPLAY_GAMETYPEOVERVIEW 18903 +#define IDC_RSCDISPLAYQUICKPLAY_GAMETYPEDESCRIPTIONBACKGROUND 18904 +#define IDC_RSCDISPLAYQUICKPLAY_MODICON 18905 +#define IDC_RSCDISPLAYQUICKPLAY_CONTENT 20002 +#define IDC_RSCDISPLAYQUICKPLAY_BUTTONBACK 20402 + +//--- RscDisplayCampaignLobby (Scripted campaign lobby) +#define IDD_CAMPAIGN_LOBBY 50000 +#define IDC_CAMPAIGN_LOBBY_BACKGROUND_FULL_GROUP 51000 +#define IDC_CAMPAIGN_LOBBY_BACKGROUND_GROUP 51100 +#define IDC_CAMPAIGN_LOBBY_BACKGROUND_LOADING_GROUP 51200 +#define IDC_CAMPAIGN_LOBBY_BACKGROUND_BORDER_GROUP 51300 +#define IDC_CAMPAIGN_LOBBY_TABLET_GROUP 52000 +#define IDC_CAMPAIGN_LOBBY_TABLET_BUTTON_GROUP 52100 +#define IDC_CAMPAIGN_LOBBY_TABLET_BUTTON_SEARCH_GROUP 52200 +#define IDC_CAMPAIGN_LOBBY_TABLET_BUTTON_SETTINGS_GROUP 52300 +#define IDC_CAMPAIGN_LOBBY_TABLET_BUTTON_RESPAWN_GROUP 52400 +#define IDC_CAMPAIGN_LOBBY_TABLET_BUTTON_REVIVE_GROUP 52500 +#define IDC_CAMPAIGN_LOBBY_TABLET_MILITARY_GROUP 52600 +#define IDC_CAMPAIGN_LOBBY_MAIN_GROUP 53000 +#define IDC_CAMPAIGN_LOBBY_CTRG_TREE_GROUP 53100 +#define IDC_CAMPAIGN_LOBBY_CTRG_TREE_HEADER_GROUP 53200 +#define IDC_CAMPAIGN_LOBBY_CTRG_TREE_STRUCTURE_GROUP 53300 +#define IDC_CAMPAIGN_LOBBY_CTRG_TREE_OPTION_CORE_GROUP 53400 +#define IDC_CAMPAIGN_LOBBY_CTRG_TREE_OPTION_GROUP 53500 +#define IDC_CAMPAIGN_LOBBY_LOGIN_GROUP 54100 +#define IDC_CAMPAIGN_LOBBY_ACCESS_KEY_GROUP 54200 +#define IDC_CAMPAIGN_LOBBY_MISSION_GROUP 54300 +#define IDC_CAMPAIGN_LOBBY_MISSION_VIDEO_GROUP 54400 +#define IDC_CAMPAIGN_LOBBY_MISSION_INTEL_GROUP 54500 +#define IDC_CAMPAIGN_LOBBY_MISSION_OVERLAY_GROUP 54600 +#define IDC_CAMPAIGN_LOBBY_MISSION_PLAYER_CORE_GROUP 55000 +#define IDC_CAMPAIGN_LOBBY_MISSION_PLAYER_GROUP 55100 +#define IDC_CAMPAIGN_LOBBY_PROGRESS_GROUP 56000 +#define IDC_CAMPAIGN_LOBBY_OVERLAY_GROUP 57000 + +// RscDisplayDLCContentBrowser +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_PICTUREBACKGROUND 2000 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_PICTURE 2001 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_VIDEOGROUP 2002 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_VIDEO 2003 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_ICON 2004 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_LINEL 2005 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_LINER 2006 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_LINET 2007 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_LINEB 2008 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_BUTTON 2009 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_TITLE 2010 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_HOVER 2011 + +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_MOUSEAREA 999 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLCGROUP 1001 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLCBACKGROUND 1002 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONBACKGROUND 1003 + +//--- RscDisplayDLCPreview_List +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_BACKGROUND 31263 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_INFOTITLE 31264 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_BACKGROUNDBOTTOM 31266 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_INFO 31363 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_INFOSTATS 31364 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREANIM 31463 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTURE 31464 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_BROWSEPREV 31465 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_BROWSENEXT 31466 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREANIMOVERLAY 31467 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREOVERLAY 31468 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREANIMOVERLAYICON 31469 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREOVERLAYICON 31470 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREBACKGROUND 31471 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREANIMBACKGROUND 31472 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREGROUP 32563 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTURELISTGROUP 32564 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_INFOGROUP 32565 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_BUTTONTRY 32663 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_BUTTONPURCHASE 32664 + +//--- RscDisplayDLCPreview_ListItem +#define IDC_RSCDISPLAYDLCPREVIEW_LISTITEM_SELECT 41883 +#define IDC_RSCDISPLAYDLCPREVIEW_LISTITEM_HOVER 41884 +#define IDC_RSCDISPLAYDLCPREVIEW_LISTITEM_PICTURE 42083 +#define IDC_RSCDISPLAYDLCPREVIEW_LISTITEM_SESSIONNOTIFICATION 42084 +#define IDC_RSCDISPLAYDLCPREVIEW_LISTITEM_BACKGROUND 42085 +#define IDC_RSCDISPLAYDLCPREVIEW_LISTITEM_BUTTON 42483 +#define IDC_RSCDISPLAYDLCPREVIEW_LISTITEM_RSCDISPLAYDLCPREVIEW_LISTITEM 43183 + +//--- RscDisplayDLCPreview +#define IDC_RSCDISPLAYDLCPREVIEW_BACKGROUND 1001 +#define IDC_RSCDISPLAYDLCPREVIEW_LOGO 1002 +#define IDC_RSCDISPLAYDLCPREVIEW_OVERVIEW 1003 +#define IDC_RSCDISPLAYDLCPREVIEW_PREVIEWGROUP 1004 +#define IDC_RSCDISPLAYDLCPREVIEW_PREVIEWBACKGROUND 1005 +#define IDC_RSCDISPLAYDLCPREVIEW_BUTTONBACKGROUND 1006 +#define IDC_RSCDISPLAYDLCPREVIEW_BUTTONPURCHASE 1007 +#define IDC_RSCDISPLAYDLCPREVIEW_AUTHOR 1008 +#define IDC_RSCDISPLAYDLCPREVIEW_LISTGROUP 1009 +#define IDC_RSCDISPLAYDLCPREVIEW_BOHEMIA 1010 + +//--- RscDisplayTimeline +#define IDD_RSCDISPLAYTIMELINE 15000 + +//--- RscDisplayTimeline +#define IDC_RSCDISPLAYTIMELINE_BACKGROUND 16985 +#define IDC_RSCDISPLAYTIMELINE_TEXTTIME 17085 +#define IDC_RSCDISPLAYTIMELINE_TEXTPLAYRATE 17086 +#define IDC_RSCDISPLAYTIMELINE_BUTTONPLAYFORWARD 17585 +#define IDC_RSCDISPLAYTIMELINE_BUTTONPLAYBACKWARD 17586 +#define IDC_RSCDISPLAYTIMELINE_BUTTONPAUSE 17587 +#define IDC_RSCDISPLAYTIMELINE_BUTTONDECREASEPLAYRATE 17588 +#define IDC_RSCDISPLAYTIMELINE_BUTTONINCREASEPLAYRATE 17589 +#define IDC_RSCDISPLAYTIMELINE_LIST 18085 +#define IDC_RSCDISPLAYTIMELINE_TIMELINECONTROLS 18285 diff --git a/sqfc.json b/sqfc.json index f56495919c..f3695e5f12 100644 --- a/sqfc.json +++ b/sqfc.json @@ -11,7 +11,7 @@ "\\xeh_prep.sqf", "\\backwards_comp.sqf", "settings\\gui_createcategory.sqf", - "diagnostic\\fnc_initextendeddebugconsole.sqf", + "diagnostic\\fnc_isdebugconsoleallowed.sqf", "xeh\\fnc_initdisplay.sqf", "xeh\\fnc_startloadingscreen.sqf", "xeh\\fnc_endloadingscreen.sqf" From d46dea2f462cb50714381293ed6d1953598c2263 Mon Sep 17 00:00:00 2001 From: "eugene.tretyak" Date: Tue, 27 Jul 2021 18:06:35 +0300 Subject: [PATCH 010/111] Add option to replace launcher magazine to disposable in backpack --- addons/disposable/XEH_preInit.sqf | 6 ++++++ addons/disposable/fnc_replaceMagazineCargo.sqf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/disposable/XEH_preInit.sqf b/addons/disposable/XEH_preInit.sqf index 1bf757187c..4a8d361678 100644 --- a/addons/disposable/XEH_preInit.sqf +++ b/addons/disposable/XEH_preInit.sqf @@ -27,6 +27,7 @@ GVAR(NormalLaunchers) = [] call CBA_fnc_createNamespace; GVAR(LoadedLaunchers) = [] call CBA_fnc_createNamespace; GVAR(UsedLaunchers) = [] call CBA_fnc_createNamespace; GVAR(magazines) = []; +GVAR(BackpackReplaceableMagazines) = []; GVAR(MagazineLaunchers) = [] call CBA_fnc_createNamespace; private _cfgWeapons = configFile >> "CfgWeapons"; @@ -35,6 +36,7 @@ private _cfgMagazines = configFile >> "CfgMagazines"; { private _launcher = configName _x; private _magazine = configName (_cfgMagazines >> (getArray (_cfgWeapons >> _launcher >> "magazines") select 0)); + private _replaceInBackpack = [_cfgMagazines >> _magazine, QGVAR(launcherFitsBackpack), 0] call BIS_fnc_returnConfigEntry > 0; getArray _x params ["_loadedLauncher", "_usedLauncher"]; GVAR(LoadedLaunchers) setVariable [_launcher, _loadedLauncher]; @@ -48,6 +50,10 @@ private _cfgMagazines = configFile >> "CfgMagazines"; GVAR(MagazineLaunchers) setVariable [_magazine, _loadedLauncher]; }; + if (_replaceInBackpack) then { + GVAR(BackpackReplaceableMagazines) pushBackUnique _magazine; + }; + // check if mass entries add up private _massLauncher = getNumber (_cfgWeapons >> _launcher >> "WeaponSlotsInfo" >> "mass"); private _massMagazine = getNumber (_cfgMagazines >> _magazine >> "mass"); diff --git a/addons/disposable/fnc_replaceMagazineCargo.sqf b/addons/disposable/fnc_replaceMagazineCargo.sqf index a01682b111..08f2032d9a 100644 --- a/addons/disposable/fnc_replaceMagazineCargo.sqf +++ b/addons/disposable/fnc_replaceMagazineCargo.sqf @@ -56,7 +56,7 @@ private _isBackpack = getNumber (configOf _box >> "isBackpack") != -1; _x params ["_magazine", "_ammo"]; if (_magazine in GVAR(magazines)) then { - if !(_isBackpack) then { + if (!_isBackpack || _magazine in GVAR(BackpackReplaceableMagazines)) then { _box addWeaponCargoGlobal [GVAR(MagazineLaunchers) getVariable _magazine, 1]; }; } else { From 4c5e197632a3430f1b60bb1994c17f0106838143 Mon Sep 17 00:00:00 2001 From: "eugene.tretyak" Date: Tue, 27 Jul 2021 18:18:38 +0300 Subject: [PATCH 011/111] Replace with lazy condition --- addons/disposable/fnc_replaceMagazineCargo.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/disposable/fnc_replaceMagazineCargo.sqf b/addons/disposable/fnc_replaceMagazineCargo.sqf index 08f2032d9a..f90363e596 100644 --- a/addons/disposable/fnc_replaceMagazineCargo.sqf +++ b/addons/disposable/fnc_replaceMagazineCargo.sqf @@ -56,7 +56,7 @@ private _isBackpack = getNumber (configOf _box >> "isBackpack") != -1; _x params ["_magazine", "_ammo"]; if (_magazine in GVAR(magazines)) then { - if (!_isBackpack || _magazine in GVAR(BackpackReplaceableMagazines)) then { + if (!_isBackpack || {_magazine in GVAR(BackpackReplaceableMagazines)}) then { _box addWeaponCargoGlobal [GVAR(MagazineLaunchers) getVariable _magazine, 1]; }; } else { From 8fb2402efefc656927a040b8be225218eae8517a Mon Sep 17 00:00:00 2001 From: "eugene.tretyak" Date: Tue, 27 Jul 2021 21:33:41 +0300 Subject: [PATCH 012/111] Fixes after review --- addons/disposable/XEH_preInit.sqf | 8 ++++---- addons/disposable/fnc_replaceMagazineCargo.sqf | 5 +++-- addons/disposable/script_component.hpp | 4 ++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/addons/disposable/XEH_preInit.sqf b/addons/disposable/XEH_preInit.sqf index 4a8d361678..e205d9b679 100644 --- a/addons/disposable/XEH_preInit.sqf +++ b/addons/disposable/XEH_preInit.sqf @@ -27,7 +27,7 @@ GVAR(NormalLaunchers) = [] call CBA_fnc_createNamespace; GVAR(LoadedLaunchers) = [] call CBA_fnc_createNamespace; GVAR(UsedLaunchers) = [] call CBA_fnc_createNamespace; GVAR(magazines) = []; -GVAR(BackpackReplaceableMagazines) = []; +GVAR(BackpackLaunchers) = createHashMap; GVAR(MagazineLaunchers) = [] call CBA_fnc_createNamespace; private _cfgWeapons = configFile >> "CfgWeapons"; @@ -36,8 +36,8 @@ private _cfgMagazines = configFile >> "CfgMagazines"; { private _launcher = configName _x; private _magazine = configName (_cfgMagazines >> (getArray (_cfgWeapons >> _launcher >> "magazines") select 0)); - private _replaceInBackpack = [_cfgMagazines >> _magazine, QGVAR(launcherFitsBackpack), 0] call BIS_fnc_returnConfigEntry > 0; getArray _x params ["_loadedLauncher", "_usedLauncher"]; + private _fitsInBackpacks = TYPE_BACKPACK in getArray(configFile >> "CfgWeapons" >> _loadedLauncher >> "WeaponSlotsInfo" >> "allowedSlots"); GVAR(LoadedLaunchers) setVariable [_launcher, _loadedLauncher]; GVAR(UsedLaunchers) setVariable [_launcher, _usedLauncher]; @@ -50,8 +50,8 @@ private _cfgMagazines = configFile >> "CfgMagazines"; GVAR(MagazineLaunchers) setVariable [_magazine, _loadedLauncher]; }; - if (_replaceInBackpack) then { - GVAR(BackpackReplaceableMagazines) pushBackUnique _magazine; + if (_fitsInBackpacks) then { + GVAR(BackpackLaunchers) set [_loadedLauncher, true]; }; // check if mass entries add up diff --git a/addons/disposable/fnc_replaceMagazineCargo.sqf b/addons/disposable/fnc_replaceMagazineCargo.sqf index f90363e596..89e3da9e6b 100644 --- a/addons/disposable/fnc_replaceMagazineCargo.sqf +++ b/addons/disposable/fnc_replaceMagazineCargo.sqf @@ -56,8 +56,9 @@ private _isBackpack = getNumber (configOf _box >> "isBackpack") != -1; _x params ["_magazine", "_ammo"]; if (_magazine in GVAR(magazines)) then { - if (!_isBackpack || {_magazine in GVAR(BackpackReplaceableMagazines)}) then { - _box addWeaponCargoGlobal [GVAR(MagazineLaunchers) getVariable _magazine, 1]; + private _loadedLauncher = GVAR(MagazineLaunchers) getVariable _magazine; + if (!_isBackpack || {_loadedLauncher in GVAR(BackpackLaunchers)}) then { + _box addWeaponCargoGlobal [_loadedLauncher, 1]; }; } else { _box addMagazineAmmoCargo [_magazine, 1, _ammo]; diff --git a/addons/disposable/script_component.hpp b/addons/disposable/script_component.hpp index 1478b6a099..02a2f8fd12 100644 --- a/addons/disposable/script_component.hpp +++ b/addons/disposable/script_component.hpp @@ -19,3 +19,7 @@ #include "\a3\ui_f\hpp\defineResincl.inc" #define WEAPON_MAGAZINES(unit,weapon) (weaponsItems (unit) select {_x select 0 == (weapon)} param [0, []] select {_x isEqualType []}) + +#define TYPE_VEST 701 +#define TYPE_UNIFORM 801 +#define TYPE_BACKPACK 901 From 54a59070ff4c2e36589b46d258120d5573e462ff Mon Sep 17 00:00:00 2001 From: 10Dozen Date: Wed, 28 Jul 2021 12:11:43 +0300 Subject: [PATCH 013/111] Update addons/disposable/XEH_preInit.sqf Co-authored-by: commy2 --- addons/disposable/XEH_preInit.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/disposable/XEH_preInit.sqf b/addons/disposable/XEH_preInit.sqf index e205d9b679..5d982efe8f 100644 --- a/addons/disposable/XEH_preInit.sqf +++ b/addons/disposable/XEH_preInit.sqf @@ -37,7 +37,7 @@ private _cfgMagazines = configFile >> "CfgMagazines"; private _launcher = configName _x; private _magazine = configName (_cfgMagazines >> (getArray (_cfgWeapons >> _launcher >> "magazines") select 0)); getArray _x params ["_loadedLauncher", "_usedLauncher"]; - private _fitsInBackpacks = TYPE_BACKPACK in getArray(configFile >> "CfgWeapons" >> _loadedLauncher >> "WeaponSlotsInfo" >> "allowedSlots"); + private _fitsInBackpacks = TYPE_BACKPACK in getArray (configFile >> "CfgWeapons" >> _loadedLauncher >> "WeaponSlotsInfo" >> "allowedSlots"); GVAR(LoadedLaunchers) setVariable [_launcher, _loadedLauncher]; GVAR(UsedLaunchers) setVariable [_launcher, _usedLauncher]; From 655dc27548998a7c8b6d7ef9c785dc1881bdfa7a Mon Sep 17 00:00:00 2001 From: "eugene.tretyak" Date: Tue, 3 Aug 2021 13:11:14 +0300 Subject: [PATCH 014/111] Removes action from pointers while not in slot fnc_switchAttachment operates only mounted items, but inventory action was available eveywhere --- addons/accessory/XEH_preInit.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/accessory/XEH_preInit.sqf b/addons/accessory/XEH_preInit.sqf index 1bc968a22b..2b633496e4 100644 --- a/addons/accessory/XEH_preInit.sqf +++ b/addons/accessory/XEH_preInit.sqf @@ -21,7 +21,7 @@ if (!hasInterface) exitWith {}; }, {}, [DIK_SUBTRACT, [true, false, false]]] call CBA_fnc_addKeybind; [ - "##AccessoryPointer", "ALL", [LSTRING(railNext), LSTRING(railNext_tooltip)], nil, nil, { + "##AccessoryPointer", "POINTER", [LSTRING(railNext), LSTRING(railNext_tooltip)], nil, nil, { params ["", "", "_item"]; count (_item call CBA_fnc_switchableAttachments) > 1 // return }, { @@ -31,7 +31,7 @@ if (!hasInterface) exitWith {}; ] call CBA_fnc_addItemContextMenuOption; [ - "##AccessorySights", "ALL", [LSTRING(opticNext), LSTRING(opticNext_tooltip)], nil, nil, { + "##AccessorySights", "POINTER", [LSTRING(opticNext), LSTRING(opticNext_tooltip)], nil, nil, { params ["", "", "_item"]; count (_item call CBA_fnc_switchableAttachments) > 1 // return }, { From fc6dff4da97bd3cebc0bb5001e67ff7f9cb76aa7 Mon Sep 17 00:00:00 2001 From: "eugene.tretyak" Date: Tue, 3 Aug 2021 19:07:49 +0300 Subject: [PATCH 015/111] Fixes wrong slot for optics attachements --- addons/accessory/XEH_preInit.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/accessory/XEH_preInit.sqf b/addons/accessory/XEH_preInit.sqf index 2b633496e4..9f6bf1f758 100644 --- a/addons/accessory/XEH_preInit.sqf +++ b/addons/accessory/XEH_preInit.sqf @@ -31,7 +31,7 @@ if (!hasInterface) exitWith {}; ] call CBA_fnc_addItemContextMenuOption; [ - "##AccessorySights", "POINTER", [LSTRING(opticNext), LSTRING(opticNext_tooltip)], nil, nil, { + "##AccessorySights", "OPTIC", [LSTRING(opticNext), LSTRING(opticNext_tooltip)], nil, nil, { params ["", "", "_item"]; count (_item call CBA_fnc_switchableAttachments) > 1 // return }, { From 7a6e6366fdf79fc17da93ec6ae04ef4fce9fdf22 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 4 Aug 2021 13:06:47 -0500 Subject: [PATCH 016/111] Tools - Make SQFC, update /include --- include/a3/ui_f/hpp/defineCommonColors.inc | 9 +- include/a3/ui_f/hpp/defineCommonGrids.inc | 33 ++- include/a3/ui_f/hpp/defineDIKCodes.inc | 3 +- include/a3/ui_f/hpp/defineResincl.inc | 268 ++++++++++++++------- tools/make.py | 27 +++ tools/updateIncludes.py | 21 ++ 6 files changed, 269 insertions(+), 92 deletions(-) create mode 100644 tools/updateIncludes.py diff --git a/include/a3/ui_f/hpp/defineCommonColors.inc b/include/a3/ui_f/hpp/defineCommonColors.inc index 474b732f28..5370c07e6c 100644 --- a/include/a3/ui_f/hpp/defineCommonColors.inc +++ b/include/a3/ui_f/hpp/defineCommonColors.inc @@ -98,6 +98,14 @@ #define IGUI_ERROR_RGB IGUI_ERROR_RGB_R, IGUI_ERROR_RGB_G, IGUI_ERROR_RGB_B #define IGUI_ERROR_COLOR {IGUI_ERROR_RGB,IGUI_ERROR_RGB_A} +//--- IGUI Tactical ping color +#define IGUI_TACTPING_RGB_R "(profilenamespace getvariable ['IGUI_TACTPING_RGB_R',1.0])" +#define IGUI_TACTPING_RGB_G "(profilenamespace getvariable ['IGUI_TACTPING_RGB_G',0.8])" +#define IGUI_TACTPING_RGB_B "(profilenamespace getvariable ['IGUI_TACTPING_RGB_B',0.2])" +#define IGUI_TACTPING_RGB_A "(profilenamespace getvariable ['IGUI_TACTPING_RGB_A',1.0])" +#define IGUI_TACTPING_RGB IGUI_TACTPING_RGB_R, IGUI_TACTPING_RGB_G, IGUI_TACTPING_RGB_B +#define IGUI_TACTPING_COLOR {IGUI_TACTPING_RGB,IGUI_TACTPING_RGB_A} + //--- HUD Text color (obsolete defines; ToDo: Replace with IGUI_TEXT_COLOR and IGUI_BCG_COLOR) #define CA_UI_HUD IGUI_TEXT_COLOR @@ -213,7 +221,6 @@ #define COLOR_TASK_ICON_CUSTOM_A 0.5 #define COLOR_TASK_ICON_CUSTOM_RGBA COLOR_TASK_ICON_CUSTOM_RGB,COLOR_TASK_ICON_CUSTOM_A - #define COLOR_TASK_BACKGROUND_UNASSIGNED_RGB 1,1,1 #define COLOR_TASK_BACKGROUND_UNASSIGNED_A 1 #define COLOR_TASK_BACKGROUND_UNASSIGNED_RGBA COLOR_TASK_BACKGROUND_UNASSIGNED_RGB,COLOR_TASK_BACKGROUND_UNASSIGNED_A diff --git a/include/a3/ui_f/hpp/defineCommonGrids.inc b/include/a3/ui_f/hpp/defineCommonGrids.inc index 42b2c29bc0..777257255a 100644 --- a/include/a3/ui_f/hpp/defineCommonGrids.inc +++ b/include/a3/ui_f/hpp/defineCommonGrids.inc @@ -232,6 +232,23 @@ #define IGUI_GRID_MISSION_W GUI_GRID_W #define IGUI_GRID_MISSION_H GUI_GRID_H +//--- IGUI Custom Info +#define IGUI_GRID_CUSTOMINFO_WDef (10 * GUI_GRID_W) +#define IGUI_GRID_CUSTOMINFO_HDef (10 * GUI_GRID_H) +#define IGUI_GRID_CUSTOMINFOLEFT_XDef (safezoneX + 0.5 * GUI_GRID_W) +#define IGUI_GRID_CUSTOMINFOLEFT_YDef (safezoneY + safezoneH - 21 * GUI_GRID_H) +#define IGUI_GRID_CUSTOMINFORIGHT_XDef ((safezoneX + safezoneW) - (IGUI_GRID_CUSTOMINFO_WDef + 0.5 * GUI_GRID_W)) +#define IGUI_GRID_CUSTOMINFORIGHT_YDef (safezoneY + safezoneH - 21 * GUI_GRID_H) + +#define IGUI_GRID_CUSTOMINFOLEFT_X (profilenamespace getvariable ["IGUI_GRID_CUSTOMINFOLEFT_X",IGUI_GRID_CUSTOMINFOLEFT_XDef]) +#define IGUI_GRID_CUSTOMINFOLEFT_Y (profilenamespace getvariable ["IGUI_GRID_CUSTOMINFOLEFT_Y",IGUI_GRID_CUSTOMINFOLEFT_YDef]) +#define IGUI_GRID_CUSTOMINFORIGHT_X (profilenamespace getvariable ["IGUI_GRID_CUSTOMINFORIGHT_X",IGUI_GRID_CUSTOMINFORIGHT_XDef]) +#define IGUI_GRID_CUSTOMINFORIGHT_Y (profilenamespace getvariable ["IGUI_GRID_CUSTOMINFORIGHT_Y",IGUI_GRID_CUSTOMINFORIGHT_YDef]) +#define IGUI_GRID_CUSTOMINFO_WAbs (profilenamespace getvariable ["IGUI_GRID_CUSTOMINFORIGHT_W",IGUI_GRID_CUSTOMINFO_WDef]) +#define IGUI_GRID_CUSTOMINFO_HAbs (profilenamespace getvariable ["IGUI_GRID_CUSTOMINFORIGHT_H",IGUI_GRID_CUSTOMINFO_HDef]) +#define IGUI_GRID_CUSTOMINFO_INNER_WAbs IGUI_GRID_CUSTOMINFO_WAbs - 0.25 * GUI_GRID_W +#define IGUI_GRID_CUSTOMINFO_INNER_HAbs IGUI_GRID_CUSTOMINFO_HAbs - 1.25 * GUI_GRID_H + /////////////////////////////////////////////////////////////////////////// /// Old @@ -360,9 +377,23 @@ // #define IGUI_GRID_SQUADRADAR_YDef (safezoneY + safezoneH - 10.9 * GUI_GRID_H) // #define IGUI_GRID_SQUADRADAR_X (profilenamespace getvariable ['IGUI_GRID_SQUADRADAR_X',IGUI_GRID_SQUADRADAR_XDef]) // #define IGUI_GRID_SQUADRADAR_Y (profilenamespace getvariable ['IGUI_GRID_SQUADRADAR_Y',IGUI_GRID_SQUADRADAR_YDef]) -// #define IGUI_GRID_SQUADRADAR_WAbs (19 * GUI_GRID_W) +// #define IGUI_GRID_SQUADRADAR_WAbs (6 * GUI_GRID_W) // #define IGUI_GRID_SQUADRADAR_HAbs (6 * GUI_GRID_H) +// #define IGUI_GRID_SQUADRADAR_LIST1_XDef (IGUI_GRID_SQUADRADAR_XDef + IGUI_GRID_SQUADRADAR_WAbs) +// #define IGUI_GRID_SQUADRADAR_LIST1_YDef (IGUI_GRID_SQUADRADAR_YDef) +// #define IGUI_GRID_SQUADRADAR_LIST1_X (profilenamespace getvariable ['IGUI_GRID_SQUADRADAR_LIST1_X',IGUI_GRID_SQUADRADAR_LIST1_XDef]) +// #define IGUI_GRID_SQUADRADAR_LIST1_Y (profilenamespace getvariable ['IGUI_GRID_SQUADRADAR_LIST1_Y',IGUI_GRID_SQUADRADAR_LIST1_YDef]) +// #define IGUI_GRID_SQUADRADAR_LIST1_WAbs (6 * GUI_GRID_W) +// #define IGUI_GRID_SQUADRADAR_LIST1_HAbs (6 * GUI_GRID_H) + +// #define IGUI_GRID_SQUADRADAR_LIST2_XDef (IGUI_GRID_SQUADRADAR_LIST1_XDef + IGUI_GRID_SQUADRADAR_LIST1_WAbs) +// #define IGUI_GRID_SQUADRADAR_LIST2_YDef (IGUI_GRID_SQUADRADAR_LIST1_YDef) +// #define IGUI_GRID_SQUADRADAR_LIST2_X (profilenamespace getvariable ['IGUI_GRID_SQUADRADAR_LIST2_X',IGUI_GRID_SQUADRADAR_LIST2_XDef]) +// #define IGUI_GRID_SQUADRADAR_LIST2_Y (profilenamespace getvariable ['IGUI_GRID_SQUADRADAR_LIST2_Y',IGUI_GRID_SQUADRADAR_LIST2_YDef]) +// #define IGUI_GRID_SQUADRADAR_LIST2_WAbs (6 * GUI_GRID_W) +// #define IGUI_GRID_SQUADRADAR_LIST2_HAbs (6 * GUI_GRID_H) + //--- IGUI Action / Command Menu #define IGUI_GRID_OLD_MENU_WAbs (4.5 * IGUI_GRID_OLD_W) #define IGUI_GRID_OLD_MENU_HAbs (10 * (IGUI_TEXT_SIZE_MEDIUM * 1.3)) diff --git a/include/a3/ui_f/hpp/defineDIKCodes.inc b/include/a3/ui_f/hpp/defineDIKCodes.inc index fa0d92258d..c641d60132 100644 --- a/include/a3/ui_f/hpp/defineDIKCodes.inc +++ b/include/a3/ui_f/hpp/defineDIKCodes.inc @@ -186,4 +186,5 @@ #define INPUT_ALT_OFFSET 2048 -#endif +#endif /* DIK_ESCAPE */ + diff --git a/include/a3/ui_f/hpp/defineResincl.inc b/include/a3/ui_f/hpp/defineResincl.inc index 0debf081d6..a7eedf3a1b 100644 --- a/include/a3/ui_f/hpp/defineResincl.inc +++ b/include/a3/ui_f/hpp/defineResincl.inc @@ -294,6 +294,7 @@ enum #define CT_CONTROLS_GROUP 15 #define CT_SHORTCUTBUTTON 16 #define CT_HITZONES 17 +#define CT_CONTROLS_TABLE 19 #define CT_XKEYDESC 40 #define CT_XBUTTON 41 #define CT_XLISTBOX 42 @@ -311,6 +312,7 @@ enum #define CT_LISTNBOX 102 #define CT_ITEMSLOT 103 #define CT_CHECKBOX 77 +#define CT_VEHICLE_DIRECTION 105 // Static styles #define ST_POS 0x0F @@ -352,7 +354,7 @@ enum #define SL_TEXTURES 0x10 -// progress bar +// progress bar #define ST_VERTICAL 0x01 #define ST_HORIZONTAL 0 @@ -488,6 +490,10 @@ enum #define IDC_DIARY_MISSION_NAME 112 #define IDC_DIARY_CURRENT_TASK 113 #define IDC_DIARY_PLAYER_RANK 116 +//VON/chat muting in Diary +#define IDC_DIARY_PLAYERS_BUTTON 117 +#define IDC_DIARY_PLAYERS_SORT 118 +#define IDC_DIARY_MUTE_ALL 119 #define IDC_DIARY_TOPIC_BACKGROUND 1021 #define IDC_DIARY_SUBTOPIC_BACKGROUND 1022 @@ -697,6 +703,8 @@ enum #define IDD_CAMPAIGN_MP 176 #define IDD_MP_QUICK_PLAY 177 #define IDD_MP_SERVER_SEARCH 178 +#define IDD_MP_SERVER_FOUND 179 +#define IDD_KEYMAPMSGBOX 180 // MessageBoxes #define IDD_MSG_DELETEPLAYER 200 @@ -792,6 +800,8 @@ enum #define IDD_MSG_SAVE_MISSION_BEFORE_PUBLISH 267 //Message box for asking user to agree with Battleye licence. #define IDD_MSG_BATTLEYE_LICENCE 268 +#define IDD_MSG_UPNP_ACTIVATION 269 +//#define IDD_MSG_ACCOUNT_LOGIN_GUIDE 270 - Reserved // InGameUI #define IDD_UNITINFO 300 @@ -801,6 +811,20 @@ enum #define IDD_AVCAMERA 304 #define IDD_STAMINA_BAR 305 +//Custom Info +#define IDD_CUSTOMINFO 310 +#define IDD_CUSTOMINFO_MINIMAP 311 +#define IDD_CUSTOMINFO_SLA 312 +#define IDD_CUSTOMINFO_CREW 313 +#define IDD_CUSTOMINFO_SENS 314 +#define IDD_CUSTOMINFO_FEEDUAV 315 +#define IDD_CUSTOMINFO_FEEDDRIVER 316 +#define IDD_CUSTOMINFO_FEEDPRIMARYGUNNER 317 +#define IDD_CUSTOMINFO_FEEDCOMMANDER 318 +#define IDD_CUSTOMINFO_FEEDMISSILE 319 +#define IDD_CUSTOMINFO_MINEDETECT 320 + + // Futura ui #define IDD_FUTURAGEAR 602 // FUTURA GEAR controls @@ -901,7 +925,7 @@ enum // Arcade Sites #define IDD_ARCADE_SITE 700 -#define IDC_AS_AZIMUT 701 +#define IDC_AS_AZIMUT 701 #define IDC_AS_AZIMUT_PICTURE 702 // ---- combos @@ -996,6 +1020,7 @@ enum #define IDC_MAIN_BOOTCAMP_CHALLENGES 151 #define IDC_MAIN_BOOTCAMP_VRTRAINING 152 #define IDC_MAIN_QUICKPLAY 154 +#define IDC_MAIN_UNIT 155 #define IDC_MAIN_CARDAS_CUDL 199 // muj vlastni cudl @@ -1234,58 +1259,20 @@ enum #define IDC_CAMPAIGNS_LIST 101 #define IDC_CAMPAIGNS_CAMPAIGN 102 #define IDC_CAMPAIGNS_DESCRIPTION 103 -#define IDC_HOST 104 // Campaign display #define IDC_CAMPAIGN_HISTORY 101 -#define IDC_CAMPAIGN_MIS_NAME 102 -#define IDC_CAMPAIGN_MIS_DESC 103 -#define IDC_CAMPAIGN_BOOK 104 -#define IDC_CAMPAIGN_CAMPAIGN 105 -#define IDC_CAMPAIGN_PREV 106 -#define IDC_CAMPAIGN_NEXT 107 -#define IDC_CAMPAIGN_OVERVIEW_DESC 108 -#define IDC_CAMPAIGN_REPLAY 109 -#define IDC_CAMPAIGN_DIFF 110 -#define IDC_CAMPAIGN_MISSION 111 - -#define IDC_CAMPAIGN_DATE 112 -#define IDC_CAMPAIGN_SCORE 113 -#define IDC_CAMPAIGN_DURATION 114 -#define IDC_CAMPAIGN_CASUALTIES 115 -#define IDC_CAMPAIGN_KILLS_TITLE 116 -#define IDC_CAMPAIGN_ENEMY_ROW 117 -#define IDC_CAMPAIGN_FRIENDLY_ROW 118 -#define IDC_CAMPAIGN_CIVILIAN_ROW 119 -#define IDC_CAMPAIGN_INFANTRY_COLUMN 120 -#define IDC_CAMPAIGN_SOFT_COLUMN 121 -#define IDC_CAMPAIGN_ARMORED_COLUMN 122 -#define IDC_CAMPAIGN_AIRCRAFT_COLUMN 123 -#define IDC_CAMPAIGN_TOTAL_COLUMN 124 -#define IDC_CAMPAIGN_EINF 125 -#define IDC_CAMPAIGN_ESOFT 126 -#define IDC_CAMPAIGN_EARM 127 -#define IDC_CAMPAIGN_EAIR 128 -#define IDC_CAMPAIGN_ETOT 129 -#define IDC_CAMPAIGN_FINF 130 -#define IDC_CAMPAIGN_FSOFT 131 -#define IDC_CAMPAIGN_FARM 132 -#define IDC_CAMPAIGN_FAIR 133 -#define IDC_CAMPAIGN_FTOT 134 -#define IDC_CAMPAIGN_CINF 135 -#define IDC_CAMPAIGN_CSOFT 136 -#define IDC_CAMPAIGN_CARM 137 -#define IDC_CAMPAIGN_CAIR 138 -#define IDC_CAMPAIGN_CTOT 139 -#define IDC_CAMPAIGN_NAME 140 -#define IDC_CAMPAIGN_AUTHOR 141 -#define IDC_CAMPAIGN_PICTURE 142 -#define IDC_CAMPAIGN_DESCRIPTION 143 -#define IDC_CAMPAIGN_TEXT_ESTDEPLOY 144 -#define IDC_CAMPAIGN_RELEASEDATE 145 -#define IDC_CAMPAIGN_BUY_DLC 146 -#define IDC_CAMPAIGN_DLCSTRIPE 147 -#define IDC_CAMPAIGN_DLCICON 148 +#define IDC_CAMPAIGN_REPLAY 102 +#define IDC_CAMPAIGN_DIFF 103 +#define IDC_CAMPAIGN_NAME 104 +#define IDC_CAMPAIGN_AUTHOR 105 +#define IDC_CAMPAIGN_PICTURE 106 +#define IDC_CAMPAIGN_DESCRIPTION 107 +#define IDC_CAMPAIGN_TEXT_ESTDEPLOY 108 +#define IDC_CAMPAIGN_RELEASEDATE 109 +#define IDC_CAMPAIGN_BUY_DLC 110 +#define IDC_CAMPAIGN_DLCSTRIPE 111 +#define IDC_CAMPAIGN_DLCICON 112 // MP campaign display #define IDC_CAMPAIGN_MP_LIST 101 @@ -1406,6 +1393,7 @@ enum #define IDC_OPTIONS_LANGUAGE 135 #define IDC_OPTIONS_IGUISIZE 136 +#define IDC_OPTIONS_IGUISIZE_LABEL 1014 #define IDC_OPTIONS_IGUISIZE_TEXT 137 #define IDC_OPTIONS_HEADBOB 138 @@ -1445,11 +1433,19 @@ enum #define IDC_OPTIONS_PLAYER_VOICE 112 #define IDC_OPTIONS_VON_VALUE 113 #define IDC_OPTIONS_VON_SLIDER 114 +//samples setting was replaced by audio output device #define IDC_OPTIONS_SAMPLES_VALUE 115 #define IDC_OPTIONS_SAMPLES_SLIDER 116 + +#define IDC_OPTIONS_AUDIO_OUTPUT_REFRESH 115 +#define IDC_OPTIONS_AUDIO_OUTPUT_COMBO 116 + #define IDC_OPTIONS_MIC_SENS_SLIDER 117 #define IDC_OPTIONS_MIC_ADJUST 118 +#define IDC_OPTIONS_MAPDUCKING_VALUE 119 +#define IDC_OPTIONS_MAPDUCKING_SLIDER 120 + // microphone adjustment #define IDC_OPTIONS_MIC_PROGRESS_BAR 1001 #define IDC_OPTIONS_MIC_PROGRESS 1002 @@ -1485,10 +1481,15 @@ enum #define IDC_DIFF_SCORE_TABLE 1535 #define IDC_DIFF_KILLED_BY 1536 #define IDC_DIFF_VON_ID 1537 -#define IDC_DIFF_EXTENDED_MAP 1538 +#define IDC_DIFF_EXTENDED_MAP_FRIENDLY 1538 #define IDC_DIFF_AUTO_REPORT 1539 #define IDC_DIFF_MULTIPLE_SAVES 1540 -//#define IDC_DIFF_SQUAD_RADAR 1541 +// #define IDC_DIFF_SQUAD_RADAR 1541 +#define IDC_DIFF_TACTICAL_PING 1542 +#define IDC_DIFF_EXTENDED_MAP_ENEMY 1543 +#define IDC_DIFF_EXTENDED_MAP_MINES 1544 +#define IDC_DIFF_MINIMAP_ALLOWED 1545 +#define IDC_DIFF_EXTENDED_MAP_PING 1546 // Configure display controls #define IDC_CONFIG_DEFAULT 101 @@ -1700,6 +1701,14 @@ enum #define IDC_MP_SERVER_SEARCH_STATUS 101 #define IDC_MP_SERVER_SEARCH_PROGRESS 102 +//Server Found dialogue +#define IDC_MP_SERVER_FOUND_COUNTDOWN 101 +#define IDC_MP_SERVER_FOUND_MISSION 102 +#define IDC_MP_SERVER_FOUND_GAME_TYPE 103 +#define IDC_MP_SERVER_FOUND_PLAYERS 104 +#define IDC_MP_SERVER_FOUND_BUTTON_NEXT 105 +#define IDC_MP_SERVER_FOUND_BUTTON_JOIN 106 + #define IDC_OPTIMATCH_FILTER_SPEED 101 #define IDC_OPTIMATCH_FILTER_TYPE 102 #define IDC_OPTIMATCH_FILTER_MIN_PLAYERS 103 @@ -1929,6 +1938,11 @@ enum #define IDC_MPSETUP_MISSION_WORKSHOP 130 #define IDC_MPSETUP_LOGIC 131 #define IDC_MPSETUP_VIRTUAL 132 +#define IDC_MPSETUP_PLAYERS_BUTTON 133 +#define IDC_MPSETUP_PLAYERS_SORT 134 +#define IDC_MPSETUP_PING_BUTTON 135 +#define IDC_MPSETUP_PING_SORT 136 +#define IDC_MPSETUP_MUTE_ALL 137 #define IDC_MPSETUP_MSG_MESSAGE 101 #define IDC_MPSETUP_MSG_PROGRESS 102 @@ -2194,6 +2208,8 @@ enum // Chat #define IDC_CHANNEL 101 #define IDC_CHANNEL_VOICE 102 +#define IDC_CHANNEL_MUTE_VON 103 +#define IDC_CHANNEL_MUTE_CHAT 104 #define IDC_CHAT 101 @@ -2227,7 +2243,7 @@ enum #define IDC_PUBLISH_BUTTON_DEFAULT_PREVIEW 119 #define IDC_PUBLISH_STORAGE_SLIDER 120 // group that is hidden when new mission is selected and shown when already uploaded mission is selected -#define IDC_PUBLISH_STEAM_HIDE_NEW_MISSION 121 +#define IDC_PUBLISH_STEAM_HIDE_NEW_MISSION 121 // group that is shown when new mission is selected and hidden when already uploaded mission is selected #define IDC_PUBLISH_STEAM_SHOW_NEW_MISSION 122 @@ -2378,60 +2394,60 @@ enum #define IDC_GEAR_FILTER_ICON3 151 #define IDC_GEAR_FILTER_ICON4 152 #define IDC_GEAR_FILTER_ICON5 153 -#define IDC_GEAR_FILTER_ICON6 154 +#define IDC_GEAR_FILTER_ICON6 154 #define IDC_GEAR_POOL_GROUP 155 #define IDC_GEAR_SOURCE_NAME 156 #define IDC_GEAR_OPEN_BAG 157 -#define IDC_GEAR_CLOSE_BAG 158 -#define IDC_GEAR_ADD_DEFAULT 255 -#define IDC_GEAR_CLEAR_ALL 256 +#define IDC_GEAR_CLOSE_BAG 158 +#define IDC_GEAR_ADD_DEFAULT 255 +#define IDC_GEAR_CLEAR_ALL 256 #define IDC_BAG_ITEMS_GROUP 159 #define IDC_UNIT_ITEMS_GROUP 160 -#define IDC_GEAR_BAG_EMPTY 5000 +#define IDC_GEAR_BAG_EMPTY 5000 /* -#define IDC_GEAR_BAG_EMPTY_SLOT1 5000 -#define IDC_GEAR_BAG_EMPTY_SLOT2 5001 -#define IDC_GEAR_BAG_EMPTY_SLOT3 5002 +#define IDC_GEAR_BAG_EMPTY_SLOT1 5000 +#define IDC_GEAR_BAG_EMPTY_SLOT2 5001 +#define IDC_GEAR_BAG_EMPTY_SLOT3 5002 . . . -#define IDC_GEAR_BAG_EMPTY_SLOT499 5498 -#define IDC_GEAR_BAG_EMPTY_SLOT500 5499 +#define IDC_GEAR_BAG_EMPTY_SLOT499 5498 +#define IDC_GEAR_BAG_EMPTY_SLOT500 5499 */ -#define IDC_GEAR_BAG_FULL 5500 +#define IDC_GEAR_BAG_FULL 5500 // Debriefing /* -#define IDC_DEBRIEFING_LEFT 101 -#define IDC_DEBRIEFING_RIGHT 102 +#define IDC_DEBRIEFING_LEFT 101 +#define IDC_DEBRIEFING_RIGHT 102 */ -#define IDC_DEBRIEFING_STAT 103 -#define IDC_DEBRIEFING_RESTART 104 -#define IDC_DEBRIEFING_PAD2 105 +#define IDC_DEBRIEFING_STAT 103 +#define IDC_DEBRIEFING_RESTART 104 +#define IDC_DEBRIEFING_PAD2 105 #define IDC_DEBRIEFING_PLAYERS_TITLE_BG 106 -#define IDC_DEBRIEFING_PLAYERS_TITLE 107 -#define IDC_DEBRIEFING_PLAYERS_BG 108 -#define IDC_DEBRIEFING_PLAYERS 109 -#define IDC_DEBRIEFING_TIMEOUT 110 -#define IDC_DEBRIEFING_RESULT 111 -#define IDC_DEBRIEFING_TITLE 112 -#define IDC_DEBRIEFING_DEBRIEFING 113 -#define IDC_DEBRIEFING_OBJECTIVES 114 -#define IDC_DEBRIEFING_INFO 115 -#define IDC_DEBRIEFING_SHOW_PLAYERS 116 -#define IDC_DEBRIEFING_SHOW_PAGE2 117 -#define IDC_DEBRIEFING_LIVE_STATS 118 -#define IDC_DEBRIEFING_PREV_PAGE 119 -#define IDC_DEBRIEFING_NEXT_PAGE 120 -#define IDC_DEBRIEFING_LOAD 121 - +#define IDC_DEBRIEFING_PLAYERS_TITLE 107 +#define IDC_DEBRIEFING_PLAYERS_BG 108 +#define IDC_DEBRIEFING_PLAYERS 109 +#define IDC_DEBRIEFING_TIMEOUT 110 +#define IDC_DEBRIEFING_RESULT 111 +#define IDC_DEBRIEFING_TITLE 112 +#define IDC_DEBRIEFING_DEBRIEFING 113 +#define IDC_DEBRIEFING_OBJECTIVES 114 +#define IDC_DEBRIEFING_INFO 115 +#define IDC_DEBRIEFING_SHOW_PLAYERS 116 +#define IDC_DEBRIEFING_SHOW_PAGE2 117 +#define IDC_DEBRIEFING_LIVE_STATS 118 +#define IDC_DEBRIEFING_PREV_PAGE 119 +#define IDC_DEBRIEFING_NEXT_PAGE 120 +#define IDC_DEBRIEFING_LOAD 121 #define IDC_DEBRIEFING_TEXT_GROUP 122 #define IDC_DEBRIEFING_OBJECTIVES_GROUP 123 #define IDC_DEBRIEFING_STATS_GROUP 124 - #define IDC_DEBRIEFING_MISSION_WORKSHOP 125 +#define IDC_DEBRIEFING_READY 126 +#define IDC_DEBRIEFING_DISCONNECT 127 // Debug display #define IDC_DEBUG_EXP 101 @@ -2619,6 +2635,9 @@ enum #define IDC_IGUI_AVC_PIP_DRIVER 100 #define IDC_IGUI_AVC_PIP_GUNNER 101 #define IDC_IGUI_AVC_PIP_SINGLE_VIEW 102 +#define IDC_IGUI_AVC_PIP_SOURCE 103 +#define IDC_IGUI_AVC_PIP_HEADING 104 +#define IDC_IGUI_AVC_PIP_MODE 105 //Sling Load Assistant #define IDC_SLA_MAP 100 @@ -2628,6 +2647,30 @@ enum #define IDC_SLA_LIFT_PROGRESS 104 #define IDC_SLA_HEIGHT_BAR 105 #define IDC_SLA_MAX_ALT 106 +#define IDC_SLA_VIEWPORT 107 + +//Sensors Display +#define IDC_SENS_VIEWPORT 101 +#define IDC_SENS_CIRCLES 102 +#define IDC_SENS_VEHICLE 103 +#define IDC_SENS_RANGE 104 +#define IDC_SENS_RADARON 105 +#define IDC_SENS_RADAROFF 106 +#define IDC_SENS_TARGET 107 +#define IDC_SENS_TARGETRANGE 108 +#define IDC_SENS_TARGETSPEED 109 +#define IDC_SENS_TARGETALT 110 +#define IDC_SENS_HEADING 111 + +//Mine detector Display +#define IDC_MINEDETECT_VIEWPORT 101 +#define IDC_MINEDETECT_CIRCLES 102 +#define IDC_MINEDETECT_VEHICLE 103 +#define IDC_MINEDETECT_RANGE 104 + +//Crew list +#define IDC_CREW_VEHICLE 101 +#define IDC_CREW_LIST 102 //MP Score Table #define IDC_MP_SCORE_TABLE_TITLE 101 @@ -2712,7 +2755,6 @@ enum #define IDC_IGUI_WEAPON_AMMO 155 // New Arma 3 -#define IDC_IGUI_WEAPON_OPTICS_PITCH 182 #define IDC_IGUI_STANCE_INDICATOR 188 #define IDC_IGUI_GPS_PLAYER 189 #define IDC_IGUI_SPEED2 190 @@ -2765,6 +2807,28 @@ enum #define IDC_IGUI_WEAPON_ALT 189 #define IDC_IGUI_WEAPON_TIME 190 +#define IDC_IGUI_WEAPON_CAM_TRACK_AREA 194 +#define IDC_IGUI_WEAPON_CAM_TRACK_TARGET 195 + +#define IDC_IGUI_WEAPON_JAVELIN_ATTACK_FROM_TOP 196 +#define IDC_IGUI_WEAPON_JAVELIN_ATTACK_DIRECT 197 + +#define IDC_IGUI_WEAPON_LASED_DISTANCE 198 +#define IDC_IGUI_WEAPON_LASED_SPEED 199 +#define IDC_IGUI_WEAPON_LASED_VALID 200 +#define IDC_IGUI_WEAPON_LASED_ERR_LEAD 201 +#define IDC_IGUI_WEAPON_LASED_ERR_ELEV 202 +#define IDC_IGUI_WEAPON_LASED_ERR_OBJECT 203 +#define IDC_IGUI_WEAPON_LASER_ZEROING_DELAY 204 + +#define IDC_IGUI_THROTTLE 205 +#define IDC_IGUI_VEHICLE_DIRECTION 206 +#define IDC_IGUI_VEHICLE_DIRECTION2 207 + + + + + // helicopter unit info #define IDC_IGUI_GMETER 501 #define IDC_IGUI_RADARALTIMETER 505 @@ -2980,6 +3044,11 @@ enum // - miniMap display #define IDC_MINIMAP 101 +#define IDC_MINIMAP_VIEWPORT 102 +#define IDC_MINIMAP_GRID 197 +#define IDC_MINIMAP_HEADING 198 +#define IDC_MINIMAP_TIME 199 + // - scripting help display #define IDC_SCRITING_HELP 101 @@ -3064,6 +3133,11 @@ enum // Hitzone types #define HZ_AIRPLANE_HULL 0 +#define HZ_AIRPLANE_ENG 22 +#define HZ_AIRPLANE_FUEL 23 +#define HZ_AIRPLANE_GEAR 24 +#define HZ_AIRPLANE_WINGS 25 +#define HZ_AIRPLANE_INST 26 #define HZ_HELICOPTER_HULL 1 #define HZ_HELICOPTER_ENG 2 @@ -3089,6 +3163,22 @@ enum #define HZ_TANK_RTR 19 #define HZ_TANK_TRRT 20 +#define HZ_VEH_GUN HZ_TANK_GUN +#define HZ_VEH_TRRT HZ_TANK_TRRT + #define HZ_SHIP_ENG 21 -#endif +#define HZ_VEH_TOTAL 27 + +#define HZ_TANK_CMDGUN 28 +#define HZ_TANK_CMDTRRT 29 +#define HZ_VEH_CMDGUN HZ_TANK_CMDGUN +#define HZ_VEH_CMDTRRT HZ_TANK_CMDTRRT + +#define HZ_VEH_TRRT_TOTAL 30 +#define HZ_VEH_CMDTRRT_TOTAL 31 + +#define HZ_TANK_BOTH_TRACKS 32 + + +#endif \ No newline at end of file diff --git a/tools/make.py b/tools/make.py index 5180216e34..879d55d74d 100644 --- a/tools/make.py +++ b/tools/make.py @@ -831,6 +831,7 @@ def main(argv): make_target = "DEFAULT" # Which section in make.cfg to use for the build new_key = True # Make a new key and use it to sign? quiet = False # Suppress output from build tool? + sqfc_compiling = True # Parse arguments if "help" in argv or "-h" in argv or "--help" in argv: @@ -1166,6 +1167,24 @@ def main(argv): print_error("\nFailed to delete {}".format(os.path.join(obsolete_check_path,file))) pass + # Always cleanup old sqfc + for root, _dirs, files in os.walk(module_root_parent): + for file in files: + if file.endswith(".sqfc"): + os.remove(os.path.join(root, file)) + if sqfc_compiling: + print_blue("\nCompiling to sqfc...") + compiler_exe = os.path.join(module_root_parent, "ArmaScriptCompiler.exe") + if not os.path.isfile(compiler_exe): + print_yellow("ArmaScriptCompiler.exe not found in base mod folder - skipping") + else: + ret = subprocess.call([compiler_exe], cwd=module_root_parent, stdout=False) + if ret == 0: + print_green("ArmaScriptCompiler return code == {}".format(str(ret))) + else: + print_error("ArmaScriptCompiler return code == {}".format(str(ret))) + raise # probably means something bad happened and we should stop + # For each module, prep files and then build. print_blue("\nBuilding...") for module in modules: @@ -1417,6 +1436,14 @@ def main(argv): except: print_error("ERROR: Could not delete pboProject temp files.") + if sqfc_compiling: + print_blue("\nCleaning up sqfc...") + # cleanup all old sqfc + for root, _dirs, files in os.walk(module_root_parent): + for file in files: + if file.endswith(".sqfc"): + os.remove(os.path.join(root, file)) + # Make release if make_release_zip: release_name = "{}_v{}".format(project.lstrip("@"), project_version.rsplit(".", 1)[0]) diff --git a/tools/updateIncludes.py b/tools/updateIncludes.py new file mode 100644 index 0000000000..721b6b363d --- /dev/null +++ b/tools/updateIncludes.py @@ -0,0 +1,21 @@ +# PabstMirror - Overwrites all files in /include with updated version from a p-drive + +import os +import shutil + +include_base_path = os.path.join(os.path.dirname(os.getcwd()), "include") +p_drive_path = "P:\\" + +if not os.path.exists(p_drive_path): + raise Exception("No P-drive") + +for root, _dirs, files in os.walk(include_base_path): + relative_path = os.path.relpath(root, include_base_path) + for file in files: + if file == "$PBOPREFIX$": + continue + file_r_path = os.path.join(include_base_path, relative_path, file) + file_v_path = os.path.join(p_drive_path, relative_path, file) + if not os.path.isfile(file_v_path): + raise Exception("Missing p-drive file {}".format(file_v_path)) + shutil.copyfile(file_v_path, file_r_path) From 273200aed179c399a5999cde61175b4b5bebeb61 Mon Sep 17 00:00:00 2001 From: yosoygroot <32269925+yosoygroot@users.noreply.github.com> Date: Mon, 9 Aug 2021 15:38:50 +0200 Subject: [PATCH 017/111] Update stringtable.xml to afford Spanish --- addons/diagnostic/stringtable.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/addons/diagnostic/stringtable.xml b/addons/diagnostic/stringtable.xml index 27070d1b5d..71629a6c58 100644 --- a/addons/diagnostic/stringtable.xml +++ b/addons/diagnostic/stringtable.xml @@ -13,6 +13,7 @@ Community Base Addons - Teşhis Community Base Addons - Diagnostica Community Base Addons - Diagnostika + Community Base Addons - Diagnósticos Extended Debug Console @@ -26,6 +27,7 @@ Geliştirilmiş Debug Konsolu Console debug estesa Rozšířená ladící konzole + Consola Extendida de Depuración Previous Statement @@ -39,6 +41,7 @@ Önceki İfade Espressione Prec. Předchozí zpráva + Expresión Anterior Next Statement @@ -52,6 +55,7 @@ Sonraki İfade Espressione Succ. Následující zpráva + Expresión Siguiente Target Exec @@ -65,6 +69,7 @@ Hedefte Çalıştır Esegui Remoto Cílový exec + Ejecutiva de Objetivo Enable Target Debugging @@ -78,6 +83,7 @@ Hedefte Çalıştırmayı Aktifleştir Attiva il debug remoto Zapnout cílové ladění + Activar Depuración de Objetivo [CBA] Allows remote target debugging. Requires Debug Console. @@ -91,21 +97,25 @@ [CBA] Başka hedefte çalıştırmayı aktifleştirir. Debug konsolu gerektirir. [CBA] Abilita il debug remoto. Richiede la console di debug. [CBA] Povoluje ladění vzdáleného cíle. Vyžaduje ladící konzoli. + [CBA] Permite la depuración de objetivos remotos. Requiere consola de depuración. Debug Console Indentation Indentacja w konsoli debugowania Indentation dans la console de débogage + Espaciado de la Consola de Depuración Type of indentation that can be added to expression in the debug console by pressing Tab key or removed by pressing Shift + Tab. Rodzaj indentacji która może być dodana do wyrażenia w konsoli debugowania za pomocą klawisza Tab lub usunięta za pomocą Shift + Tab. Type d'indentation qui peut être employée dans la console de débogage.\nTab ajoute une indentation, et Shift + Tab en supprime une. + Tipo de sangría que se puede agregar a la expresión en la consola de depuración presionando la tecla Tab o eliminar presionando Shift + Tab 4 Spaces 4 Spacje 4 espaces + 4 Espacios From c6eb675f3baf5277575ac523e807815213e02d8b Mon Sep 17 00:00:00 2001 From: "eugene.tretyak" Date: Mon, 23 Aug 2021 19:04:27 +0300 Subject: [PATCH 018/111] Add Sa vz. 58 specific muzzle slot --- addons/jr/jr_classes.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/jr/jr_classes.hpp b/addons/jr/jr_classes.hpp index 7d9bd79d1d..9febbda886 100644 --- a/addons/jr/jr_classes.hpp +++ b/addons/jr/jr_classes.hpp @@ -280,6 +280,10 @@ class asdg_MuzzleSlot_762R: asdg_MuzzleSlot { // for 7.62x39 suppressors class compatibleItems {}; }; +class asdg_MuzzleSLot_762R_VZ58: asdg_MuzzleSlot { // for 7.62x39 Sa vz. 58 (M14x1 threading) + class compatibleItems {}; +}; + class asdg_MuzzleSlot_762R_PK: asdg_MuzzleSlot { // for 7.62x54R PK mount suppressors class compatibleItems {}; }; From 0f8a2a2998e5d5943f405360a1225ac8ce069218 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 1 Sep 2021 13:35:53 -0500 Subject: [PATCH 019/111] Fix CBA_fnc_removeMagazineCargo for ground containers Based on https://github.com/acemod/ACE3/pull/8399 Co-Authored-By: Salluci <69561145+Salluci@users.noreply.github.com> --- addons/common/fnc_removeMagazineCargo.sqf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addons/common/fnc_removeMagazineCargo.sqf b/addons/common/fnc_removeMagazineCargo.sqf index 5b101d1332..79ebd39776 100644 --- a/addons/common/fnc_removeMagazineCargo.sqf +++ b/addons/common/fnc_removeMagazineCargo.sqf @@ -64,6 +64,13 @@ private _magazinesAmmo = magazinesAmmoCargo _container; // Clear cargo space and readd the items as long it's not the type in question clearMagazineCargoGlobal _container; +// Engine will agressively cleanup "empty" ground containers, even if magazines are re-added in same frame, so re-create a new container +private _containerType = typeOf _container; +if (((toLower _containerType) in ["groundweaponholder", "weaponholdersimulated"]) +&& {(weaponCargo _container) isEqualTo []} && {(itemCargo _container) isEqualTo []} && {(backpackCargo _container) isEqualTo []}) then { + _container = createVehicle [_containerType, getPosATL _container, [], 0, "CAN_COLLIDE"]; +}; + { _x params ["_magazineClass", "_magazineAmmo"]; From cac71ef19222eba0f3c8a2ff7022cccb633f10d9 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 1 Sep 2021 13:46:55 -0500 Subject: [PATCH 020/111] Update addons/common/fnc_removeMagazineCargo.sqf Co-authored-by: jonpas --- addons/common/fnc_removeMagazineCargo.sqf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/common/fnc_removeMagazineCargo.sqf b/addons/common/fnc_removeMagazineCargo.sqf index 79ebd39776..c6e92e4060 100644 --- a/addons/common/fnc_removeMagazineCargo.sqf +++ b/addons/common/fnc_removeMagazineCargo.sqf @@ -67,7 +67,9 @@ clearMagazineCargoGlobal _container; // Engine will agressively cleanup "empty" ground containers, even if magazines are re-added in same frame, so re-create a new container private _containerType = typeOf _container; if (((toLower _containerType) in ["groundweaponholder", "weaponholdersimulated"]) -&& {(weaponCargo _container) isEqualTo []} && {(itemCargo _container) isEqualTo []} && {(backpackCargo _container) isEqualTo []}) then { + && {(weaponCargo _container) isEqualTo []} + && {(itemCargo _container) isEqualTo []} + && {(backpackCargo _container) isEqualTo []}) then { _container = createVehicle [_containerType, getPosATL _container, [], 0, "CAN_COLLIDE"]; }; From 633725e5605a605c14811659369a05cb92791aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Mon, 6 Sep 2021 23:18:20 +0200 Subject: [PATCH 021/111] Fix XEH issues with GM 1.4 patch --- addons/xeh/CfgVehicles.hpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/addons/xeh/CfgVehicles.hpp b/addons/xeh/CfgVehicles.hpp index 02df091337..803d5ca44a 100644 --- a/addons/xeh/CfgVehicles.hpp +++ b/addons/xeh/CfgVehicles.hpp @@ -329,6 +329,9 @@ class CfgVehicles { class gm_logistics_object_base: gm_object_base { XEH_ENABLED; }; + class gm_deployablebridge_base: gm_logistics_object_base { + XEH_ENABLED; + }; class gm_staticWeapon_base: StaticWeapon {}; class gm_staticMG_base: gm_staticWeapon_base {}; @@ -337,6 +340,12 @@ class CfgVehicles { XEH_ENABLED; }; + class ModuleOrdnanceRocket_F; + class gm_ModuleOrdnanceRocket_base: ModuleOrdnanceRocket_F {}; + class gm_ModuleOrdnanceRocket_rocket_luna_nuc_3r10: gm_ModuleOrdnanceRocket_base { + XEH_ENABLED; + }; + // Enoch class Land_PortableDesk_01_base_F; class Land_PortableDesk_01_animated_base_F: Land_PortableDesk_01_base_F { From 38bfcdf38f0249a8ad244b1168088c8cc0926ca4 Mon Sep 17 00:00:00 2001 From: Salluci <69561145+Salluci@users.noreply.github.com> Date: Wed, 8 Sep 2021 09:38:29 -0300 Subject: [PATCH 022/111] Add support for gestureChanged and gestureDone events --- addons/xeh/script_component.hpp | 4 +++- addons/xeh/script_xeh.hpp | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/xeh/script_component.hpp b/addons/xeh/script_component.hpp index 6c25837b14..fb99a60563 100644 --- a/addons/xeh/script_component.hpp +++ b/addons/xeh/script_component.hpp @@ -91,4 +91,6 @@ "TurnOut", \ "Deleted", \ "Disassembled", \ - "Suppressed" + "Suppressed", \ + "GestureChanged", \ + "GestureDone" diff --git a/addons/xeh/script_xeh.hpp b/addons/xeh/script_xeh.hpp index 53d6c27859..2eba00016f 100644 --- a/addons/xeh/script_xeh.hpp +++ b/addons/xeh/script_xeh.hpp @@ -56,7 +56,9 @@ turnIn = "call cba_xeh_fnc_turnIn"; \ turnOut = "call cba_xeh_fnc_turnOut"; \ deleted = "call cba_xeh_fnc_deleted"; \ disassembled = "call cba_xeh_fnc_disassembled"; \ -Suppressed = "call cba_xeh_fnc_Suppressed"; +Suppressed = "call cba_xeh_fnc_Suppressed"; \ +gestureChanged = "call cba_xeh_fnc_gestureChanged"; \ +gestureDone = "call cba_xeh_fnc_gestureDone"; /* MACRO: DELETE_EVENTHANDLERS @@ -111,4 +113,6 @@ turnIn = ""; \ turnOut = ""; \ deleted = ""; \ disassembled = ""; \ -Suppressed = ""; +Suppressed = ""; \ +gestureChanged = ""; \ +gestureDone = "" From 80f93bc14527e7b3e0d5f608aa275eb2693fb44f Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 13 Sep 2021 17:13:38 -0500 Subject: [PATCH 023/111] Update fnc_removeMagazineCargo.sqf --- addons/common/fnc_removeMagazineCargo.sqf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/common/fnc_removeMagazineCargo.sqf b/addons/common/fnc_removeMagazineCargo.sqf index c6e92e4060..e8562f5d14 100644 --- a/addons/common/fnc_removeMagazineCargo.sqf +++ b/addons/common/fnc_removeMagazineCargo.sqf @@ -66,7 +66,8 @@ clearMagazineCargoGlobal _container; // Engine will agressively cleanup "empty" ground containers, even if magazines are re-added in same frame, so re-create a new container private _containerType = typeOf _container; -if (((toLower _containerType) in ["groundweaponholder", "weaponholdersimulated"]) +if ((_containerType isKindOf "WeaponHolder") + && {([configOf _container >> "forceSupply", "NUMBER", 0] call CBA_fnc_getConfigEntry) != 0} && {(weaponCargo _container) isEqualTo []} && {(itemCargo _container) isEqualTo []} && {(backpackCargo _container) isEqualTo []}) then { From 7ab91cd22554e83af4e1ef39aa64d04c784c2850 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 14 Sep 2021 14:39:08 -0500 Subject: [PATCH 024/111] Update script_mod.hpp (#1500) --- addons/main/script_mod.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp index d4df42c6c9..f762ad855c 100644 --- a/addons/main/script_mod.hpp +++ b/addons/main/script_mod.hpp @@ -10,7 +10,7 @@ #define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD // MINIMAL required version for the Mod. Components can specify others.. -#define REQUIRED_VERSION 2.04 +#define REQUIRED_VERSION 2.06 /* // Defined DEBUG_MODE_NORMAL in a few CBA_fncs to prevent looped logging :) From 663b9d258f47a98d9cb28d184057dd0d4dbc2e92 Mon Sep 17 00:00:00 2001 From: Brett Date: Mon, 20 Sep 2021 12:10:21 -0600 Subject: [PATCH 025/111] extended loadout --- addons/loadout/$PBOPREFIX$ | 1 + addons/loadout/CfgEventHandlers.hpp | 11 +++++ addons/loadout/CfgFunctions.hpp | 11 +++++ addons/loadout/XEH_PREP.sqf | 0 addons/loadout/XEH_postInit.sqf | 0 addons/loadout/XEH_preInit.sqf | 10 +++++ addons/loadout/XEH_preStart.sqf | 3 ++ addons/loadout/config.cpp | 17 ++++++++ addons/loadout/fnc_addLoadoutGetHandler.sqf | 33 +++++++++++++++ addons/loadout/fnc_addLoadoutSetHandler.sqf | 42 +++++++++++++++++++ addons/loadout/fnc_getLoadout.sqf | 37 ++++++++++++++++ .../loadout/fnc_removeLoadoutSetHandler.sqf | 39 +++++++++++++++++ addons/loadout/fnc_setLoadout.sqf | 42 +++++++++++++++++++ addons/loadout/script_component.hpp | 12 ++++++ 14 files changed, 258 insertions(+) create mode 100644 addons/loadout/$PBOPREFIX$ create mode 100644 addons/loadout/CfgEventHandlers.hpp create mode 100644 addons/loadout/CfgFunctions.hpp create mode 100644 addons/loadout/XEH_PREP.sqf create mode 100644 addons/loadout/XEH_postInit.sqf create mode 100644 addons/loadout/XEH_preInit.sqf create mode 100644 addons/loadout/XEH_preStart.sqf create mode 100644 addons/loadout/config.cpp create mode 100644 addons/loadout/fnc_addLoadoutGetHandler.sqf create mode 100644 addons/loadout/fnc_addLoadoutSetHandler.sqf create mode 100644 addons/loadout/fnc_getLoadout.sqf create mode 100644 addons/loadout/fnc_removeLoadoutSetHandler.sqf create mode 100644 addons/loadout/fnc_setLoadout.sqf create mode 100644 addons/loadout/script_component.hpp diff --git a/addons/loadout/$PBOPREFIX$ b/addons/loadout/$PBOPREFIX$ new file mode 100644 index 0000000000..4716d08806 --- /dev/null +++ b/addons/loadout/$PBOPREFIX$ @@ -0,0 +1 @@ +x\cba\addons\loadout diff --git a/addons/loadout/CfgEventHandlers.hpp b/addons/loadout/CfgEventHandlers.hpp new file mode 100644 index 0000000000..865276cfba --- /dev/null +++ b/addons/loadout/CfgEventHandlers.hpp @@ -0,0 +1,11 @@ +class Extended_PreStart_EventHandlers { + class ADDON { + init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); + }; +}; + +class Extended_PreInit_EventHandlers { + class ADDON { + init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); + }; +}; diff --git a/addons/loadout/CfgFunctions.hpp b/addons/loadout/CfgFunctions.hpp new file mode 100644 index 0000000000..680dbcf609 --- /dev/null +++ b/addons/loadout/CfgFunctions.hpp @@ -0,0 +1,11 @@ +class CfgFunctions { + class CBA { + class Loadout { + PATHTO_FNC(addLoadoutGetHandler); + PATHTO_FNC(addLoadoutSetHandler); + PATHTO_FNC(removeLoadoutSetHandler); + PATHTO_FNC(getLoadout); + PATHTO_FNC(setLoadout); + }; + }; +}; diff --git a/addons/loadout/XEH_PREP.sqf b/addons/loadout/XEH_PREP.sqf new file mode 100644 index 0000000000..e69de29bb2 diff --git a/addons/loadout/XEH_postInit.sqf b/addons/loadout/XEH_postInit.sqf new file mode 100644 index 0000000000..e69de29bb2 diff --git a/addons/loadout/XEH_preInit.sqf b/addons/loadout/XEH_preInit.sqf new file mode 100644 index 0000000000..9942d3a19d --- /dev/null +++ b/addons/loadout/XEH_preInit.sqf @@ -0,0 +1,10 @@ +#include "script_component.hpp" + +ADDON = false; + +#include "XEH_PREP.sqf" + +GVAR(getHandlers) = createHashMap; +GVAR(setHandlers) = createHashMap; + +ADDON = true; diff --git a/addons/loadout/XEH_preStart.sqf b/addons/loadout/XEH_preStart.sqf new file mode 100644 index 0000000000..43f1adee32 --- /dev/null +++ b/addons/loadout/XEH_preStart.sqf @@ -0,0 +1,3 @@ +#include "script_component.hpp" + +#include "XEH_PREP.sqf" diff --git a/addons/loadout/config.cpp b/addons/loadout/config.cpp new file mode 100644 index 0000000000..3877bc307e --- /dev/null +++ b/addons/loadout/config.cpp @@ -0,0 +1,17 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + name = CSTRING(component); + units[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"cba_common", "cba_events"}; + author = "$STR_CBA_Author"; + authors[] = {"Brett Mayson"}; + url = "$STR_CBA_URL"; + VERSION_CONFIG; + }; +}; + +#include "CfgEventHandlers.hpp" +#include "CfgFunctions.hpp" diff --git a/addons/loadout/fnc_addLoadoutGetHandler.sqf b/addons/loadout/fnc_addLoadoutGetHandler.sqf new file mode 100644 index 0000000000..f34fa6c3b8 --- /dev/null +++ b/addons/loadout/fnc_addLoadoutGetHandler.sqf @@ -0,0 +1,33 @@ +#include "script_component.hpp" +/* ---------------------------------------------------------------------------- +Function: CBA_fnc_addLoadoutGetHandler +Description: + Add a handler for CBA_fnc_setLoadout. +Parameters: + _id - The id of the handler. + _function - The function you wish to execute. +Passed Arguments: + _this + 0: _unit - The unit to set the loadout on. + 1: _loadout - The unit's loadout +Returns: + true if a previous handler existed, false otherwise. +Examples: + (begin example) + ["earplugs", { + params ["_unit"]; + [_unit] call my_earplug_mod_fnc_hasEarplugs; + }] call CBA_fnc_addLoadoutGetHandler; + (end) +Author: + Brett Mayson +---------------------------------------------------------------------------- */ + +params [ + ["_id", "", [""]], + ["_function", {}, [{}]] +]; + +if (_id isEqualTo "") exitWith {-1}; + +GVAR(getHandlers) set [_id, _function]; diff --git a/addons/loadout/fnc_addLoadoutSetHandler.sqf b/addons/loadout/fnc_addLoadoutSetHandler.sqf new file mode 100644 index 0000000000..ff840f6b87 --- /dev/null +++ b/addons/loadout/fnc_addLoadoutSetHandler.sqf @@ -0,0 +1,42 @@ +#include "script_component.hpp" +/* ---------------------------------------------------------------------------- +Function: CBA_fnc_addLoadoutSetHandler +Description: + Add a handler for CBA_fnc_setUnitLoadout. +Parameters: + _id - The id of the handler. + _function - The function you wish to execute. +Passed Arguments: + _this + 0: _unit - The unit to set the loadout on. + 1: _params - The parameters stored by CBA_fnc_getLoadout. +Returns: + Nothing. +Examples: + (begin example) + ["earplugs", { + params ["_unit", "_state"]; + if (_state) then { + [_unit] call my_earplug_mod_fnc_giveEarplugs; + } else { + [_unit] call my_earplug_mod_fnc_removeEarplugs; + }; + }] call CBA_fnc_addLoadoutSetHandler; + (end) +Author: + Brett Mayson +---------------------------------------------------------------------------- */ + +params [ + ["_id", "", [""]], + ["_function", {}, [{}]], + "_default" +]; + +if (_id isEqualTo "") exitWith {-1}; + +if !(_id in (GVAR(setHandlers))) then { + GVAR(setHandlers) set [_id, []]; +}; + +(GVAR(setHandlers) get _id) pushBack [_function, _default]; diff --git a/addons/loadout/fnc_getLoadout.sqf b/addons/loadout/fnc_getLoadout.sqf new file mode 100644 index 0000000000..ffbb6381a6 --- /dev/null +++ b/addons/loadout/fnc_getLoadout.sqf @@ -0,0 +1,37 @@ +#include "script_component.hpp" +/* ---------------------------------------------------------------------------- +Function: CBA_fnc_getLoadout +Description: + Get a unit's extended loadout +Parameters: + _unit - The unit to set the loadout on. +Returns: + Extended Loadout +Examples: + (begin example) + [player] call CBA_fnc_getLoadout + (end) +Author: + Brett Mayson +---------------------------------------------------------------------------- */ + +params [ + ["_unit", objNull, [objNull]] +]; + +if (_unit isEqualTo objNull) exitWith {[]}; + +private _loadout = getUnitLoadout _unit; +private _extendedInfo = createHashMap; + +{ + private _info = [_unit, _loadout] call _y; + if !(isNil "_info") then { + _extendedInfo set [_x, _info]; + }; +} forEach GVAR(getHandlers); + +[ + _loadout, + _extendedInfo +] diff --git a/addons/loadout/fnc_removeLoadoutSetHandler.sqf b/addons/loadout/fnc_removeLoadoutSetHandler.sqf new file mode 100644 index 0000000000..8c7274687e --- /dev/null +++ b/addons/loadout/fnc_removeLoadoutSetHandler.sqf @@ -0,0 +1,39 @@ +#include "script_component.hpp" +/* ---------------------------------------------------------------------------- +Function: CBA_fnc_removeLoadoutSetHandler +Description: + Remove a handler for CBA_fnc_setUnitLoadout. +Parameters: + _id - The id of the handler. + _index - The index of the handler. +Returns: + Nothing. +Examples: + (begin example) + MY_HANDLER = ["earplugs", { + params ["_unit", "_state"]; + if (_state) then { + [_unit] call my_earplug_mod_fnc_giveEarplugs; + } else { + [_unit] call my_earplug_mod_fnc_removeEarplugs; + }; + ["earplugs", MY_HANDLER] call CBA_fnc_removeLoadoutSetHandler; + }] call CBA_fnc_removeLoadoutSetHandler; + (end) +Author: + Brett Mayson +---------------------------------------------------------------------------- */ + +params [ + ["_id", "", [""]], + ["_index", -1, [0]] +]; + +if (_id isEqualTo "") exitWith {false}; +if (_index isEqualTo -1) exitWith {false}; + +if !(_id in (GVAR(setHandlers))) exitWith {false}; + +(GVAR(setHandlers) get _id) set [_index, {}]; + +true diff --git a/addons/loadout/fnc_setLoadout.sqf b/addons/loadout/fnc_setLoadout.sqf new file mode 100644 index 0000000000..dfd6762ee3 --- /dev/null +++ b/addons/loadout/fnc_setLoadout.sqf @@ -0,0 +1,42 @@ +#include "script_component.hpp" +/* ---------------------------------------------------------------------------- +Function: CBA_fnc_setLoadout +Description: + Set a unit's extended loadout +Parameters: + _unit - The unit to set the loadout on. + _loadout - The extended loadout to set. + _fullMagazines - Partially emptied magazines will be refilled when the loadout is applied. +Returns: + Nothing +Examples: + (begin example) + [player] call CBA_fnc_setLoadout + (end) +Author: + Brett Mayson +---------------------------------------------------------------------------- */ + +params [ + ["_unit", objNull, [objNull]], + ["_loadout", [], [[]]], + ["_fullMagazines", false, [false]] +]; + +if (_unit isEqualTo objNull) exitWith {}; + +_unit setUnitLoadout [_loadout select 0, _fullMagazines]; + +private _extendedInfo = createHashMapFromArray (_loadout select 1); + +{ + private _id = _x; + { + _x params ["_function", "_default"]; + if (_id in _extendedInfo) then { + [_unit, _extendedInfo get _id] call _function; + } else { + [_unit, _default] call _function; + }; + } forEach (GVAR(setHandlers) get _id); +} forEach (keys GVAR(setHandlers)); diff --git a/addons/loadout/script_component.hpp b/addons/loadout/script_component.hpp new file mode 100644 index 0000000000..d1b041eb8a --- /dev/null +++ b/addons/loadout/script_component.hpp @@ -0,0 +1,12 @@ +#define COMPONENT loadout +#include "\x\cba\addons\main\script_mod.hpp" + +#ifdef DEBUG_ENABLED_LOADOUT + #define DEBUG_MODE_FULL +#endif + +#ifdef DEBUG_SETTINGS_LOADOUT + #define DEBUG_SETTINGS DEBUG_SETTINGS_LOADOUT +#endif + +#include "\x\cba\addons\main\script_macros.hpp" From ecfdf6a923f57404f8d14b5ba877b8e6cb376998 Mon Sep 17 00:00:00 2001 From: Brett Date: Mon, 20 Sep 2021 12:14:39 -0600 Subject: [PATCH 026/111] remove empty files --- addons/loadout/CfgEventHandlers.hpp | 6 ------ addons/loadout/XEH_PREP.sqf | 0 addons/loadout/XEH_postInit.sqf | 0 addons/loadout/XEH_preInit.sqf | 2 -- addons/loadout/XEH_preStart.sqf | 3 --- 5 files changed, 11 deletions(-) delete mode 100644 addons/loadout/XEH_PREP.sqf delete mode 100644 addons/loadout/XEH_postInit.sqf delete mode 100644 addons/loadout/XEH_preStart.sqf diff --git a/addons/loadout/CfgEventHandlers.hpp b/addons/loadout/CfgEventHandlers.hpp index 865276cfba..9b160c1600 100644 --- a/addons/loadout/CfgEventHandlers.hpp +++ b/addons/loadout/CfgEventHandlers.hpp @@ -1,9 +1,3 @@ -class Extended_PreStart_EventHandlers { - class ADDON { - init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); - }; -}; - class Extended_PreInit_EventHandlers { class ADDON { init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); diff --git a/addons/loadout/XEH_PREP.sqf b/addons/loadout/XEH_PREP.sqf deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/addons/loadout/XEH_postInit.sqf b/addons/loadout/XEH_postInit.sqf deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/addons/loadout/XEH_preInit.sqf b/addons/loadout/XEH_preInit.sqf index 9942d3a19d..ab2deab1ff 100644 --- a/addons/loadout/XEH_preInit.sqf +++ b/addons/loadout/XEH_preInit.sqf @@ -2,8 +2,6 @@ ADDON = false; -#include "XEH_PREP.sqf" - GVAR(getHandlers) = createHashMap; GVAR(setHandlers) = createHashMap; diff --git a/addons/loadout/XEH_preStart.sqf b/addons/loadout/XEH_preStart.sqf deleted file mode 100644 index 43f1adee32..0000000000 --- a/addons/loadout/XEH_preStart.sqf +++ /dev/null @@ -1,3 +0,0 @@ -#include "script_component.hpp" - -#include "XEH_PREP.sqf" From 7ca27d247715638d65f2ad92bdfd4c5420b0b614 Mon Sep 17 00:00:00 2001 From: Brett Mayson Date: Sat, 2 Oct 2021 20:09:16 +0000 Subject: [PATCH 027/111] review changes --- addons/loadout/fnc_addLoadoutSetHandler.sqf | 1 + addons/loadout/fnc_setLoadout.sqf | 12 ++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/addons/loadout/fnc_addLoadoutSetHandler.sqf b/addons/loadout/fnc_addLoadoutSetHandler.sqf index ff840f6b87..2d1fbf667a 100644 --- a/addons/loadout/fnc_addLoadoutSetHandler.sqf +++ b/addons/loadout/fnc_addLoadoutSetHandler.sqf @@ -6,6 +6,7 @@ Description: Parameters: _id - The id of the handler. _function - The function you wish to execute. + _default - The default value when the get handler return nil Passed Arguments: _this 0: _unit - The unit to set the loadout on. diff --git a/addons/loadout/fnc_setLoadout.sqf b/addons/loadout/fnc_setLoadout.sqf index dfd6762ee3..be073bdda9 100644 --- a/addons/loadout/fnc_setLoadout.sqf +++ b/addons/loadout/fnc_setLoadout.sqf @@ -23,7 +23,7 @@ params [ ["_fullMagazines", false, [false]] ]; -if (_unit isEqualTo objNull) exitWith {}; +if (isNull _unit) exitWith {}; _unit setUnitLoadout [_loadout select 0, _fullMagazines]; @@ -33,10 +33,6 @@ private _extendedInfo = createHashMapFromArray (_loadout select 1); private _id = _x; { _x params ["_function", "_default"]; - if (_id in _extendedInfo) then { - [_unit, _extendedInfo get _id] call _function; - } else { - [_unit, _default] call _function; - }; - } forEach (GVAR(setHandlers) get _id); -} forEach (keys GVAR(setHandlers)); + [_unit, _extendedInfo getOrDefault [_id, _default] call _function; + } forEach _y; +} forEach GVAR(setHandlers); From bce27454c95b6677bd4eac0b08dbd16e1f99aa73 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sun, 3 Oct 2021 13:53:32 -0500 Subject: [PATCH 028/111] Events - Fix muzzle event args (BREAKING) --- addons/events/fnc_playerEvent.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/events/fnc_playerEvent.sqf b/addons/events/fnc_playerEvent.sqf index c281dcf620..4bb8011f47 100644 --- a/addons/events/fnc_playerEvent.sqf +++ b/addons/events/fnc_playerEvent.sqf @@ -89,7 +89,7 @@ if (_state isNotEqualTo GVAR(oldState)) then { }; if (_newMuzzle isNotEqualTo GVAR(oldMuzzle)) then { - [QGVAR(muzzleEvent), [_newMuzzle select 2, GVAR(oldMuzzle) select 2]] call CBA_fnc_localEvent; + [QGVAR(muzzleEvent), [_unit, _newMuzzle select 2, GVAR(oldMuzzle) select 2]] call CBA_fnc_localEvent; GVAR(oldMuzzle) = _newMuzzle; }; From 295ed99330f0ca8ff36d642c0d2463f8ae73e3ea Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sun, 3 Oct 2021 17:06:07 -0500 Subject: [PATCH 029/111] Prep v3.15.6 --- README.md | 2 +- addons/main/script_version.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2fcbe18b67..7aa94cfec0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Community Base Addons [![](https://img.shields.io/travis/CBATeam/CBA_A3.svg?style=flat-square)](https://travis-ci.org/CBATeam/CBA_A3) [![](https://img.shields.io/badge/Changelog-Link-orange.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) -[![](https://img.shields.io/badge/Release-3.15.5-blue.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) +[![](https://img.shields.io/badge/Release-3.15.6-blue.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) [![](https://img.shields.io/badge/Github-Wiki-lightgrey.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/wiki) [![](https://img.shields.io/badge/BIF-Thread-lightgrey.svg?style=flat-square)](https://forums.bistudio.com/topic/168277-cba-community-base-addons-arma-3) [![](https://img.shields.io/badge/Function-Documentation-yellow.svg?style=flat-square)](https://cbateam.github.io/CBA_A3/docs/files/overview-txt.html) diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index ffd4670596..31f33db8a1 100755 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 3 #define MINOR 15 -#define PATCHLVL 5 +#define PATCHLVL 6 #define BUILD 000000 From 0fb4db141bc57a26900ac94df9f15bdcaca39187 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 4 Oct 2021 13:51:33 -0500 Subject: [PATCH 030/111] Update /includes for ArmA 2.06 --- include/a3/ui_f/hpp/defineResincl.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/a3/ui_f/hpp/defineResincl.inc b/include/a3/ui_f/hpp/defineResincl.inc index a7eedf3a1b..818fd438ce 100644 --- a/include/a3/ui_f/hpp/defineResincl.inc +++ b/include/a3/ui_f/hpp/defineResincl.inc @@ -1312,6 +1312,8 @@ enum #define IDC_OPTIONS_SHADOW_VISIBILIT_TEXT 313 #define IDC_OPTIONS_TRAFFIC_VISIBILITY_VALUE 314 #define IDC_OPTIONS_TRAFFIC_VISIBILITY_SLIDER 315 +#define IDC_OPTIONS_PIP_VISIBILITY_VALUE 316 +#define IDC_OPTIONS_PIP_VISIBILITY_SLIDER 317 #define IDC_OPTIONS_PIP_VALUE 334 #define IDC_OPTIONS_SW_VALUE 335 From cb792b36a48e0094389ab3c3024207f0917f6786 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 9 Oct 2021 17:57:58 -0500 Subject: [PATCH 031/111] Common - Add support for commander turrets to cba_common_fnc_turretDir --- addons/common/fnc_turretDir.sqf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/common/fnc_turretDir.sqf b/addons/common/fnc_turretDir.sqf index f3dd02600b..152e608e21 100644 --- a/addons/common/fnc_turretDir.sqf +++ b/addons/common/fnc_turretDir.sqf @@ -33,6 +33,9 @@ private _gunBeg = _vehicle selectionPosition getText (_turretConfig >> "gunBeg") private _gunEnd = _vehicle selectionPosition getText (_turretConfig >> "gunEnd"); if (_gunEnd isEqualTo _gunBeg) then { + if ((getNumber (_turretConfig >> "primaryObserver")) == 1) exitWith { + _gunBeg = _gunEnd vectorAdd (_vehicle vectorWorldToModel eyeDirection _vehicle); + }; private _vehicleConfig = configOf _vehicle; if (((getNumber (_vehicleConfig >> "isUAV")) == 1) && {_turret isEqualto [0]}) then { _gunBeg = _vehicle selectionPosition getText (_vehicleConfig >> "uavCameraGunnerDir"); @@ -43,8 +46,8 @@ if (_gunEnd isEqualTo _gunBeg) then { }; if !(_relativeToModel) then { - _gunBeg = AGLToASL (_vehicle modelToWorld _gunBeg); - _gunEnd = AGLToASL (_vehicle modelToWorld _gunEnd); + _gunBeg = _vehicle modelToWorldWorld _gunBeg; + _gunEnd = _vehicle modelToWorldWorld _gunEnd; }; private _turretDir = _gunEnd vectorFromTo _gunBeg; From 3ea279b133fed883179508f58ffceda58a72e626 Mon Sep 17 00:00:00 2001 From: Dedmen Miller Date: Mon, 11 Oct 2021 17:23:04 +0200 Subject: [PATCH 032/111] Add bipod support for accessory/switchAttachment --- addons/accessory/fnc_switchAttachment.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/accessory/fnc_switchAttachment.sqf b/addons/accessory/fnc_switchAttachment.sqf index 18b47f5fb6..0dcd592ba8 100644 --- a/addons/accessory/fnc_switchAttachment.sqf +++ b/addons/accessory/fnc_switchAttachment.sqf @@ -6,7 +6,7 @@ Description: Switches weapon accessories for the player. Parameters: - 0: _itemType - Attachment type (0: muzzle, 1: rail, 2: optic). + 0: _itemType - Attachment type (0: muzzle, 1: rail, 2: optic, 3: bipod). 1: _switchTo - Switch to "next" or "prev" attachement Returns: From 47e88533433f8dc63ffa7d1d3d5d3bb6efba16ca Mon Sep 17 00:00:00 2001 From: Krzyciu <63709320+Krzyciu@users.noreply.github.com> Date: Tue, 12 Oct 2021 08:49:10 +0200 Subject: [PATCH 033/111] Polish translation --- addons/ai/stringtable.xml | 2 ++ addons/characters/stringtable.xml | 2 ++ addons/network/stringtable.xml | 8 ++++++++ addons/strings/stringtable.xml | 2 +- addons/ui/stringtable.xml | 2 ++ optionals/legacy_jr/stringtable.xml | 1 + 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/addons/ai/stringtable.xml b/addons/ai/stringtable.xml index 0b6ac47a4b..80cb77eee1 100644 --- a/addons/ai/stringtable.xml +++ b/addons/ai/stringtable.xml @@ -45,11 +45,13 @@ Invisible Target Vehicle Unsichtbares Ziel - Fahrzeug Cible invisible - Véhicule + Pojazd - niewidoczny cel Invisible Target Airplane Unsichtbares Ziel - Flugzeug Cible invisible - Avion + Samolot - niewidoczny cel diff --git a/addons/characters/stringtable.xml b/addons/characters/stringtable.xml index 79c92ddd96..f1096e8321 100755 --- a/addons/characters/stringtable.xml +++ b/addons/characters/stringtable.xml @@ -5,11 +5,13 @@ Community Base Addons - Characters Community Base Addons - Charaktere Community Base Addons - Personnages + Community Base Addons - Postacie Men (Malaria-Infected) Männer (Malaria infiziert) Hommes (Infectés par la malaria) + Ludzie (Zainfekowany malarią) diff --git a/addons/network/stringtable.xml b/addons/network/stringtable.xml index 88e093d493..a016864787 100644 --- a/addons/network/stringtable.xml +++ b/addons/network/stringtable.xml @@ -33,41 +33,49 @@ Loadout Validation Überprüfung von Ausrüstungen Vérification de l'équipement + Sprawdzenie wyposażenia Validate loadout of units. Fixes an issue where units appear naked after changing locality. Überprüfe die Ausrüstung von Einheiten. Korrigiert den Fehler, bei dem Einheiten nackt sind nach einer Änderung deren Lokalität. Vérifie l'équipement des unités. Correction d'un bug où les unités se retrouvaient nues après avoir changé de localité. + Sprawdza wyposażenie jednostek. Naprawia problem, który powodował pojawianie się jednostek nagich, przy zmianie lokalności. Never Niemals Jamais + Nigdy Never validate loadouts Überprüfe niemals Ausrüstungen Ne jamais vérifier les équipements + Nigdy nie sprawdzaj wyposażenia Playable units only Nur spielbare Einheiten Pour les unités jouables + Tylko grywalne jednostki Validate only loadout of playable units Überprüfe nur die Ausrüstung von spielbaren Einheiten Vérifier uniquement l'équipement des unités jouables + Sprawdza wyposażenie tylko jednostek oznaczonych jako grywalne All units Alle Einheiten Pour toutes les unités + Wszystkie jednostki Validate loadout of all units Überprüfe die Ausrüstungen von allen Einheiten Vérifier l'équipement de toutes les unités + Sprawdza wyposażenie wszystkich jednostek diff --git a/addons/strings/stringtable.xml b/addons/strings/stringtable.xml index 5677ad0e1a..338aecf485 100644 --- a/addons/strings/stringtable.xml +++ b/addons/strings/stringtable.xml @@ -34,7 +34,7 @@ , . - + . diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index 4641a4584b..e9cca029ce 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -263,12 +263,14 @@ Reihenfolge der Gruppen wird angepasst ... Modification de l'ordre des groupes... Ajustar el orden del grupo... + Dostosowywanie kolejności w lobby... Back up mission before using this tool. Erstelle vor Gebrauch eine Sicherungskopie. Sauvegardez la mission avant d'utiliser cet outil. Haga una copia de seguridad de la misión antes de usar esta herramienta + Wykonaj kopię zapasową misji przed użyciem tego narzędzia. diff --git a/optionals/legacy_jr/stringtable.xml b/optionals/legacy_jr/stringtable.xml index 0d10103caf..96f37882b1 100644 --- a/optionals/legacy_jr/stringtable.xml +++ b/optionals/legacy_jr/stringtable.xml @@ -8,6 +8,7 @@ Community Base Addons - Legacy Joint Rails 社群基礎模組 - Legacy版共用導軌 Community Base Addons - Legacy Joint Rails + Community Base Addons - Legacy Joint Rails From d60f2659f88351c8941ea5912e7d12c0ea8589c7 Mon Sep 17 00:00:00 2001 From: Krzyciu <63709320+Krzyciu@users.noreply.github.com> Date: Tue, 12 Oct 2021 15:04:52 +0200 Subject: [PATCH 034/111] Update addons/characters/stringtable.xml Co-authored-by: Filip Maciejewski --- addons/characters/stringtable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/characters/stringtable.xml b/addons/characters/stringtable.xml index f1096e8321..eab106161f 100755 --- a/addons/characters/stringtable.xml +++ b/addons/characters/stringtable.xml @@ -11,7 +11,7 @@ Men (Malaria-Infected) Männer (Malaria infiziert) Hommes (Infectés par la malaria) - Ludzie (Zainfekowany malarią) + Ludzie (Zainfekowani malarią) From 4f7ef1f26b04b36658533037587095b88b40eeb4 Mon Sep 17 00:00:00 2001 From: Krzyciu <63709320+Krzyciu@users.noreply.github.com> Date: Tue, 12 Oct 2021 15:05:03 +0200 Subject: [PATCH 035/111] Update addons/strings/stringtable.xml Co-authored-by: Filip Maciejewski --- addons/strings/stringtable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/strings/stringtable.xml b/addons/strings/stringtable.xml index 338aecf485..5677ad0e1a 100644 --- a/addons/strings/stringtable.xml +++ b/addons/strings/stringtable.xml @@ -34,7 +34,7 @@ , . - . + From 929649b31d61c235ab02623400240263161c1f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Fri, 15 Oct 2021 13:45:27 +0200 Subject: [PATCH 036/111] GitHub Actions pboProject (#1451) --- .github/workflows/pboproject.yml | 65 ++++++++++++++++++++++++++++++++ tools/make.py | 40 +++++++++++++------- 2 files changed, 91 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/pboproject.yml diff --git a/.github/workflows/pboproject.yml b/.github/workflows/pboproject.yml new file mode 100644 index 0000000000..570b36af68 --- /dev/null +++ b/.github/workflows/pboproject.yml @@ -0,0 +1,65 @@ +name: pboProject + +on: + push: + branches: + - master + pull_request_target: + +jobs: + pboproject: + runs-on: windows-2019 + steps: + - name: Install Arma 3 Tools + uses: arma-actions/arma3-tools@master + with: + toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }} + - name: Install Mikero Tools + uses: arma-actions/mikero-tools@2021-04-10 + - name: Download game data + run: | + Invoke-WebRequest "$env:ARMA3_DATA_URL" -OutFile arma3.zip + $files = @("arma3.zip") + ForEach ($file in $files) { + Extract-7Zip -Path $file -DestinationPath . + Remove-Item $file + } + env: + ARMA3_DATA_URL: ${{ secrets.ARMA3_DATA_URL }} + - name: Checkout CBA A3 + uses: actions/checkout@v2 + with: + path: x\cba + persist-credentials: false + - name: Checkout pull request + uses: actions/checkout@v2 + if: ${{ github.event_name == 'pull_request_target' }} + with: + path: pullrequest + ref: 'refs/pull/${{ github.event.number }}/merge' + - name: Replace addons with pull request addons + if: ${{ github.event_name == 'pull_request_target' }} + run: | + rm -r x\cba\addons\ + rm -r x\cba\optionals\ + xcopy /e /h /q pullrequest\addons x\cba\addons\ + xcopy /e /h /q pullrequest\optionals x\cba\optionals\ + - name: Setup build environment + run: | + subst P: . + pboproject -P + - name: Build + run: py P:\x\cba\tools\make.py ci + env: + PYTHONUNBUFFERED: 1 + - name: Archive logs + uses: actions/upload-artifact@v2 + if: ${{ always() }} + with: + name: logs + path: temp/*.log + - name: Archive @cba_a3 + uses: actions/upload-artifact@v2 + with: + name: '@cba_a3-${{ github.sha }}' + path: x\cba\release\@cba_a3 diff --git a/tools/make.py b/tools/make.py index 879d55d74d..bd7f858fb2 100644 --- a/tools/make.py +++ b/tools/make.py @@ -228,6 +228,17 @@ def find_bi_tools(work_drive): else: raise Exception("BadTools","Arma 3 Tools are not installed correctly or the P: drive needs to be created.") +def mikero_windows_registry(path, access=winreg.KEY_READ): + try: + return winreg.OpenKey(winreg.HKEY_CURRENT_USER, r"Software\Mikero\{}".format(path), access=access) + except FileNotFoundError: + try: + return winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"Software\Mikero\{}".format(path), access=access) + except FileNotFoundError: + try: + return winreg.OpenKey(winreg.HKEY_CURRENT_USER, r"Software\Wow6432Node\Mikero\{}".format(path), access=access) + except FileNotFoundError: + return winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"Software\Wow6432Node\Mikero\{}".format(path), access=access) def find_depbo_tools(): """Use registry entries to find DePBO-based tools.""" @@ -236,20 +247,8 @@ def find_depbo_tools(): for tool in requiredToolPaths: try: - try: - k = winreg.OpenKey(winreg.HKEY_CURRENT_USER, r"Software\Mikero\{}".format(tool)) - path = winreg.QueryValueEx(k, "exe")[0] - except FileNotFoundError: - try: - k = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"Software\Mikero\{}".format(tool)) - path = winreg.QueryValueEx(k, "exe")[0] - except FileNotFoundError: - try: - k = winreg.OpenKey(winreg.HKEY_CURRENT_USER, r"Software\Wow6432Node\Mikero\{}".format(tool)) - path = winreg.QueryValueEx(k, "exe")[0] - except FileNotFoundError: - k = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"Software\Wow6432Node\Mikero\{}".format(tool)) - path = winreg.QueryValueEx(k, "exe")[0] + k = mikero_windows_registry(tool) + path = winreg.QueryValueEx(k, "exe")[0] except FileNotFoundError: print_error("Could not find {}".format(tool)) failed = True @@ -265,6 +264,17 @@ def find_depbo_tools(): return requiredToolPaths +def pboproject_settings(): + """Use registry entries to configure needed pboproject settings.""" + value_exclude = "thumbs.db,*.txt,*.h,*.dep,*.cpp,*.bak,*.png,*.log,*.pew,source,*.tga" + + try: + k = mikero_windows_registry(r"pboProject\Settings", access=winreg.KEY_SET_VALUE) + winreg.SetValueEx(k, "m_exclude", 0, winreg.REG_SZ, value_exclude) + winreg.SetValueEx(k, "m_exclude2", 0, winreg.REG_SZ, value_exclude) + except: + raise Exception("BadDePBO", "pboProject not installed correctly, make sure to run it at least once") + def color(color): """Set the color. Works on Win32 and normal terminals.""" @@ -1029,6 +1039,8 @@ def main(argv): pboproject = depbo_tools["pboProject"] rapifyTool = depbo_tools["rapify"] makepboTool = depbo_tools["MakePbo"] + + pboproject_settings() except: raise print_error("Could not find dePBO tools. Download the needed tools from: https://dev.withsix.com/projects/mikero-pbodll/files") From fbd247a5a079df38d2299c527d9d9623f45bc130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Mon, 18 Oct 2021 13:10:42 +0200 Subject: [PATCH 037/111] XEH - Fix issues with SOG PF --- addons/xeh/CfgVehicles.hpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/addons/xeh/CfgVehicles.hpp b/addons/xeh/CfgVehicles.hpp index 803d5ca44a..49ef5ae303 100644 --- a/addons/xeh/CfgVehicles.hpp +++ b/addons/xeh/CfgVehicles.hpp @@ -427,4 +427,25 @@ class CfgVehicles { class GalleryDioramaUnit_01_base_F: Items_base_F { XEH_ENABLED; }; + + // SOG PF + class vn_object_b_base_02: Items_base_F {}; + class Land_vn_candle_01: vn_object_b_base_02 { + XEH_ENABLED; + }; + + class vn_krait: Snake_random_F { + XEH_ENABLED; + }; + + class vn_parachute_02_base: ParachuteBase {}; + class vn_b_parachute_02: vn_parachute_02_base {}; + class vn_b_parachute_02_blu82: vn_b_parachute_02 {}; + class vn_b_parachute_02_blu82_airdrop: vn_b_parachute_02_blu82 { + XEH_ENABLED; + }; + + class vn_o_static_rsna75_wreck: PlaneWreck { + XEH_ENABLED; + }; }; From 37401523ff671a603939f59510631246627d9b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Fri, 22 Oct 2021 02:46:56 +0200 Subject: [PATCH 038/111] XEH - Fix issues with CSLA --- addons/xeh/CfgVehicles.hpp | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/addons/xeh/CfgVehicles.hpp b/addons/xeh/CfgVehicles.hpp index 803d5ca44a..7f909f9519 100644 --- a/addons/xeh/CfgVehicles.hpp +++ b/addons/xeh/CfgVehicles.hpp @@ -427,4 +427,37 @@ class CfgVehicles { class GalleryDioramaUnit_01_base_F: Items_base_F { XEH_ENABLED; }; + + // CSLA + class StaticATWeapon; + class CSLA_9K113_Stat: StaticATWeapon { + XEH_ENABLED; + }; + + class CSLA_M52_Stat: Mortar_01_base_F { + XEH_ENABLED; + }; + + class CSLA_CIV_AN2_wreck: PlaneWreck { + XEH_ENABLED; + }; + + class CSLA_Plane_base_F: Plane_Base_F {}; + class CSLA_CIV_Plane_base_F: CSLA_Plane_base_F {}; + class CSLA_CIV_Plane_base: CSLA_CIV_Plane_base_F { + XEH_ENABLED; + }; + + class StaticMGWeapon; + class CSLA_UK59L_Stat: StaticMGWeapon { + XEH_ENABLED; + }; + + class CSLA_UK59T_Stat: StaticMGWeapon { + XEH_ENABLED; + }; + + class US85_M252_Stat: Mortar_01_base_F { + XEH_ENABLED; + }; }; From 5e6f87ba61e2672e17d26ad7765c2c34a7c491ff Mon Sep 17 00:00:00 2001 From: BaerMitUmlaut Date: Wed, 27 Oct 2021 21:06:01 +0200 Subject: [PATCH 039/111] Fix nil throwing errors in scheduled environment --- addons/hashes/fnc_encodeJSON.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hashes/fnc_encodeJSON.sqf b/addons/hashes/fnc_encodeJSON.sqf index d8a08a193f..5c94b33210 100644 --- a/addons/hashes/fnc_encodeJSON.sqf +++ b/addons/hashes/fnc_encodeJSON.sqf @@ -86,7 +86,7 @@ switch (typeName _object) do { private _json = ((allVariables _object) apply { private _name = _x; - private _value = _object getVariable _name; + private _value = _object getVariable [_name, objNull]; format ["%1: %2", [_name] call CBA_fnc_encodeJSON, [_value] call CBA_fnc_encodeJSON] }) joinString ", "; From efe845bd1601d29144a7853ab2d1474c7da8c892 Mon Sep 17 00:00:00 2001 From: BaerMitUmlaut Date: Wed, 27 Oct 2021 23:48:12 +0200 Subject: [PATCH 040/111] Add support for encoding and decoding JSON with hash maps --- addons/hashes/fnc_encodeJSON.sqf | 14 ++++++++++ addons/hashes/fnc_parseJSON.sqf | 45 ++++++++++++++++++++++---------- addons/hashes/test_parseJSON.sqf | 6 ++--- 3 files changed, 48 insertions(+), 17 deletions(-) diff --git a/addons/hashes/fnc_encodeJSON.sqf b/addons/hashes/fnc_encodeJSON.sqf index d8a08a193f..6f64bb60e2 100644 --- a/addons/hashes/fnc_encodeJSON.sqf +++ b/addons/hashes/fnc_encodeJSON.sqf @@ -16,6 +16,7 @@ Description: - STRING - TASK - TEAM_MEMBER + - HASHMAP - Everything else will simply be stringified. Parameters: @@ -77,6 +78,19 @@ switch (typeName _object) do { }; }; + case "HASHMAP": { + private _json = ((_object toArray false) apply { + _x params ["_key", ["_value", objNull]]; + + if !(_key isEqualType "") then { + _key = str _key; + }; + + format ["%1: %2", [_key] call CBA_fnc_encodeJSON, [_value] call CBA_fnc_encodeJSON] + }) joinString ", "; + "{" + _json + "}" + }; + default { if !(typeName _object in (supportInfo "u:allVariables*" apply {_x splitString " " select 1})) exitWith { [str _object] call CBA_fnc_encodeJSON diff --git a/addons/hashes/fnc_parseJSON.sqf b/addons/hashes/fnc_parseJSON.sqf index 625f1886a5..d3805fd793 100644 --- a/addons/hashes/fnc_parseJSON.sqf +++ b/addons/hashes/fnc_parseJSON.sqf @@ -6,13 +6,15 @@ Description: Deserializes a JSON string. Parameters: - _json - String containing valid JSON. - _useHashes - Output CBA hashes instead of namespaces - (optional, default: false) + _json - String containing valid JSON. + _objectType - Selects the type used for deserializing objects (optional) + 0, false: CBA namespace (default) + 1, true: CBA hash + 2: Native hash map Returns: - _object - The deserialized JSON object or nil if JSON is invalid. - + _object - The deserialized JSON object or nil if JSON is invalid. + Examples: (begin example) @@ -28,18 +30,33 @@ Author: BaerMitUmlaut ---------------------------------------------------------------------------- */ SCRIPT(parseJSON); -params ["_json", ["_useHashes", false]]; +params ["_json", ["_objectType", 0]]; // Wrappers for creating "objects" and setting values on them private ["_objectSet", "_createObject"]; -if (_useHashes) then { - _createObject = CBA_fnc_hashCreate; - _objectSet = CBA_fnc_hashSet; -} else { - _createObject = CBA_fnc_createNamespace; - _objectSet = { - params ["_obj", "_key", "_val"]; - _obj setVariable [_key, _val]; + +switch (_objectType) do { + case false; + case 0: { + _createObject = CBA_fnc_createNamespace; + _objectSet = { + params ["_obj", "_key", "_val"]; + _obj setVariable [_key, _val]; + }; + }; + + case true; + case 1: { + _createObject = CBA_fnc_hashCreate; + _objectSet = CBA_fnc_hashSet; + }; + + case 2: { + _createObject = { createHashMap }; + _objectSet = { + params ["_obj", "_key", "_val"]; + _obj set [_key, _val]; + }; }; }; diff --git a/addons/hashes/test_parseJSON.sqf b/addons/hashes/test_parseJSON.sqf index 9c02c02a99..f22619d2c7 100644 --- a/addons/hashes/test_parseJSON.sqf +++ b/addons/hashes/test_parseJSON.sqf @@ -108,16 +108,16 @@ private _testCases = [ ]; { - private _useHashes = _x; + private _objectType = _x; { diag_log _x; private _input = _x; - private _object = [_x, _useHashes] call CBA_fnc_parseJSON; + private _object = [_x, _objectType] call CBA_fnc_parseJSON; private _output = [_object] call CBA_fnc_encodeJSON; TEST_OP(_input,==,_output,_fn); } forEach _testCases; -} forEach [true, false]; +} forEach [true, false, 0, 1, 2]; // Special test for complex object because properties are unordered private _json = "{""OBJECT"": null, ""BOOL"": true, ""SCALAR"": 1.2, ""STRING"": ""Hello, World!"", ""ARRAY"": [], ""LOCATION"": {}}"; From 681f28808668334cdc50a0cec9e222d051087c6c Mon Sep 17 00:00:00 2001 From: shukari Date: Wed, 10 Nov 2021 22:51:49 +0100 Subject: [PATCH 041/111] Dont send the result to all --- addons/diagnostic/XEH_preInit.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/diagnostic/XEH_preInit.sqf b/addons/diagnostic/XEH_preInit.sqf index b66a111993..64ee54f46d 100644 --- a/addons/diagnostic/XEH_preInit.sqf +++ b/addons/diagnostic/XEH_preInit.sqf @@ -45,7 +45,7 @@ if (getMissionConfigValue ["EnableTargetDebug", 0] == 1 || {getNumber (configFil missionNamespace setVariable [_varName, [_statementText, _returnString, _duration]]; if (_clientID != CBA_clientID) then { - publicVariable _varName; // send back over network + _clientID publicVariableClient _varName; // send back over network }; }] call CBA_fnc_addEventHandler; From ad3e1d2111e2efd600e001375c2a7d572c7b4df2 Mon Sep 17 00:00:00 2001 From: shukari Date: Wed, 10 Nov 2021 23:22:05 +0100 Subject: [PATCH 042/111] Stringtable entrys for WatchInfoRefreshRate --- addons/diagnostic/stringtable.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/diagnostic/stringtable.xml b/addons/diagnostic/stringtable.xml index 71629a6c58..c2e14f38ab 100644 --- a/addons/diagnostic/stringtable.xml +++ b/addons/diagnostic/stringtable.xml @@ -111,6 +111,12 @@ Type d'indentation qui peut être employée dans la console de débogage.\nTab ajoute une indentation, et Shift + Tab en supprime une. Tipo de sangría que se puede agregar a la expresión en la consola de depuración presionando la tecla Tab o eliminar presionando Shift + Tab + + Refresh rate target watcher field + + + Sets the refresh rate in seconds for the CBA target watcher fields to the right of the debug console + 4 Spaces 4 Spacje From 4b23b2a0f5dcfda4d2b6c6ec0c28cff75a525fdc Mon Sep 17 00:00:00 2001 From: shukari Date: Wed, 10 Nov 2021 23:22:45 +0100 Subject: [PATCH 043/111] Setting for WatchInfoRefreshRate --- addons/diagnostic/initSettings.sqf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/diagnostic/initSettings.sqf b/addons/diagnostic/initSettings.sqf index 53919409d5..30cc44bd19 100644 --- a/addons/diagnostic/initSettings.sqf +++ b/addons/diagnostic/initSettings.sqf @@ -10,3 +10,11 @@ ], 2 ] call CBA_fnc_addSetting; + +[ + QGVAR(watchInfoRefreshRate), "SLIDER", + [LLSTRING(WatchInfoRefreshRate), LLSTRING(WatchInfoRefreshRateTooltip)], + [LELSTRING(main,DisplayName), LELSTRING(UI,Category)], + [0.1, 60, 0.2, 1], + 1 +] call CBA_fnc_addSetting; From 59ca96a81db440031914bf1cc9bfaa21a3b5b276 Mon Sep 17 00:00:00 2001 From: shukari Date: Wed, 10 Nov 2021 23:30:28 +0100 Subject: [PATCH 044/111] watchInfoRefreshRateArray for lastSent --- addons/diagnostic/fnc_initTargetDebugConsole.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/diagnostic/fnc_initTargetDebugConsole.sqf b/addons/diagnostic/fnc_initTargetDebugConsole.sqf index 7026fd1e1e..c7dcebc455 100644 --- a/addons/diagnostic/fnc_initTargetDebugConsole.sqf +++ b/addons/diagnostic/fnc_initTargetDebugConsole.sqf @@ -144,7 +144,7 @@ private _fnc_updateWatchInfo = { missionNamespace setVariable [_varName, nil]; } else { if ((_editText isEqualTo _responseStatement) && {_duration > 0.1}) exitWith {}; // don't re-run if statement that took a long time - if ((diag_tickTime - _lastSent) > random [0.1, 0.2, 0.3]) then { + if ((diag_tickTime - _lastSent) > random GVAR(watchInfoRefreshRateArray)) then { _x set [3, diag_tickTime]; // set last run to now [QGVAR(watchVariable), [CBA_clientID, _varIndex, _editText], GVAR(selectedClientID)] call CBA_fnc_ownerEvent; // send statement to target }; From 1c9da9395544079c9ece7bd4391c6817e7e33491 Mon Sep 17 00:00:00 2001 From: shukari Date: Wed, 10 Nov 2021 23:30:53 +0100 Subject: [PATCH 045/111] Setting for watchInfoRefreshRate --- addons/diagnostic/initSettings.sqf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/diagnostic/initSettings.sqf b/addons/diagnostic/initSettings.sqf index 30cc44bd19..1380b9aaa0 100644 --- a/addons/diagnostic/initSettings.sqf +++ b/addons/diagnostic/initSettings.sqf @@ -15,6 +15,10 @@ QGVAR(watchInfoRefreshRate), "SLIDER", [LLSTRING(WatchInfoRefreshRate), LLSTRING(WatchInfoRefreshRateTooltip)], [LELSTRING(main,DisplayName), LELSTRING(UI,Category)], - [0.1, 60, 0.2, 1], - 1 + [0.2, 60, 0.2, 1], + 1, + { + params ["_value"]; + GVAR(watchInfoRefreshRateArray) = [_value - 0.1, _value, _value + 0.1]; + } ] call CBA_fnc_addSetting; From 63fad66326066afd91e8cb677ee01cca1bc98836 Mon Sep 17 00:00:00 2001 From: shukari Date: Thu, 11 Nov 2021 09:06:46 +0100 Subject: [PATCH 046/111] Update addons/diagnostic/stringtable.xml Co-authored-by: commy2 --- addons/diagnostic/stringtable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/diagnostic/stringtable.xml b/addons/diagnostic/stringtable.xml index c2e14f38ab..d77bc3ec87 100644 --- a/addons/diagnostic/stringtable.xml +++ b/addons/diagnostic/stringtable.xml @@ -115,7 +115,7 @@ Refresh rate target watcher field - Sets the refresh rate in seconds for the CBA target watcher fields to the right of the debug console + Refresh rate (in seconds) for the CBA target watcher fields to the right of the debug console. 4 Spaces From b706730c63663b10d7b49d24bde208995706d01a Mon Sep 17 00:00:00 2001 From: Steve Zhao Date: Sat, 13 Nov 2021 22:38:00 -0500 Subject: [PATCH 047/111] prevent switching accessory while in Zeus --- addons/accessory/fnc_switchAttachment.sqf | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/accessory/fnc_switchAttachment.sqf b/addons/accessory/fnc_switchAttachment.sqf index 18b47f5fb6..971a7db5d1 100644 --- a/addons/accessory/fnc_switchAttachment.sqf +++ b/addons/accessory/fnc_switchAttachment.sqf @@ -23,6 +23,7 @@ Author: ---------------------------------------------------------------------------- */ params ["_itemType", "_switchTo"]; +if (!isNull curatorCamera) exitWith {}; private ["_currItem", "_switchItem"]; private _unit = call CBA_fnc_currentUnit; From 6b88736341541b1b6a72e62f76e8e3dda8e431cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Sun, 14 Nov 2021 20:47:04 +0100 Subject: [PATCH 048/111] Update Mikero Tools to public version released 2021-11-06 --- .github/workflows/pboproject.yml | 2 +- tools/make.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pboproject.yml b/.github/workflows/pboproject.yml index 570b36af68..b09abe5fad 100644 --- a/.github/workflows/pboproject.yml +++ b/.github/workflows/pboproject.yml @@ -15,7 +15,7 @@ jobs: with: toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }} - name: Install Mikero Tools - uses: arma-actions/mikero-tools@2021-04-10 + uses: arma-actions/mikero-tools@2021-11-06 - name: Download game data run: | Invoke-WebRequest "$env:ARMA3_DATA_URL" -OutFile arma3.zip diff --git a/tools/make.py b/tools/make.py index bd7f858fb2..301edfb3d1 100644 --- a/tools/make.py +++ b/tools/make.py @@ -272,6 +272,8 @@ def pboproject_settings(): k = mikero_windows_registry(r"pboProject\Settings", access=winreg.KEY_SET_VALUE) winreg.SetValueEx(k, "m_exclude", 0, winreg.REG_SZ, value_exclude) winreg.SetValueEx(k, "m_exclude2", 0, winreg.REG_SZ, value_exclude) + winreg.SetValueEx(k, "wildcard_exclude_from_pbo_normal", 0, winreg.REG_SZ, value_exclude) + winreg.SetValueEx(k, "wildcard_exclude_from_pbo_unbinarised_missions", 0, winreg.REG_SZ, value_exclude) except: raise Exception("BadDePBO", "pboProject not installed correctly, make sure to run it at least once") From a6184a3db8c36c361448e08cb0a32f4e079003de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Thu, 18 Nov 2021 15:39:11 +0100 Subject: [PATCH 049/111] XEH - Fix issues with Western Sahara --- addons/xeh/CfgVehicles.hpp | 63 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/addons/xeh/CfgVehicles.hpp b/addons/xeh/CfgVehicles.hpp index 83c2148ea4..07057b17f2 100644 --- a/addons/xeh/CfgVehicles.hpp +++ b/addons/xeh/CfgVehicles.hpp @@ -481,4 +481,67 @@ class CfgVehicles { class US85_M252_Stat: Mortar_01_base_F { XEH_ENABLED; }; + + // Western Sahara + class Land_PowerPoleWooden_lxWS: PowerLines_Small_base_F { + XEH_ENABLED; + }; + class Land_PowerPoleWooden_L_lxWS: PowerLines_Small_base_F { + XEH_ENABLED; + }; + class Land_PowerPoleWooden_L_off_lxWS: PowerLines_Small_base_F { + XEH_ENABLED; + }; + + class Site_Camels_lxWS: Module_F { + XEH_ENABLED; + }; + + class C_journalist_F; + class C_Journalist_lxWS: C_journalist_F { + scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'data_f_lxWS')"; + XEH_ENABLED; + }; + + class C_Man_casual_1_F_afro; + class C_Tak_01_A_lxWS: C_Man_casual_1_F_afro { + scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'data_f_lxWS')"; + XEH_ENABLED; + }; + + class B_Soldier_TL_F; + class B_ION_Story_Givens_lxWS: B_Soldier_TL_F { + scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'data_f_lxWS')"; + XEH_ENABLED; + }; + + class B_Soldier_F; + class I_PMC_Soldier_01_lxWS: B_Soldier_F { + scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'data_f_lxWS')"; + }; + class I_PMC_Story_Gustavo_lxWS: I_PMC_Soldier_01_lxWS { + XEH_ENABLED; + }; + + class I_officer_F; + class I_SFIA_officer_lxWS: I_officer_F { + scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'data_f_lxWS')"; + }; + class I_SFIA_Said_lxWS: I_SFIA_officer_lxWS { + XEH_ENABLED; + }; + + class Truck_02_base_F; + class Truck_02_cargo_base_lxWS: Truck_02_base_F { + XEH_ENABLED; + }; + class Truck_02_box_base_lxWS: Truck_02_base_F { + XEH_ENABLED; + }; + class Truck_02_Ammo_base_lxWS: Truck_02_base_F { + XEH_ENABLED; + }; + class Truck_02_aa_base_lxWS: Truck_02_base_F { + XEH_ENABLED; + }; }; From 0395b44a8d909148e1431d9e89f325d4e5725ff4 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 18 Nov 2021 11:10:55 -0600 Subject: [PATCH 050/111] Update CfgVehicles.hpp --- addons/xeh/CfgVehicles.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/xeh/CfgVehicles.hpp b/addons/xeh/CfgVehicles.hpp index 07057b17f2..7e0285a782 100644 --- a/addons/xeh/CfgVehicles.hpp +++ b/addons/xeh/CfgVehicles.hpp @@ -497,7 +497,6 @@ class CfgVehicles { XEH_ENABLED; }; - class C_journalist_F; class C_Journalist_lxWS: C_journalist_F { scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'data_f_lxWS')"; XEH_ENABLED; @@ -523,7 +522,6 @@ class CfgVehicles { XEH_ENABLED; }; - class I_officer_F; class I_SFIA_officer_lxWS: I_officer_F { scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'data_f_lxWS')"; }; From 6817bb2aff65c5f3d4995907a5bdafe3bff796be Mon Sep 17 00:00:00 2001 From: Drofseh Date: Sat, 27 Nov 2021 00:47:45 -0800 Subject: [PATCH 051/111] improve CBA_fnc_addMagazine and CBA_fnc_addMagazineCargo - improve CBA_fnc_addMagazineCargo by allowing the number of rounds to be specified. - improve CBA_fnc_addMagazine by trying to add the magazine to vehicle _unit before throwing it out the window onto the ground, and also pass ammo count to CBA_fnc_addMagazineCargo, so that a partial mag doesn't magically become full --- addons/common/fnc_addMagazine.sqf | 21 +++++++++++++-------- addons/common/fnc_addMagazineCargo.sqf | 11 ++++++----- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/addons/common/fnc_addMagazine.sqf b/addons/common/fnc_addMagazine.sqf index e1ab8e1fc0..014d19ca13 100644 --- a/addons/common/fnc_addMagazine.sqf +++ b/addons/common/fnc_addMagazine.sqf @@ -49,7 +49,7 @@ if (!isClass _config || {getNumber (_config >> "scope") < 2}) exitWith { }; if (_verify) then { - if (_unit canAdd _item) then { + if (_unit canAdd _item || {[_unit, _item, 1, true, true, true] call CBA_fnc_canAddItem}) then { // canAdd works for vehicles and units, CBA_fnc_canAddItem is more precise for units, but only try if canAdd fails for them if (_ammo < 0) then { _unit addMagazine [_item, 1E6]; // addMagazine STRING is not synched when used on remote units. addMagazine ARRAY is. } else { @@ -58,16 +58,21 @@ if (_verify) then { _return = true; } else { - _unit switchMove "ainvpknlmstpslaywrfldnon_1"; + private _vehicleUnit = vehicle _unit; + if (_vehicleUnit isEqualTo _unit) then { + _unit switchMove "ainvpknlmstpslaywrfldnon_1"; - private _weaponHolder = nearestObject [_unit, "WeaponHolder"]; + private _weaponHolder = nearestObject [_unit, "WeaponHolder"]; - if (isNull _weaponHolder || {_unit distance _weaponHolder > 2}) then { - _weaponHolder = createVehicle ["GroundWeaponHolder", [0,0,0], [], 0, "NONE"]; - _weaponHolder setPosASL getPosASL _unit; - }; + if (isNull _weaponHolder || {_unit distance _weaponHolder > 2}) then { + _weaponHolder = createVehicle ["GroundWeaponHolder", [0,0,0], [], 0, "NONE"]; + _weaponHolder setPosASL getPosASL _unit; + }; - [_weaponHolder, _item] call CBA_fnc_addMagazineCargo; + _return = [_weaponHolder, _item, 1, _verify, _ammo] call CBA_fnc_addMagazineCargo; + } else { + _return = [_vehicleUnit, _item, 1, _verify, _ammo] call CBA_fnc_addMagazineCargo; + }; }; } else { if (_ammo < 0) then { diff --git a/addons/common/fnc_addMagazineCargo.sqf b/addons/common/fnc_addMagazineCargo.sqf index f57fab7b42..56d3979fe6 100644 --- a/addons/common/fnc_addMagazineCargo.sqf +++ b/addons/common/fnc_addMagazineCargo.sqf @@ -13,6 +13,7 @@ Parameters: _item - name of magazine to _count - number of magazines to add (Default: 1) _verify - if true, then put item on the ground if it can't be added + _ammo - ammo count (Default: 1E6) Returns: true on success, false otherwise @@ -31,7 +32,7 @@ Author: ---------------------------------------------------------------------------- */ SCRIPT(addMagazineCargo); -params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_verify", false, [false]]]; +params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_verify", false, [false]], ["_ammo", 1E6, [0]]]; private _return = false; @@ -54,11 +55,11 @@ if (isNull _config || {getNumber (_config >> "scope") < 2}) exitWith { if (_verify) then { if (_container canAdd [_item, _count]) then { - _container addMagazineCargoGlobal [_item, _count]; + _container addMagazineAmmoCargo [_item, _count, _ammo]; _return = true; } else { while {_container canAdd _item && {_count > 0}} do { - _container addMagazineCargoGlobal [_item, 1]; + _container addMagazineAmmoCargo [_item, 1, _ammo]; _count = _count - 1; }; @@ -69,10 +70,10 @@ if (_verify) then { _weaponHolder setPosATL (getPosATL _container vectorAdd [random 2 - 1, random 2 - 1, 0]); }; - _weaponHolder addMagazineCargoGlobal [_item, _count]; + _weaponHolder addMagazineAmmoCargo [_item, _count, _ammo]; }; } else { - _container addMagazineCargoGlobal [_item, _count]; + _container addMagazineAmmoCargo [_item, _count, _ammo]; _return = true; }; From 673d2cd0841c1fce71900897fbea54c6eb936042 Mon Sep 17 00:00:00 2001 From: Drofseh Date: Sat, 27 Nov 2021 09:51:36 -0800 Subject: [PATCH 052/111] changes from suggestion --- addons/common/fnc_addMagazine.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/common/fnc_addMagazine.sqf b/addons/common/fnc_addMagazine.sqf index 014d19ca13..db16b0b49b 100644 --- a/addons/common/fnc_addMagazine.sqf +++ b/addons/common/fnc_addMagazine.sqf @@ -58,8 +58,8 @@ if (_verify) then { _return = true; } else { - private _vehicleUnit = vehicle _unit; - if (_vehicleUnit isEqualTo _unit) then { + private _vehicle = vehicle _unit; + if (_vehicle isEqualTo _unit) then { _unit switchMove "ainvpknlmstpslaywrfldnon_1"; private _weaponHolder = nearestObject [_unit, "WeaponHolder"]; @@ -71,7 +71,7 @@ if (_verify) then { _return = [_weaponHolder, _item, 1, _verify, _ammo] call CBA_fnc_addMagazineCargo; } else { - _return = [_vehicleUnit, _item, 1, _verify, _ammo] call CBA_fnc_addMagazineCargo; + _return = [_vehicle, _item, 1, _verify, _ammo] call CBA_fnc_addMagazineCargo; }; }; } else { From 4a17bde51c14dbe418c1f4fe4c7627dde6226c1b Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 27 Nov 2021 20:06:56 +0100 Subject: [PATCH 053/111] CBA_fnc_canAddItem for vehicles and crates --- addons/common/fnc_canAddItem.sqf | 88 ++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 39 deletions(-) diff --git a/addons/common/fnc_canAddItem.sqf b/addons/common/fnc_canAddItem.sqf index ee8b0587ef..80a30f6793 100644 --- a/addons/common/fnc_canAddItem.sqf +++ b/addons/common/fnc_canAddItem.sqf @@ -3,7 +3,7 @@ Function: CBA_fnc_canAddItem Description: - Checks if unit has enough free space in inventory to store item. + Checks if unit or object has enough free space in inventory to store item. Doesn't take current unit load into account unlike canAdd command. @@ -16,7 +16,7 @@ Parameters: _checkBackpack - Check space in backpack (Default: true) Returns: - True if unit has free space, false otherwise + True if unit or object has free space, false otherwise Examples: (begin example) @@ -45,10 +45,10 @@ if (isNull _unit || {_item isEqualTo ""}) exitWith {false}; #define TYPE_BACKPACK 901 if (isNil QGVAR(itemMassAllowedSlots)) then { - GVAR(itemMassAllowedSlots) = [] call CBA_fnc_createNamespace; + GVAR(itemMassAllowedSlots) = createHashMap; }; -(GVAR(itemMassAllowedSlots) getVariable [_item, []]) params ["_mass", "_allowedSlots"]; +(GVAR(itemMassAllowedSlots) getOrDefault [_item, []]) params ["_mass", "_allowedSlots"]; if (isNil "_mass") then { _allowedSlots = [TYPE_UNIFORM, TYPE_VEST, TYPE_BACKPACK]; @@ -91,46 +91,56 @@ if (isNil "_mass") then { }; }; TRACE_3("caching",_item,_mass,_allowedSlots); - GVAR(itemMassAllowedSlots) setVariable [_item, [_mass, _allowedSlots]]; + GVAR(itemMassAllowedSlots) set [_item, [_mass, _allowedSlots]]; }; if (_mass == -1) exitWith {false}; // item doesn't exist -if ( - _checkUniform - && {TYPE_UNIFORM in _allowedSlots} - && { - _mass == 0 - || { - // each time subtract whole number of items which can be put in container - _count = _count - floor (getContainerMaxLoad uniform _unit * (1 - loadUniform _unit) / _mass); - _count <= 0 +if (_unit isKindOf "CAManBase") then { + // is a person + if ( + _checkUniform + && {TYPE_UNIFORM in _allowedSlots} + && { + _mass == 0 + || { + // each time subtract whole number of items which can be put in container + _count = _count - floor (getContainerMaxLoad uniform _unit * (1 - loadUniform _unit) / _mass); + _count <= 0 + } } - } -) exitWith {true}; - -if ( - _checkVest - && {TYPE_VEST in _allowedSlots} - && { - _mass == 0 - || { - _count = _count - floor (getContainerMaxLoad vest _unit * (1 - loadVest _unit) / _mass); - _count <= 0 + ) exitWith {true}; + + if ( + _checkVest + && {TYPE_VEST in _allowedSlots} + && { + _mass == 0 + || { + _count = _count - floor (getContainerMaxLoad vest _unit * (1 - loadVest _unit) / _mass); + _count <= 0 + } } - } -) exitWith {true}; - -if ( - _checkBackpack - && {TYPE_BACKPACK in _allowedSlots} - && { - _mass == 0 - || { - _count = _count - floor (getContainerMaxLoad backpack _unit * (1 - loadBackpack _unit) / _mass); - _count <= 0 + ) exitWith {true}; + + if ( + _checkBackpack + && {TYPE_BACKPACK in _allowedSlots} + && { + _mass == 0 + || { + _count = _count - floor (getContainerMaxLoad backpack _unit * (1 - loadBackpack _unit) / _mass); + _count <= 0 + } } + ) exitWith {true}; + + false +} else { + // is a vehicle, crate etc. + _mass == 0 + || { + _count = _count - floor (maxLoad _unit * (1 - load _unit) / _mass); + _count <= 0 } -) exitWith {true}; - -false +}; From b51c8e3161530b87276cb799b4cc23ddb0ba2980 Mon Sep 17 00:00:00 2001 From: Drofseh Date: Sat, 27 Nov 2021 18:17:44 -0800 Subject: [PATCH 054/111] use CBA_fnc_canAddItem only - use CBA_fnc_canAddItem only, requires #1528 --- addons/common/fnc_addMagazine.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/common/fnc_addMagazine.sqf b/addons/common/fnc_addMagazine.sqf index db16b0b49b..e5771669eb 100644 --- a/addons/common/fnc_addMagazine.sqf +++ b/addons/common/fnc_addMagazine.sqf @@ -49,7 +49,7 @@ if (!isClass _config || {getNumber (_config >> "scope") < 2}) exitWith { }; if (_verify) then { - if (_unit canAdd _item || {[_unit, _item, 1, true, true, true] call CBA_fnc_canAddItem}) then { // canAdd works for vehicles and units, CBA_fnc_canAddItem is more precise for units, but only try if canAdd fails for them + if ([_unit, _item, 1, true, true, true] call CBA_fnc_canAddItem) then { if (_ammo < 0) then { _unit addMagazine [_item, 1E6]; // addMagazine STRING is not synched when used on remote units. addMagazine ARRAY is. } else { From 31f9f550c73a8421a31be798f1d3b14d8cab080d Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Tue, 18 Jan 2022 00:18:19 +0100 Subject: [PATCH 055/111] UI - Fix context menu item tooltip --- addons/ui/fnc_openItemContextMenu.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/ui/fnc_openItemContextMenu.sqf b/addons/ui/fnc_openItemContextMenu.sqf index 3fd9328bd7..e35df2e725 100644 --- a/addons/ui/fnc_openItemContextMenu.sqf +++ b/addons/ui/fnc_openItemContextMenu.sqf @@ -64,7 +64,7 @@ private _list = _display ctrlCreate [QGVAR(ItemContextMenu), -1]; if ((_slot in _slots || {"ALL" in _slots}) && {_args call _conditionShow}) then { private _index = _list lbAdd _displayName; - _list lbSetTooltip [_index, "_tooltip"]; // Does not seem to work for RscDisplayInventory controls? Hard coded overwrite? + _list lbSetTooltip [_index, _tooltip]; // Does not seem to work for RscDisplayInventory controls? Hard coded overwrite? private _key = format [QGVAR(OptionData%1), _index]; From a82fd3f6f7fcdb068369a57e097607163e121ea4 Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:47:13 +0800 Subject: [PATCH 056/111] Add files via upload --- optionals/legacy_jr/stringtable.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/optionals/legacy_jr/stringtable.xml b/optionals/legacy_jr/stringtable.xml index 96f37882b1..3b56996ea7 100644 --- a/optionals/legacy_jr/stringtable.xml +++ b/optionals/legacy_jr/stringtable.xml @@ -7,6 +7,7 @@ Community Base Addons - Legacy Joint Rails Community Base Addons - Legacy Joint Rails 社群基礎模組 - Legacy版共用導軌 + 社区基础插件-传统共用导轨 Community Base Addons - Legacy Joint Rails Community Base Addons - Legacy Joint Rails From 49969b9a0003c348c5a94ce77c3db6ca57b8bc83 Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:47:50 +0800 Subject: [PATCH 057/111] Add files via upload --- addons/ai/stringtable.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/addons/ai/stringtable.xml b/addons/ai/stringtable.xml index 80cb77eee1..a0a802c283 100644 --- a/addons/ai/stringtable.xml +++ b/addons/ai/stringtable.xml @@ -6,7 +6,7 @@ Community Base Addons - Künstliche Intelligenz Community Base Addons - 人工知能 社群基礎模組 - 人工智能 - 社群基础模组 - 人工智能 + 社群基础模组 - AI Community Base Addons - Искуственный Интеллект Community Base Addons - Intelligence artificielle Community Base Addons - Sztuczna Inteligencja @@ -21,6 +21,7 @@ AI Bina Pozisyonu AI の建物内での位置 AI在建築物內位置 + AI在建筑内部位置 Position IA bâtiment ИИ Место строительства Pozycja AI w budynku @@ -28,7 +29,7 @@ Invisible Target Soldier Unsichtbares Ziel - Soldat - 隱形目標士兵 + 隱形目標（士兵） Cible invisible - Soldat Soldado objetivo invisible Soldato obiettivo invisibile @@ -37,7 +38,7 @@ Neviditelný cíl (voják) Soldado alvo invisível 보이지 않는 표적 병사 - 看不见的目标士兵 + 隐形目标（士兵） 隠れた標的兵士 Görünmez Hedef Asker @@ -46,12 +47,16 @@ Unsichtbares Ziel - Fahrzeug Cible invisible - Véhicule Pojazd - niewidoczny cel + 隱形目標（車輛） + 隐形目标（车辆） Invisible Target Airplane Unsichtbares Ziel - Flugzeug Cible invisible - Avion Samolot - niewidoczny cel + 隱形目標（飛機） + 隐形目标（飞机） From 65a5177cca96d4bbc8e26c36d63c307df6d7b485 Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:48:39 +0800 Subject: [PATCH 058/111] Add files via upload --- addons/characters/stringtable.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/characters/stringtable.xml b/addons/characters/stringtable.xml index eab106161f..708585ccbb 100755 --- a/addons/characters/stringtable.xml +++ b/addons/characters/stringtable.xml @@ -6,12 +6,16 @@ Community Base Addons - Charaktere Community Base Addons - Personnages Community Base Addons - Postacie + 社區基礎插件 - 角色 + 社区基础插件-角色 Men (Malaria-Infected) Männer (Malaria infiziert) Hommes (Infectés par la malaria) Ludzie (Zainfekowani malarią) + 男子(瘧疾感染者) + 男子(疟疾感染者) From 4292a5f0738ca75ed30bd020e7fb5a0f2728cf66 Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:49:05 +0800 Subject: [PATCH 059/111] Add files via upload --- addons/common/stringtable.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index a691cb2e8f..dc696bd24c 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -24,6 +24,7 @@ Prima deve far partire una missione. První musíte zapnout misi. 你必須先加載世界或執行一個任務。 + 你必须先开始一个任务。 Вначале необходимо запустить миссию. @@ -35,6 +36,7 @@ Zbraně CBA CBA Silahları CBA 武器 + CBA 武器 CBA Armes CBA Оружие From d3374b6bf6a1aaf6488db857c576e533d98e64ab Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:49:29 +0800 Subject: [PATCH 060/111] Add files via upload --- addons/diagnostic/stringtable.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/diagnostic/stringtable.xml b/addons/diagnostic/stringtable.xml index d77bc3ec87..b3462bda35 100644 --- a/addons/diagnostic/stringtable.xml +++ b/addons/diagnostic/stringtable.xml @@ -62,7 +62,7 @@ Ziel Ausf. 対象へ実行 在目標執行 - 在目标执行 + 目标执行 На цели Wykonaj na celu Cible Exec @@ -104,24 +104,34 @@ Indentacja w konsoli debugowania Indentation dans la console de débogage Espaciado de la Consola de Depuración + 調試控制台縮進 + 调试控制台缩进 Type of indentation that can be added to expression in the debug console by pressing Tab key or removed by pressing Shift + Tab. Rodzaj indentacji która może być dodana do wyrażenia w konsoli debugowania za pomocą klawisza Tab lub usunięta za pomocą Shift + Tab. Type d'indentation qui peut être employée dans la console de débogage.\nTab ajoute une indentation, et Shift + Tab en supprime une. Tipo de sangría que se puede agregar a la expresión en la consola de depuración presionando la tecla Tab o eliminar presionando Shift + Tab + 可以通過按 Tab 鍵為添加到調試控制台中的表達式縮進或通過按 Shift + Tab 鍵為其刪除縮進。 + 可以通过按 Tab 键为添加到调试控制台中的表达式缩进或通过按 Shift + Tab 键为其删除缩进。 Refresh rate target watcher field + 刷新率 + 刷新率 Refresh rate (in seconds) for the CBA target watcher fields to the right of the debug console. + 調試控制台右側的 CBA 目標監視器字段的刷新率（以秒為單位）。 + 调试控制台右侧的 CBA 目标监视器字段的刷新率（以秒为单位）。 4 Spaces 4 Spacje 4 espaces 4 Espacios + 4 個空格 + 4 个空格 From bb443fe1fb01a270aeb4913e6c441aef8aa4657c Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:49:53 +0800 Subject: [PATCH 061/111] Add files via upload --- addons/disposable/stringtable.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/addons/disposable/stringtable.xml b/addons/disposable/stringtable.xml index 14ff3809c7..87497405d7 100644 --- a/addons/disposable/stringtable.xml +++ b/addons/disposable/stringtable.xml @@ -9,6 +9,7 @@ Community Base Addons - Tek Kullanımlık Silahlar Community Base Addons - Armes à usage unique 社群基礎模組 - 一次性武器 + 社群基础模组 - 一次性武器 Community Base Addons - Одноразовое оружие Community Base Addons - Bronie jednorazowe @@ -19,6 +20,7 @@ Odhodit použitý jednorázový raketomet Kullanılan Tek Kullanımlık Roketleri At 丟棄使用過的一次性發射器 + 丢弃使用过的一次性发射器 Lâcher le lanceur usagé Выбрасывать использованный одноразовый гранатомёт Wyrzuć zużyty przedmiot @@ -30,6 +32,7 @@ Nikdy Asla 永不 + 从不 Jamais Никогда Nigdy @@ -41,6 +44,7 @@ Automaticky neodhazovat použitý jednorázový raketomet. Otomatik olarak tek kullanımlık roketleri atma. 不要自動丟棄一次性使用之發射器 + 不自动丢弃使用过的一次性发射器。 Ne lâche jamais automatiquement le lanceur usagé. Не выбрасывать автоматически использованный одноразовый гранатомёт. Nie wyrzucaj automatycznie wyrzutni jednorazowej. @@ -52,6 +56,7 @@ Pouze AI Sadece AI 只有AI + 仅AI IA seulement Только ИИ Tylko AI @@ -63,6 +68,7 @@ Pouze AI odhodí použitý jednorázový raketomet. Sadece yapay zeka tek kullanımlık roketleri atar. 只有AI才會丟棄使用過的一次性發射器 + 只有AI会丢弃使用过的一次性发射器 Seules les unités IA lâchent leur lanceur après emploi. Только ИИ выбрасывает использованный одноразовый гранатомёт. Tylko AI wyrzuca wyrzutnie jednorazową. @@ -74,6 +80,7 @@ Vybrána jiná zbraň Başka Bir Silah Seçince 選擇其他武器 + 选择其他武器 Si autre arme sélectionnée Выбрано другое оружие Wybierz inną Broń @@ -85,6 +92,7 @@ Automaticky odhodit použitý jednorázový raketomet, jakmile je zvolena jiná zbraň. Başka bir silah seçildiği zaman otomatik olarak tek kullanımlık roketleri at. 當切換別的武器時自動丟棄一次性發射器。 + 当切换其他武器时，就会自动丢弃使用过的一次性发射器。 Lâche automatiquement le lanceur usagé dès qu'une autre arme est sélectionnée. Автоматически выбрасывать использованный одноразовый гранатомёт, как только будет выбрано другие оружие. Automatycznie wyrzucaj wyrzutnie jednorazową gdy tylko zostanie wybrana kolejna broń. @@ -96,6 +104,7 @@ Vyměnit jednorázový raketomet Tek Kullanımlık Roketleri Değiştir 替換掉一次性發射器 + 替换一次性发射器 Remplacer le lanceur à usage unique Заменять одноразовые гранатомёты Zamien wyrzutnie jednorazową @@ -107,6 +116,7 @@ Pokud je tato možnost zapnuta, jednorázové raketomety mohou být použity pouze jednou. Munice pro jednorázové raketomety v bednách a vozidlech budou vyměněny za nabité jednorázové raketomety. Pokud je tato možnost vypnuta, jednorázové raketomety mohou být přebity po použití. Eğer bu ayar açıksa, tek kullanımlık roketler sadece bir kere kullanılabilir. Tek kullanımlık rokeyler için cephane başka tek kullanımlık roketler ile değiştirilir. Bu ayar kapalıyken tek kullanımlık roketler de birçok kez kullanılabilir. 啟用時，將會把載具或容器裡面給於一次性發射器的彈藥換成一次性發射器本身，並且使其只能使用一次。如果關閉，一次性發射器即可再度裝填 + 如果启用，一次性发射器将只能使用一次。库存和车辆中的一次性发射器的弹药将被替换为已装填的一次性发射器。如果禁用，一次性发射器在使用后可以重新装填。 Si activé, les lanceurs à usage unique ne peuvent être utilisés qu'une seule fois. Les munitions pour lanceurs à usage unique situés dans les conteneurs et les véhicules seront remplacées par des lanceurs à usage unique chargés. Si désactivé, les lanceurs à usage unique peuvent être rechargés après emploi. Если включено, одноразовые гранатомёты могут быть использованы лишь один раз. Боеприпасы для них в контейнерах и технике будут заменены на соответствующие им заряженные одноразовые гранатомёты. Если выключено, одноразовые гранатомёты могут быть перезаряжены и использованы повторно. Gdy ta opcja jest włączona wyrzutnie jednorazowe mogą być użyte tylko raz, Amunicja do wyrzutni jednorazowych dostępna w kontenerach i pojazdach zostanie zamieniona w załadowaną wyrzutnie jednorazową. Jeżeli ta opcja jest wyłączona, wtedy wyrzutnie jednorazowe nie zostaną przeładowane po użyciu. From 5f832cf53adf2c38311935ef8eca817529a858c5 Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:50:13 +0800 Subject: [PATCH 062/111] Add files via upload --- addons/events/stringtable.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/events/stringtable.xml b/addons/events/stringtable.xml index 0223ef3711..6e20e2e228 100644 --- a/addons/events/stringtable.xml +++ b/addons/events/stringtable.xml @@ -22,6 +22,7 @@ Mód opakování zbraně Silah Tekrar Modu 武器反作模式 + 武器连发模式 Mode de réarmement Режим повторной стрельбы @@ -33,6 +34,7 @@ Mód natahování nebo pumpování zbraní. Silahın sürgülü ya da pompalı modda olması. 設定武器如何拉栓及退膛 + 设置武器拉栓及退膛状态 Mode de réarmement des armes à verrou et à pompe. Режим повторной стрельбы помпового оружия или оружия с продольно-скользящим затвором. @@ -44,6 +46,7 @@ Opustit pohled optiky Dürbünden Çık 放下瞄具 + 离开瞄准视野 Maintenir vue lunette Выход из прицела @@ -55,6 +58,7 @@ Natáhnout zbraň opuštěním pohledu optiky. Silahı sürgülerken dürbünü kapat. 當拉栓以及退膛武器時是否離開瞄準狀態 + 当武器拉栓以及退膛时是否离开瞄准视野 Réarme l'arme tout en maintenant la visée dans la lunette. Перезаряжать оружие после выхода из прицела. @@ -66,6 +70,7 @@ Pustit spoušť Tetiği Bırak 放開板機 + 松开板机 Relâcher la détente Отпускание курка @@ -77,6 +82,7 @@ Natáhnout zbraň puštěním spouště (podržte spoušť k zabránění okamžitému natáhnutí zbraně). Silahın sürgüsünü çekmek için tetiği bırak (Tetiğe basılı tutarak sürgülemeyi engelle). 當鬆開板機後拉栓或退膛（握住板機以避免突然的動作）。 + 当松开板机后拉栓或退膛（扣住板机以避免突然的动作）。 Réarme l'arme au relâchement de la détente (maintenir la détente enfoncée pour éviter le réarmement immédiat). Перезаряжать оружие после отпускания курка (держите курок чтобы не перезаряжать). @@ -88,6 +94,7 @@ Zmáčknout spoušť Tetiğe Bas 按下扳機 + 按下板机 Presser la détente Нажатие курка @@ -99,6 +106,7 @@ Natáhnout zbraň dalším zmáčkutím spouště. Silahın sürgüsünü çekmek için tetiğe bas. 按下板機才拉栓或退膛 + 再次按下板机才能拉栓或退膛 Réarme l'arme en pressant la détente encore une fois. Перезаряжать оружие повторным нажатием на курок. From 270803a75bd6602ce305ac60f388cb3a58c98b8d Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:50:36 +0800 Subject: [PATCH 063/111] Add files via upload --- addons/hashes/stringtable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hashes/stringtable.xml b/addons/hashes/stringtable.xml index f34d2bb576..f98a9f9872 100644 --- a/addons/hashes/stringtable.xml +++ b/addons/hashes/stringtable.xml @@ -6,7 +6,7 @@ Community Base Addons - Hashes Community Base Addons - ハッシュ 社群基礎模組 - 雜湊 - 社群基础模组 - 杂凑 + 社群基础模组 - 哈希数 Community Base Addons - Хэши Community Base Addons - Hashe Community Base Addons - Hashes From d96f0e0e327a77d0c29ac53a489848c7f91c0ea6 Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:50:59 +0800 Subject: [PATCH 064/111] Add files via upload --- addons/jam/stringtable.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/jam/stringtable.xml b/addons/jam/stringtable.xml index 1d501d6352..79f3a80fd1 100644 --- a/addons/jam/stringtable.xml +++ b/addons/jam/stringtable.xml @@ -10,6 +10,7 @@ Community Base Addons - 統合的弾倉 Community Base Addons - Společné zásobníky a munice 社群基礎模組 - 聯合彈匣 + 社区基础插件—通用弹匣 Community Base Addons - Общие патроны и магазины From ae556f35e5d4b2e50201dbdccc512f0366785ecd Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:51:26 +0800 Subject: [PATCH 065/111] Add files via upload --- addons/network/stringtable.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/addons/network/stringtable.xml b/addons/network/stringtable.xml index a016864787..b3598ffb91 100644 --- a/addons/network/stringtable.xml +++ b/addons/network/stringtable.xml @@ -34,48 +34,64 @@ Überprüfung von Ausrüstungen Vérification de l'équipement Sprawdzenie wyposażenia + 驗證加載 + 验证加载 Validate loadout of units. Fixes an issue where units appear naked after changing locality. Überprüfe die Ausrüstung von Einheiten. Korrigiert den Fehler, bei dem Einheiten nackt sind nach einer Änderung deren Lokalität. Vérifie l'équipement des unités. Correction d'un bug où les unités se retrouvaient nues après avoir changé de localité. Sprawdza wyposażenie jednostek. Naprawia problem, który powodował pojawianie się jednostek nagich, przy zmianie lokalności. + 驗證單位加載。修復單位在更改大廳位置後顯示為裸體的問題。 + 验证单位加载。修复单位在更改大厅位置后显示为裸体的问题。 Never Niemals Jamais Nigdy + 從不 + 从不 Never validate loadouts Überprüfe niemals Ausrüstungen Ne jamais vérifier les équipements Nigdy nie sprawdzaj wyposażenia + 從不驗證加載 + 从不验证加载 Playable units only Nur spielbare Einheiten Pour les unités jouables Tylko grywalne jednostki + 僅可玩單位 + 仅可玩单位 Validate only loadout of playable units Überprüfe nur die Ausrüstung von spielbaren Einheiten Vérifier uniquement l'équipement des unités jouables Sprawdza wyposażenie tylko jednostek oznaczonych jako grywalne + 僅驗證可玩單位的加載 + 仅验证可玩单位的加载 All units Alle Einheiten Pour toutes les unités Wszystkie jednostki + 所有單位 + 所有单位 Validate loadout of all units Überprüfe die Ausrüstungen von allen Einheiten Vérifier l'équipement de toutes les unités Sprawdza wyposażenie wszystkich jednostek + 驗證所有單位的加載 + 验证所有单位的加载 From d96b93be412d758b73a749f42f01be20886de1a4 Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:51:47 +0800 Subject: [PATCH 066/111] Add files via upload --- addons/optics/stringtable.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/optics/stringtable.xml b/addons/optics/stringtable.xml index f1262e4259..32d428c42d 100644 --- a/addons/optics/stringtable.xml +++ b/addons/optics/stringtable.xml @@ -10,6 +10,7 @@ Community Base Addons - Optika Community Base Addons - Optikler 社群基礎模組 - 瞄具 + 社区基础插件—瞄具 Community Base Addons - Optiques Community Base Addons - Оптика @@ -22,6 +23,7 @@ Používat PiP (obraz-v-obrazu) optiky PIP optikler kullan 使用PiP(畫中畫)鏡頭 + 使用画中画（PiP）瞄具 Utiliser les optiques "picture in picture" Использовать оптические прицелы в режиме «картинка в картинке» (PIP) @@ -32,6 +34,7 @@ Dürbün çizgilerini değiştir 照準線切り替え 切換瞄準線 + 切换瞄准线 Commuter le réticule Переключение сетки Przełącz siatke przyrządu @@ -43,6 +46,7 @@ Dürbünün çizgilerini elle değiştirmek için. 照準器の照準線を手動で切り替えます。 手動切換瞄具的瞄準線 + 手动切换瞄具的瞄准线 Commuter manuellement le réticule de l'optique. Вручную переключать сетку оптического прицела. Ręcznie przełącz siatkę przyrządu optycznego From 53f54ff5a822f032102a5153d5212b218f9b0593 Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:52:11 +0800 Subject: [PATCH 067/111] Add files via upload --- addons/settings/stringtable.xml | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/addons/settings/stringtable.xml b/addons/settings/stringtable.xml index f533a4cfb1..029a3d3162 100644 --- a/addons/settings/stringtable.xml +++ b/addons/settings/stringtable.xml @@ -67,6 +67,7 @@ Aggiusta le impostazioni per gli addon Upravit nastavení addonu. 調整插件設定。 + 调整插件设置。 Отрегулировать настройки дополнений. @@ -88,7 +89,7 @@ Server サーバー 伺服器 - 伺服器 + 服务器 Servidor Сервер Serveur @@ -102,7 +103,7 @@ Server-Einstellungen ansehen. Als Admin einloggen, um zu ändern. サーバー設定を確認します。管理者が変更すると記録します。 查看伺服器的設定。必須登入成管理員才能編輯設定。 - 查看伺服器的设定。必须登入成管理员才能编辑设定。 + 查看服务器的设定。必须登入管理员才能编辑设定。 Olhe as configurações dos servidores. Acesse como administrador para alterá-las. Смотреть настройки сервера. Войдите под администратором, чтобы менять. Permet de visualiser les paramètres du serveur. Se connecter en tant qu'administrateur pour les changer. @@ -228,7 +229,7 @@ Import 取り込み 匯入 - 汇入 + 导入 Importar Импорт Importer @@ -242,7 +243,7 @@ Einstellungen aus Zwischenablage einfügen. クリップボードから設定を取り込みします。 從剪貼簿匯入設定。 - 从剪贴簿汇入设定。 + 从剪贴板导入设定。 Importar configurações da prancheta. Импортировать настройки из буфера обмена. Importer les paramètres depuis le presse-papier. @@ -256,7 +257,7 @@ Export 出力 匯出 - 汇出 + 导出 Exportar Экспорт Exporter @@ -270,7 +271,7 @@ Einstellungen in Zwischenablage speichern. クリップボードに設定を出力します。 匯出設定到剪貼簿。 - 汇出设定到剪贴簿。 + 导出设定到剪贴板。 Exportar configurações para a prancheta. Экспортировать настройки в буфер обмена. Exporter les paramètres dans le presse-papier. @@ -326,7 +327,7 @@ Server\nüberschreiben ｻｰﾊﾞｰ側で\n上書き 覆寫\n伺服器 - 覆写\n伺服器 + 覆写\n服务器 Sobrescrever \nServidor Перезапись\nСервер Ecraser\nServeur @@ -345,6 +346,7 @@ Prevale questa impostazione. Toto nastavení je aktuální. 設定已套用。 + 设置已套用。 Этот параметр применён. @@ -357,6 +359,7 @@ Questa impostazione sarà valida dopo il riavvio della missione. Toto nastavení bude aplikováno po restartu mise. 這個設定將會在任務重置後生效 + 该设定将在任务重启后生效。 Этот параметр будет применён после рестарта миссии. @@ -392,7 +395,7 @@ Diese Einstellung wird vom Server überschrieben. この設定はサーバーによって上書きされます。 此項設定被伺服器給覆寫。 - 此项设定被伺服器给覆写。 + 此项设定被服务器给覆写。 Esta configuração é sobrescrita pelo servidor. Этот параметр перезаписан сервером. Ta wartość została nadpisana przez serwer. @@ -406,7 +409,7 @@ Diese Einstellung wird von den Clients überschrieben und betrifft nur den Server. この設定はクライアントによって上書きされ、サーバーにのみ適用されます。 此項設定被客戶端給覆寫並僅適用於伺服器。 - 此项设定被客户端给覆写并仅适用于伺服器。 + 此项设定被客户端给覆写并仅适用于服务器。 Esta configuração é sobrescrita pelos clientes e é apenas aplicada no servidor. Этот параметр перезаписан клиентом и применяется исключительно к серверу. Ta wartość została nadpisana przez klientów i ma zastosowanie tylko na serwerze. @@ -421,6 +424,8 @@ Nadpisane przez klienta z taką samą wartością. Écrasé par le client, avec la même valeur. Перезаписано клиентом с таким же значением. + 被客戶端以相同的值覆蓋。 + 被客户端以相同的值覆盖。 Overwritten by mission with the same value. @@ -428,6 +433,8 @@ Nadpisane przez misję z taką samą wartością. Écrasé par la mission, avec la même valeur. Перезаписано миссией с таким же значением. + 被任務以相同的值覆蓋。 + 被任务以相同的值覆盖。 Overwritten by server with the same value. @@ -435,13 +442,15 @@ Nadpisane przez serwer z taką samą wartością. Écrasé par le serveur, avec la même valeur. Перезаписано сервером с таким же значением. + 被伺服器以相同的值覆蓋。 + 被服务器以相同的值覆盖。 Copy to clipboard In Zwischenablage Скопировать в буфер обмена 複製到剪貼簿 - 复制到剪贴簿 + 复制到剪贴板 クリップボードへコピー Copier Skopiuj do schowka From 4c6c322d4db5c176cd409e2cc107d54751f09474 Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:52:35 +0800 Subject: [PATCH 068/111] Add files via upload --- addons/ui/stringtable.xml | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index e9cca029ce..91a5558db6 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -6,7 +6,7 @@ Community Base Addons - Benutzeroberfläche Community Base Addons - ユーザー インターフェイス 社群基礎模組 - 使用者介面 - 社群基础模组 - 使用者介面 + 社群基础模组 - 玩家界面 Extensões de Base Comunitária - Interface ao Usuário Community Base Addons - Пользовательский Интерфейс Community Base Addons - Interface utilisateur @@ -28,7 +28,7 @@ 사용자 인터페이스 Interfaccia Utente 使用者介面 - 使用者介面 + 玩家界面 Interfaz de usuario Kullanıcı Arayüzü @@ -52,7 +52,7 @@ プログレス バーの位置。 Position de la barre de progression. 進度條的位置。 - 进度条的位置。 + 进度条位置。 Pozycja paska postępu. Yükleme çubuğunun konumu. Posizione della barra di avanzamento @@ -70,6 +70,7 @@ Salva le password per i server Ukládat hesla serveru 儲存伺服器密碼 + 存储服务器密码 Запоминать пароли серверов Almacenar contraseñas del servidor @@ -83,6 +84,7 @@ Impostazione per salvare le password immesse quando ci si collega a server multiplayer. Uloží zadané heslo, když se připojujete k multiplayerovému serveru. 設定是否當連線到伺服器時儲存密碼 + 设置是否存储连接服务器时输入的密码。 Параметр запоминания паролей сервера при входе на них. Configuración para almacenar las contraseñas ingresadas al conectarse a un servidor multijugador. @@ -96,6 +98,7 @@ Salva le password Ukládat hesla 記住密碼 + 记住密码 Сохранять пароли Guardar contraseñas @@ -109,6 +112,7 @@ Quando ci si connette ad un server multiplayer, le password verranno salvate. Hesla jsou uložena, když se připojujete k multiplayerovému serveru. 連線到伺服器時將記住密碼 + 连接到服务器时将记住密码 Пароли будут сохраняться при входе на сервера. Las contraseñas se almacenan cuando se conecta a un servidor multijugador @@ -122,6 +126,7 @@ Non salvare le password Neukládat hesla 不保存密碼 + 不保存密码 Не сохранять пароли No guarde las contraseñas @@ -135,6 +140,7 @@ Quando ci si collega ad un server multiplayer, le password non verranno salvate. Le password precedentemente salvate non verranno immesse automaticamente. Hesla nejsou ukládána, když se připojujete k multiplayerovému serveru. Hesla, která již byla uložena, nebudou automaticky zadávána. 當連線到伺服器時將不保存密碼。已有的保存密碼將不會自動填入。 + 当连接到服务器时将不保存密码。已保存的密码将不自动填写。 Пароли не сохраняются при входе на сервера. Уже сохранённые пароли не будут автоматически вставлены. Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas no se ingresarán automáticamente. @@ -148,6 +154,7 @@ Cancella le password Smazat hesla 刪除密碼 + 删除密码 Удалить пароли Eliminar contraseñas @@ -161,6 +168,7 @@ Quando ci si collega ad un server multiplayer, le password non verranno salvate. Non saranno usate password precedentemente salvate. Hesla nejsou ukládána, když se připojujete k multiplayerovému serveru. Hesla, která již byla uložena, jsou smazána z profilu. 當連線到伺服器時將不保存密碼。已有的保存密碼將會刪除。 + 当连接到服务器时将不保存密码。已保存的密码将会删除。 Пароли не сохраняются при входе на сервера. Уже сохранённые пароли будут удалены. Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas se eliminan del perfil. @@ -173,6 +181,7 @@ Upozornění Bildirim 通知 + 提示 Notification Уведомление Notificación @@ -186,6 +195,7 @@ Textová zpětná vazba hráči. Yazıyla geri bildirim. 回饋文字給玩家 + 反馈文本给玩家。 Notification textuelle au joueur. Текстовая информация для игрока. Comentarios textuales para el jugador @@ -199,6 +209,7 @@ Ukázat všechny mise Tüm görevleri göster 顯示所有任務 + 显示所有任务 Afficher toutes les missions Показать все миссии Mostrar todas las misiones @@ -212,6 +223,7 @@ Ukázat vlastní mise Sonradan eklenen görevleri göster 顯示目前任務 + 显示当前任务 Afficher les missions personnalisées Показать пользовательские миссии Mostrar misiones personalizadas @@ -223,6 +235,7 @@ Bildirim Süresi 通知の表示時間 通知時長 + 提示显示时长 Durée de vie des notifications Продолжительность уведомления Długość żywotności powiadomień @@ -235,6 +248,7 @@ Bildirim gözükme süresi (saniye olarak) 通知が表示される時間を秒で変更できます。 設定通知的顯示時間（秒數）。 + 设置提示的显示时长（秒） Durée d'affichage des notifications, en secondes. Время в секундах, в течении которого будет видно уведомление. Ilość czasu przez który widoczne jest powiadomienie @@ -246,6 +260,7 @@ Sunucu yöneticisiyle iletişime geç. サーバー管理者に連絡をして下さい。 聯絡伺服器的管理員 + 联系服务器管理员 Contacter l'administrateur du serveur. Уведомить администратора сервера. Kontakt z administratorem serwera @@ -257,6 +272,8 @@ Menadżer Lobby Gestionnaire de Lobby Gerente de lobby + 角色大廳管理 + 角色大厅管理 Adjusting group order... @@ -264,6 +281,8 @@ Modification de l'ordre des groupes... Ajustar el orden del grupo... Dostosowywanie kolejności w lobby... + 調整小隊順序 + 调整小队顺序 Back up mission before using this tool. @@ -271,6 +290,8 @@ Sauvegardez la mission avant d'utiliser cet outil. Haga una copia de seguridad de la misión antes de usar esta herramienta Wykonaj kopię zapasową misji przed użyciem tego narzędzia. + 使用此工具前，請備份任務。 + 使用此工具之前，请备份任务。 From 278928ba1c3b3e8bfa7911f0feef179818aec8e4 Mon Sep 17 00:00:00 2001 From: Brett Date: Mon, 24 Jan 2022 10:24:57 -0600 Subject: [PATCH 069/111] Update fnc_removeLoadoutSetHandler.sqf --- addons/loadout/fnc_removeLoadoutSetHandler.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/loadout/fnc_removeLoadoutSetHandler.sqf b/addons/loadout/fnc_removeLoadoutSetHandler.sqf index 8c7274687e..3d9d33cd9a 100644 --- a/addons/loadout/fnc_removeLoadoutSetHandler.sqf +++ b/addons/loadout/fnc_removeLoadoutSetHandler.sqf @@ -18,7 +18,7 @@ Examples: [_unit] call my_earplug_mod_fnc_removeEarplugs; }; ["earplugs", MY_HANDLER] call CBA_fnc_removeLoadoutSetHandler; - }] call CBA_fnc_removeLoadoutSetHandler; + }] call CBA_fnc_addLoadoutSetHandler; (end) Author: Brett Mayson From 5cb9fd97c728f4a81d0406ef9eccda2f6d3e098d Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Tue, 25 Jan 2022 09:27:13 +0800 Subject: [PATCH 070/111] Update optionals/legacy_jr/stringtable.xml Co-authored-by: PabstMirror --- optionals/legacy_jr/stringtable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optionals/legacy_jr/stringtable.xml b/optionals/legacy_jr/stringtable.xml index 3b56996ea7..774cc834fb 100644 --- a/optionals/legacy_jr/stringtable.xml +++ b/optionals/legacy_jr/stringtable.xml @@ -7,7 +7,7 @@ Community Base Addons - Legacy Joint Rails Community Base Addons - Legacy Joint Rails 社群基礎模組 - Legacy版共用導軌 - 社区基础插件-传统共用导轨 + 社区基础插件-传统共用导轨 Community Base Addons - Legacy Joint Rails Community Base Addons - Legacy Joint Rails From 33e735152f194cac69bfde94f83057950be9d849 Mon Sep 17 00:00:00 2001 From: Brett Date: Tue, 25 Jan 2022 09:58:40 -0600 Subject: [PATCH 071/111] Update fnc_setLoadout.sqf --- addons/loadout/fnc_setLoadout.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/loadout/fnc_setLoadout.sqf b/addons/loadout/fnc_setLoadout.sqf index be073bdda9..3d53a55486 100644 --- a/addons/loadout/fnc_setLoadout.sqf +++ b/addons/loadout/fnc_setLoadout.sqf @@ -33,6 +33,6 @@ private _extendedInfo = createHashMapFromArray (_loadout select 1); private _id = _x; { _x params ["_function", "_default"]; - [_unit, _extendedInfo getOrDefault [_id, _default] call _function; + [_unit, _extendedInfo getOrDefault [_id, _default]] call _function; } forEach _y; } forEach GVAR(setHandlers); From d936d479cf93ae896297b69ed30a589077a85ebf Mon Sep 17 00:00:00 2001 From: jonpas Date: Wed, 16 Feb 2022 13:13:54 +0100 Subject: [PATCH 072/111] Add CBA_fnc_getWeekDay --- addons/common/CfgFunctions.hpp | 4 ++++ addons/common/fnc_getWeekDay.sqf | 36 ++++++++++++++++++++++++++++++++ addons/common/test.sqf | 2 +- addons/common/test_common.sqf | 33 +++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 addons/common/fnc_getWeekDay.sqf create mode 100644 addons/common/test_common.sqf diff --git a/addons/common/CfgFunctions.hpp b/addons/common/CfgFunctions.hpp index 794c768178..c7dd2ac2bc 100644 --- a/addons/common/CfgFunctions.hpp +++ b/addons/common/CfgFunctions.hpp @@ -114,6 +114,10 @@ class CfgFunctions { PATHTO_FNC(getNearestBuilding); }; + class DateTime { + PATHTO_FNC(getWeekDay); + }; + class Misc { PATHTO_FNC(addPerFrameHandler); PATHTO_FNC(removePerFrameHandler); diff --git a/addons/common/fnc_getWeekDay.sqf b/addons/common/fnc_getWeekDay.sqf new file mode 100644 index 0000000000..4706a2cd53 --- /dev/null +++ b/addons/common/fnc_getWeekDay.sqf @@ -0,0 +1,36 @@ +#include "script_component.hpp" +/* ---------------------------------------------------------------------------- +Function: CBA_fnc_getWeekDay + +Description: + Calculates date's day of the week using a modified Rata Die method with fractional years. + +Parameters: + _date - Date of [year, month, day]. + +Returns: + Day of the week (0: Sunday, 6: Saturday, -1: invalid) + +Examples: + (begin example) + [systemTimeUTC] call CBA_fnc_getWeekDay; + [date] call CBA_fnc_getWeekDay; + [[2022, 2, 16]] call CBA_fnc_getWeekDay; + (end) + +Author: + Jonpas +---------------------------------------------------------------------------- */ + +params [["_date", [0, 0, 0], [[]], [3, 4, 5, 6, 7]]]; + +// Keep only year, month, day if longer date format is given +// Hours and minutes must be given as 0 for dateToNumber to work correctly for this use-case +_date = [_date select 0, _date select 1, _date select 2, 0, 0]; + +private _yearBefore = ((_date select 0) - 1) max 0; +private _leapYears = floor (_yearBefore / 4); +private _normalYears = _yearBefore - _leapYears; +private _days = _normalYears + (_leapYears * (366 / 365)) + dateToNumber _date; + +(round (_days / (1 / 365))) mod 7 // return diff --git a/addons/common/test.sqf b/addons/common/test.sqf index 63e8537e33..b3dea79de4 100644 --- a/addons/common/test.sqf +++ b/addons/common/test.sqf @@ -5,7 +5,7 @@ #define DEBUG_MODE_FULL #include "script_component.hpp" -#define TESTS ["config", "inventory", "weaponComponents", "position", "ret", "macro_is_x"] +#define TESTS ["common", "config", "inventory", "weaponComponents", "position", "ret", "macro_is_x"] SCRIPT(test-common); diff --git a/addons/common/test_common.sqf b/addons/common/test_common.sqf new file mode 100644 index 0000000000..5a6eb7fc25 --- /dev/null +++ b/addons/common/test_common.sqf @@ -0,0 +1,33 @@ +#include "script_component.hpp" +SCRIPT(test_common); + +// execVM "\x\cba\addons\common\test_common.sqf"; + +private ["_funcName", "_result"]; + +//////////////////////////////////////////////////////////////////////////////////////////////////// + +_funcName = "CBA_fnc_getWeekDay"; +LOG("Testing " + _funcName); + +TEST_DEFINED("CBA_fnc_getWeekDay",""); + +_result = [] call CBA_fnc_getWeekDay; +TEST_TRUE(_result == -1,_funcName); // invalid + +_result = [[0, 0, 0]] call CBA_fnc_getWeekDay; +TEST_TRUE(_result == -1,_funcName); // invalid + +_result = [[2022, 1, 1]] call CBA_fnc_getWeekDay; +TEST_TRUE(_result == 6,_funcName); // Saturday + +_result = [[2022, 2, 16]] call CBA_fnc_getWeekDay; +TEST_TRUE(_result == 3,_funcName); // Wednesday + +// date format [year, month, day, hour, minute] +_result = [[2022, 2, 17, 11, 56]] call CBA_fnc_getWeekDay; +TEST_TRUE(_result == 4,_funcName); // Thursday + +// systemTime format [year, month, day, hour, minute, second, millisecond] +_result = [[2022, 2, 18, 11, 56, 24, 126]] call CBA_fnc_getWeekDay; +TEST_TRUE(_result == 5,_funcName); // Friday From 4a45fb38d6dc4f9daf5a67bd6436fcaba49015d7 Mon Sep 17 00:00:00 2001 From: jonpas Date: Wed, 16 Feb 2022 20:53:38 +0100 Subject: [PATCH 073/111] Rename getWeekDay to weekDay --- addons/common/CfgFunctions.hpp | 2 +- .../{fnc_getWeekDay.sqf => fnc_weekDay.sqf} | 8 ++++---- addons/common/test_common.sqf | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) rename addons/common/{fnc_getWeekDay.sqf => fnc_weekDay.sqf} (86%) diff --git a/addons/common/CfgFunctions.hpp b/addons/common/CfgFunctions.hpp index c7dd2ac2bc..118b7ed605 100644 --- a/addons/common/CfgFunctions.hpp +++ b/addons/common/CfgFunctions.hpp @@ -115,7 +115,7 @@ class CfgFunctions { }; class DateTime { - PATHTO_FNC(getWeekDay); + PATHTO_FNC(weekDay); }; class Misc { diff --git a/addons/common/fnc_getWeekDay.sqf b/addons/common/fnc_weekDay.sqf similarity index 86% rename from addons/common/fnc_getWeekDay.sqf rename to addons/common/fnc_weekDay.sqf index 4706a2cd53..5f7552838c 100644 --- a/addons/common/fnc_getWeekDay.sqf +++ b/addons/common/fnc_weekDay.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" /* ---------------------------------------------------------------------------- -Function: CBA_fnc_getWeekDay +Function: CBA_fnc_weekDay Description: Calculates date's day of the week using a modified Rata Die method with fractional years. @@ -13,9 +13,9 @@ Returns: Examples: (begin example) - [systemTimeUTC] call CBA_fnc_getWeekDay; - [date] call CBA_fnc_getWeekDay; - [[2022, 2, 16]] call CBA_fnc_getWeekDay; + [systemTimeUTC] call CBA_fnc_weekDay; + [date] call CBA_fnc_weekDay; + [[2022, 2, 16]] call CBA_fnc_weekDay; (end) Author: diff --git a/addons/common/test_common.sqf b/addons/common/test_common.sqf index 5a6eb7fc25..8f5235a746 100644 --- a/addons/common/test_common.sqf +++ b/addons/common/test_common.sqf @@ -7,27 +7,27 @@ private ["_funcName", "_result"]; //////////////////////////////////////////////////////////////////////////////////////////////////// -_funcName = "CBA_fnc_getWeekDay"; +_funcName = "CBA_fnc_weekDay"; LOG("Testing " + _funcName); -TEST_DEFINED("CBA_fnc_getWeekDay",""); +TEST_DEFINED("CBA_fnc_weekDay",""); -_result = [] call CBA_fnc_getWeekDay; +_result = [] call CBA_fnc_weekDay; TEST_TRUE(_result == -1,_funcName); // invalid -_result = [[0, 0, 0]] call CBA_fnc_getWeekDay; +_result = [[0, 0, 0]] call CBA_fnc_weekDay; TEST_TRUE(_result == -1,_funcName); // invalid -_result = [[2022, 1, 1]] call CBA_fnc_getWeekDay; +_result = [[2022, 1, 1]] call CBA_fnc_weekDay; TEST_TRUE(_result == 6,_funcName); // Saturday -_result = [[2022, 2, 16]] call CBA_fnc_getWeekDay; +_result = [[2022, 2, 16]] call CBA_fnc_weekDay; TEST_TRUE(_result == 3,_funcName); // Wednesday // date format [year, month, day, hour, minute] -_result = [[2022, 2, 17, 11, 56]] call CBA_fnc_getWeekDay; +_result = [[2022, 2, 17, 11, 56]] call CBA_fnc_weekDay; TEST_TRUE(_result == 4,_funcName); // Thursday // systemTime format [year, month, day, hour, minute, second, millisecond] -_result = [[2022, 2, 18, 11, 56, 24, 126]] call CBA_fnc_getWeekDay; +_result = [[2022, 2, 18, 11, 56, 24, 126]] call CBA_fnc_weekDay; TEST_TRUE(_result == 5,_funcName); // Friday From 93ad2009433e31190e978e36a18fdabd55036cbb Mon Sep 17 00:00:00 2001 From: Brett Date: Wed, 9 Mar 2022 19:32:39 -0600 Subject: [PATCH 074/111] handle vanialla loadouts --- addons/loadout/fnc_setLoadout.sqf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/loadout/fnc_setLoadout.sqf b/addons/loadout/fnc_setLoadout.sqf index 3d53a55486..f45fbb6afa 100644 --- a/addons/loadout/fnc_setLoadout.sqf +++ b/addons/loadout/fnc_setLoadout.sqf @@ -25,6 +25,10 @@ params [ if (isNull _unit) exitWith {}; +if (count _loadout == 10) exitWith { + _unit setUnitLoadout [_loadout, _fullMagazines]; +}; + _unit setUnitLoadout [_loadout select 0, _fullMagazines]; private _extendedInfo = createHashMapFromArray (_loadout select 1); From 05e5c81519ea866af4816cd561bdb382c95c897c Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 18 Mar 2022 14:41:11 -0500 Subject: [PATCH 075/111] UI - Show worldnames for maps --- addons/ui/fnc_initDisplayRemoteMissions.sqf | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/addons/ui/fnc_initDisplayRemoteMissions.sqf b/addons/ui/fnc_initDisplayRemoteMissions.sqf index de905c80cb..770967e3e4 100644 --- a/addons/ui/fnc_initDisplayRemoteMissions.sqf +++ b/addons/ui/fnc_initDisplayRemoteMissions.sqf @@ -25,6 +25,20 @@ private _fnc_findMissions = { _display setVariable [QGVAR(stockMissions), _stockMissions]; +// Show worldnames for maps +private _mapNames = createHashMap; +{ + private _worldName = configName _x; + private _description = getText (configFile >> "CfgWorlds" >> _worldName >> "description"); + _mapNames set [_description, _worldname]; +} forEach (configProperties [configfile >> "CfgWorldList", "isClass _x"]); + +for "_index" from 0 to ((lbSize _ctrlMaps) - 1) do { + private _description = _ctrlMaps lbText _index; + private _worldName = _mapNames getOrDefault [_description, ""]; + _ctrlMaps lbSetText [_index, format ["%1 [%2]", _description, _worldName]]; +}; + lbSort _ctrlMaps; _ctrlMaps lbSetCurSel 0; From 391c1ddb1b2a2f3f5f1f465d07bd54a734f9ff78 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 19 Mar 2022 13:05:08 -0500 Subject: [PATCH 076/111] Show worldnames as tooltips on map list --- addons/ui/fnc_initDisplayRemoteMissions.sqf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/ui/fnc_initDisplayRemoteMissions.sqf b/addons/ui/fnc_initDisplayRemoteMissions.sqf index 770967e3e4..2d401e9798 100644 --- a/addons/ui/fnc_initDisplayRemoteMissions.sqf +++ b/addons/ui/fnc_initDisplayRemoteMissions.sqf @@ -25,18 +25,17 @@ private _fnc_findMissions = { _display setVariable [QGVAR(stockMissions), _stockMissions]; -// Show worldnames for maps +// Show worldnames as tooltips on map list private _mapNames = createHashMap; { private _worldName = configName _x; private _description = getText (configFile >> "CfgWorlds" >> _worldName >> "description"); _mapNames set [_description, _worldname]; } forEach (configProperties [configfile >> "CfgWorldList", "isClass _x"]); - for "_index" from 0 to ((lbSize _ctrlMaps) - 1) do { private _description = _ctrlMaps lbText _index; private _worldName = _mapNames getOrDefault [_description, ""]; - _ctrlMaps lbSetText [_index, format ["%1 [%2]", _description, _worldName]]; + _ctrlMaps lbSetTooltip [_index, _worldName]; }; lbSort _ctrlMaps; From 26dcb6c476c1ca622a382d7d31e2237331de54b1 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 19 Mar 2022 13:35:00 -0500 Subject: [PATCH 077/111] Apply suggestions from code review Support 2.08's `setMaxLoad` Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com> --- addons/common/fnc_canAddItem.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/common/fnc_canAddItem.sqf b/addons/common/fnc_canAddItem.sqf index 80a30f6793..cd7ac35e4c 100644 --- a/addons/common/fnc_canAddItem.sqf +++ b/addons/common/fnc_canAddItem.sqf @@ -105,7 +105,7 @@ if (_unit isKindOf "CAManBase") then { _mass == 0 || { // each time subtract whole number of items which can be put in container - _count = _count - floor (getContainerMaxLoad uniform _unit * (1 - loadUniform _unit) / _mass); + _count = _count - floor (maxLoad uniformContainer _unit * (1 - loadUniform _unit) / _mass); _count <= 0 } } @@ -117,7 +117,7 @@ if (_unit isKindOf "CAManBase") then { && { _mass == 0 || { - _count = _count - floor (getContainerMaxLoad vest _unit * (1 - loadVest _unit) / _mass); + _count = _count - floor (maxLoad vestContainer _unit * (1 - loadVest _unit) / _mass); _count <= 0 } } @@ -129,7 +129,7 @@ if (_unit isKindOf "CAManBase") then { && { _mass == 0 || { - _count = _count - floor (getContainerMaxLoad backpack _unit * (1 - loadBackpack _unit) / _mass); + _count = _count - floor (maxLoad backpackContainer _unit * (1 - loadBackpack _unit) / _mass); _count <= 0 } } From 640ea1e200db79ff7a3fa44ddb07baad1103eae1 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 19 Mar 2022 14:20:37 -0500 Subject: [PATCH 078/111] Update fnc_initDisplayRemoteMissions.sqf --- addons/ui/fnc_initDisplayRemoteMissions.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/ui/fnc_initDisplayRemoteMissions.sqf b/addons/ui/fnc_initDisplayRemoteMissions.sqf index 2d401e9798..c08668ac34 100644 --- a/addons/ui/fnc_initDisplayRemoteMissions.sqf +++ b/addons/ui/fnc_initDisplayRemoteMissions.sqf @@ -26,15 +26,15 @@ private _fnc_findMissions = { _display setVariable [QGVAR(stockMissions), _stockMissions]; // Show worldnames as tooltips on map list -private _mapNames = createHashMap; +private _worldNames = createHashMap; { private _worldName = configName _x; private _description = getText (configFile >> "CfgWorlds" >> _worldName >> "description"); - _mapNames set [_description, _worldname]; + _worldNames set [_description, _worldname]; } forEach (configProperties [configfile >> "CfgWorldList", "isClass _x"]); for "_index" from 0 to ((lbSize _ctrlMaps) - 1) do { private _description = _ctrlMaps lbText _index; - private _worldName = _mapNames getOrDefault [_description, ""]; + private _worldName = _worldNames getOrDefault [_description, ""]; _ctrlMaps lbSetTooltip [_index, _worldName]; }; From a50eb2dbb8d2cae94f350996c0d7d8e2ca718196 Mon Sep 17 00:00:00 2001 From: YetheSamartaka <55753928+YetheSamartaka@users.noreply.github.com> Date: Thu, 21 Apr 2022 12:50:17 +0200 Subject: [PATCH 079/111] Czech stringtables (Used Bux tabler to do that) --- addons/ai/stringtable.xml | 110 ++-- addons/diagnostic/stringtable.xml | 253 ++++---- addons/network/stringtable.xml | 196 ++++--- addons/settings/stringtable.xml | 947 +++++++++++++++--------------- addons/strings/stringtable.xml | 88 ++- addons/ui/stringtable.xml | 592 +++++++++---------- 6 files changed, 1102 insertions(+), 1084 deletions(-) diff --git a/addons/ai/stringtable.xml b/addons/ai/stringtable.xml index a0a802c283..ccf059dcf9 100644 --- a/addons/ai/stringtable.xml +++ b/addons/ai/stringtable.xml @@ -1,62 +1,64 @@ - - - Community Base Addons - Artificial Intelligence - Community Base Addons - Künstliche Intelligenz - Community Base Addons - 人工知能 - 社群基礎模組 - 人工智能 - 社群基础模组 - AI - Community Base Addons - Искуственный Интеллект - Community Base Addons - Intelligence artificielle - Community Base Addons - Sztuczna Inteligencja - Community Base Addons - Yapay Zeka - Community Base Addons - Intelligenza Artificiale - Community Base Addons - Umělá inteligence - - - AI Building Position - KI Gebäudeposition - Poloha stavby AI - AI Bina Pozisyonu - AI の建物内での位置 - AI在建築物內位置 + + + Community Base Addons - Artificial Intelligence + Community Base Addons - Künstliche Intelligenz + Community Base Addons - 人工知能 + 社群基礎模組 - 人工智能 + 社群基础模组 - AI + Community Base Addons - Искуственный Интеллект + Community Base Addons - Intelligence artificielle + Community Base Addons - Sztuczna Inteligencja + Community Base Addons - Yapay Zeka + Community Base Addons - Intelligenza Artificiale + Community Base Addons - Umělá inteligence + + + AI Building Position + KI Gebäudeposition + Poloha stavby AI + AI Bina Pozisyonu + AI の建物内での位置 + AI在建築物內位置 AI在建筑内部位置 - Position IA bâtiment - ИИ Место строительства - Pozycja AI w budynku - - - Invisible Target Soldier - Unsichtbares Ziel - Soldat - 隱形目標（士兵） - Cible invisible - Soldat - Soldado objetivo invisible - Soldato obiettivo invisibile - Żołnierz - niewidoczny cel - Невидимая цель - солдат - Neviditelný cíl (voják) - Soldado alvo invisível - 보이지 않는 표적 병사 - 隐形目标（士兵） - 隠れた標的兵士 - Görünmez Hedef Asker - - - Invisible Target Vehicle - Unsichtbares Ziel - Fahrzeug - Cible invisible - Véhicule - Pojazd - niewidoczny cel + Position IA bâtiment + ИИ Место строительства + Pozycja AI w budynku + + + Invisible Target Soldier + Unsichtbares Ziel - Soldat + 隱形目標（士兵） + Cible invisible - Soldat + Soldado objetivo invisible + Soldato obiettivo invisibile + Żołnierz - niewidoczny cel + Невидимая цель - солдат + Neviditelný cíl (Voják) + Soldado alvo invisível + 보이지 않는 표적 병사 + 隐形目标（士兵） + 隠れた標的兵士 + Görünmez Hedef Asker + + + Invisible Target Vehicle + Unsichtbares Ziel - Fahrzeug + Cible invisible - Véhicule + Pojazd - niewidoczny cel 隱形目標（車輛） 隐形目标（车辆） - - - Invisible Target Airplane - Unsichtbares Ziel - Flugzeug - Cible invisible - Avion - Samolot - niewidoczny cel + Neviditelný cíl (Vozidlo) + + + Invisible Target Airplane + Unsichtbares Ziel - Flugzeug + Cible invisible - Avion + Samolot - niewidoczny cel 隱形目標（飛機） 隐形目标（飞机） - - + Neviditelný cíl (Letoun) + + diff --git a/addons/diagnostic/stringtable.xml b/addons/diagnostic/stringtable.xml index b3462bda35..64a73d0fa9 100644 --- a/addons/diagnostic/stringtable.xml +++ b/addons/diagnostic/stringtable.xml @@ -1,137 +1,142 @@ - - - Community Base Addons - Diagnostics - Community Base Addons - Diagnose - Community Base Addons - 診断 - 社群基礎模組 - 診斷 - 社群基础模组 - 诊断 - Community Base Addons - Диагностика - Community Base Addons - Diagnostyka - Community Base Addons - Diagnostics - Community Base Addons - Teşhis - Community Base Addons - Diagnostica - Community Base Addons - Diagnostika - Community Base Addons - Diagnósticos - - - Extended Debug Console - Erweiterte Debug-Konsole - 拡張デバッグ コンソール - 擴展除錯控制台 - 扩展除错控制台 - Расширенная Консоль Отладки - Console de débogage étendue - Rozszerzona Konsola Debugowania - Geliştirilmiş Debug Konsolu - Console debug estesa - Rozšířená ladící konzole - Consola Extendida de Depuración - - - Previous Statement - Vorheriger Ausdruck - 前のコード - 上個陳述式 - 上个陈述式 - Пред. команда - Déclaration précédente - Poprzednie polecenie - Önceki İfade - Espressione Prec. - Předchozí zpráva - Expresión Anterior - - - Next Statement - Nächster Ausdruck - 次のコード - 下個陳述式 - 下个陈述式 - След. команда - Déclaration suivante - Następne polecenie - Sonraki İfade - Espressione Succ. - Následující zpráva - Expresión Siguiente - - - Target Exec - Ziel Ausf. - 対象へ実行 - 在目標執行 - 目标执行 - На цели - Wykonaj na celu - Cible Exec - Hedefte Çalıştır - Esegui Remoto - Cílový exec - Ejecutiva de Objetivo - - - Enable Target Debugging - Ziel-Debugging aktivieren - 対象デバッキングを有効化 - 開啟目標除錯模式 - 开启目标除错模式 - Включить Отладку Цели - Włącz debugowanie na celu - Activer le débogage de la cible - Hedefte Çalıştırmayı Aktifleştir - Attiva il debug remoto - Zapnout cílové ladění - Activar Depuración de Objetivo - - - [CBA] Allows remote target debugging. Requires Debug Console. - [CBA] Erlaubt Remote-Ziel-Debugging. Benötigt Debug-Konsole. - [CBA] リモート対象デバッキングを許可します。デバッグ コンソールが必要です。 - [CBA] 允許遠程為目標進行除錯。需要開啟除錯控制台。 - [CBA] 允许远程为目标进行除错。需要开启除错控制台。 - [CBA] Разрешает отладку дистанционной цели. Требуется Консоль Отладки. - [CBA] Włącza debugowanie zdalnego celu. Konsola Debugowania musi być dostęna. - [CBA] Permet le débogage de la cible distante. Nécessite la console de débogage. - [CBA] Başka hedefte çalıştırmayı aktifleştirir. Debug konsolu gerektirir. - [CBA] Abilita il debug remoto. Richiede la console di debug. - [CBA] Povoluje ladění vzdáleného cíle. Vyžaduje ladící konzoli. - [CBA] Permite la depuración de objetivos remotos. Requiere consola de depuración. - - - Debug Console Indentation - Indentacja w konsoli debugowania - Indentation dans la console de débogage - Espaciado de la Consola de Depuración + + + Community Base Addons - Diagnostics + Community Base Addons - Diagnose + Community Base Addons - 診断 + 社群基礎模組 - 診斷 + 社群基础模组 - 诊断 + Community Base Addons - Диагностика + Community Base Addons - Diagnostyka + Community Base Addons - Diagnostics + Community Base Addons - Teşhis + Community Base Addons - Diagnostica + Community Base Addons - Diagnostika + Community Base Addons - Diagnósticos + + + Extended Debug Console + Erweiterte Debug-Konsole + 拡張デバッグ コンソール + 擴展除錯控制台 + 扩展除错控制台 + Расширенная Консоль Отладки + Console de débogage étendue + Rozszerzona Konsola Debugowania + Geliştirilmiş Debug Konsolu + Console debug estesa + Rozšířená ladící konzole + Consola Extendida de Depuración + + + Previous Statement + Vorheriger Ausdruck + 前のコード + 上個陳述式 + 上个陈述式 + Пред. команда + Déclaration précédente + Poprzednie polecenie + Önceki İfade + Espressione Prec. + Předchozí zpráva + Expresión Anterior + + + Next Statement + Nächster Ausdruck + 次のコード + 下個陳述式 + 下个陈述式 + След. команда + Déclaration suivante + Następne polecenie + Sonraki İfade + Espressione Succ. + Následující zpráva + Expresión Siguiente + + + Target Exec + Ziel Ausf. + 対象へ実行 + 在目標執行 + 目标执行 + На цели + Wykonaj na celu + Cible Exec + Hedefte Çalıştır + Esegui Remoto + Cílový exec + Ejecutiva de Objetivo + + + Enable Target Debugging + Ziel-Debugging aktivieren + 対象デバッキングを有効化 + 開啟目標除錯模式 + 开启目标除错模式 + Включить Отладку Цели + Włącz debugowanie na celu + Activer le débogage de la cible + Hedefte Çalıştırmayı Aktifleştir + Attiva il debug remoto + Zapnout cílové ladění + Activar Depuración de Objetivo + + + [CBA] Allows remote target debugging. Requires Debug Console. + [CBA] Erlaubt Remote-Ziel-Debugging. Benötigt Debug-Konsole. + [CBA] リモート対象デバッキングを許可します。デバッグ コンソールが必要です。 + [CBA] 允許遠程為目標進行除錯。需要開啟除錯控制台。 + [CBA] 允许远程为目标进行除错。需要开启除错控制台。 + [CBA] Разрешает отладку дистанционной цели. Требуется Консоль Отладки. + [CBA] Włącza debugowanie zdalnego celu. Konsola Debugowania musi być dostęna. + [CBA] Permet le débogage de la cible distante. Nécessite la console de débogage. + [CBA] Başka hedefte çalıştırmayı aktifleştirir. Debug konsolu gerektirir. + [CBA] Abilita il debug remoto. Richiede la console di debug. + [CBA] Povoluje ladění vzdáleného cíle. Vyžaduje ladící konzoli. + [CBA] Permite la depuración de objetivos remotos. Requiere consola de depuración. + + + Debug Console Indentation + Indentacja w konsoli debugowania + Indentation dans la console de débogage + Espaciado de la Consola de Depuración 調試控制台縮進 调试控制台缩进 - - - Type of indentation that can be added to expression in the debug console by pressing Tab key or removed by pressing Shift + Tab. - Rodzaj indentacji która może być dodana do wyrażenia w konsoli debugowania za pomocą klawisza Tab lub usunięta za pomocą Shift + Tab. - Type d'indentation qui peut être employée dans la console de débogage.\nTab ajoute une indentation, et Shift + Tab en supprime une. - Tipo de sangría que se puede agregar a la expresión en la consola de depuración presionando la tecla Tab o eliminar presionando Shift + Tab + Odsazení ladící konzole + + + Type of indentation that can be added to expression in the debug console by pressing Tab key or removed by pressing Shift + Tab. + Rodzaj indentacji która może być dodana do wyrażenia w konsoli debugowania za pomocą klawisza Tab lub usunięta za pomocą Shift + Tab. + Type d'indentation qui peut être employée dans la console de débogage.\nTab ajoute une indentation, et Shift + Tab en supprime une. + Tipo de sangría que se puede agregar a la expresión en la consola de depuración presionando la tecla Tab o eliminar presionando Shift + Tab 可以通過按 Tab 鍵為添加到調試控制台中的表達式縮進或通過按 Shift + Tab 鍵為其刪除縮進。 可以通过按 Tab 键为添加到调试控制台中的表达式缩进或通过按 Shift + Tab 键为其删除缩进。 - - - Refresh rate target watcher field + Typ odsazení, které lze přidat do výrazu v ladicí konzoli stisknutím klávesy Tab nebo odstranit stisknutím Shift + Tab. + + + Refresh rate target watcher field 刷新率 刷新率 - - - Refresh rate (in seconds) for the CBA target watcher fields to the right of the debug console. + Pole cílového sledování obnovovací frekvence + + + Refresh rate (in seconds) for the CBA target watcher fields to the right of the debug console. 調試控制台右側的 CBA 目標監視器字段的刷新率（以秒為單位）。 调试控制台右侧的 CBA 目标监视器字段的刷新率（以秒为单位）。 - - - 4 Spaces - 4 Spacje - 4 espaces - 4 Espacios + Obnovovací frekvence (v sekundách) pro pole sledování cíle CBA napravo od konzole ladění. + + + 4 Spaces + 4 Spacje + 4 espaces + 4 Espacios 4 個空格 4 个空格 - - + 4 mezery + + diff --git a/addons/network/stringtable.xml b/addons/network/stringtable.xml index b3598ffb91..b9b668f7a4 100644 --- a/addons/network/stringtable.xml +++ b/addons/network/stringtable.xml @@ -1,97 +1,105 @@ - - - CBA Network - CBA Netzwerk - CBA ネットワーク - CBA 網路 - CBA 网路 - CBA Rede - CBA Сеть - CBA Réseau - CBA Sieć - CBA Ağ - CBA Rete - CBA Síť - - - Network - Netzwerk - ネットワーク - 網路 - 网路 - Rede - Сеть - Réseau - Sieć - Ağ - Rete - Síť - - - Loadout Validation - Überprüfung von Ausrüstungen - Vérification de l'équipement - Sprawdzenie wyposażenia - 驗證加載 - 验证加载 - - - Validate loadout of units. Fixes an issue where units appear naked after changing locality. - Überprüfe die Ausrüstung von Einheiten. Korrigiert den Fehler, bei dem Einheiten nackt sind nach einer Änderung deren Lokalität. - Vérifie l'équipement des unités. Correction d'un bug où les unités se retrouvaient nues après avoir changé de localité. - Sprawdza wyposażenie jednostek. Naprawia problem, który powodował pojawianie się jednostek nagich, przy zmianie lokalności. - 驗證單位加載。修復單位在更改大廳位置後顯示為裸體的問題。 - 验证单位加载。修复单位在更改大厅位置后显示为裸体的问题。 - - - Never - Niemals - Jamais - Nigdy - 從不 - 从不 - - - Never validate loadouts - Überprüfe niemals Ausrüstungen - Ne jamais vérifier les équipements - Nigdy nie sprawdzaj wyposażenia - 從不驗證加載 - 从不验证加载 - - - Playable units only - Nur spielbare Einheiten - Pour les unités jouables - Tylko grywalne jednostki - 僅可玩單位 - 仅可玩单位 - - - Validate only loadout of playable units - Überprüfe nur die Ausrüstung von spielbaren Einheiten - Vérifier uniquement l'équipement des unités jouables - Sprawdza wyposażenie tylko jednostek oznaczonych jako grywalne - 僅驗證可玩單位的加載 - 仅验证可玩单位的加载 - - - All units - Alle Einheiten - Pour toutes les unités - Wszystkie jednostki - 所有單位 - 所有单位 - - - Validate loadout of all units - Überprüfe die Ausrüstungen von allen Einheiten - Vérifier l'équipement de toutes les unités - Sprawdza wyposażenie wszystkich jednostek - 驗證所有單位的加載 - 验证所有单位的加载 - - + + + CBA Network + CBA Netzwerk + CBA ネットワーク + CBA 網路 + CBA 网路 + CBA Rede + CBA Сеть + CBA Réseau + CBA Sieć + CBA Ağ + CBA Rete + CBA Síť + + + Network + Netzwerk + ネットワーク + 網路 + 网路 + Rede + Сеть + Réseau + Sieć + Ağ + Rete + Síť + + + Loadout Validation + Überprüfung von Ausrüstungen + Vérification de l'équipement + Sprawdzenie wyposażenia + 驗證加載 + 验证加载 + Ověření výbavy + + + Validate loadout of units. Fixes an issue where units appear naked after changing locality. + Überprüfe die Ausrüstung von Einheiten. Korrigiert den Fehler, bei dem Einheiten nackt sind nach einer Änderung deren Lokalität. + Vérifie l'équipement des unités. Correction d'un bug où les unités se retrouvaient nues après avoir changé de localité. + Sprawdza wyposażenie jednostek. Naprawia problem, który powodował pojawianie się jednostek nagich, przy zmianie lokalności. + 驗證單位加載。修復單位在更改大廳位置後顯示為裸體的問題。 + 验证单位加载。修复单位在更改大厅位置后显示为裸体的问题。 + Ověřovat výbavu jednotek. Opravuje problém s nahými jednotkami když mění lokálnost. + + + Never + Niemals + Jamais + Nigdy + 從不 + 从不 + Nikdy + + + Never validate loadouts + Überprüfe niemals Ausrüstungen + Ne jamais vérifier les équipements + Nigdy nie sprawdzaj wyposażenia + 從不驗證加載 + 从不验证加载 + Nikdy neověřovat výbavy + + + Playable units only + Nur spielbare Einheiten + Pour les unités jouables + Tylko grywalne jednostki + 僅可玩單位 + 仅可玩单位 + Pouze hratelné jednotky + + + Validate only loadout of playable units + Überprüfe nur die Ausrüstung von spielbaren Einheiten + Vérifier uniquement l'équipement des unités jouables + Sprawdza wyposażenie tylko jednostek oznaczonych jako grywalne + 僅驗證可玩單位的加載 + 仅验证可玩单位的加载 + Ověřovat pouze výbavu hratelných jednotek + + + All units + Alle Einheiten + Pour toutes les unités + Wszystkie jednostki + 所有單位 + 所有单位 + Všechny jednotky + + + Validate loadout of all units + Überprüfe die Ausrüstungen von allen Einheiten + Vérifier l'équipement de toutes les unités + Sprawdza wyposażenie wszystkich jednostek + 驗證所有單位的加載 + 验证所有单位的加载 + Ověřovat výbavu všech jednotek + + diff --git a/addons/settings/stringtable.xml b/addons/settings/stringtable.xml index 029a3d3162..31b184d699 100644 --- a/addons/settings/stringtable.xml +++ b/addons/settings/stringtable.xml @@ -1,475 +1,478 @@ - - - Community Base Addons - Settings - Community Base Addons - Einstellungen - Community Base Addons - 設定要素 - 社群基礎模組 - 設定組件 - 社群基础模组 - 设定组件 - Extensões de Base Comunitária - Componente das Configurações - Community Base Addons - Компонент Настроек - Community Base Addons - Komponent Ustawień - Community Base Addons - Paramètres - Community Base Addons - Ayarlar - Community Base Addons - Impostazioni - Community Base Addons - Nastavení - - - Configure Addons - Modifikationen anpassen - Konfiguracja addonów - アドオンの設定 - 模組設定 - 模组设定 - Configurar as Extensões - Настроить Дополнения - Configurer les addons - Eklenti Ayarları - Configura gli addon - Konfigurovat addony - - - Configure Base - Hauptspiel anpassen - Konfiguracja bazy - 基本設定 - 基礎設定 - 基础设定 - Configurar as Bases - Основные Настройки - Configurer la base - Oyun Ayarları - Configura il gioco base - Konfigurovat základ - - - Addon Options - Addon-Optionen - アドオン オプション - 模組設定選項 - 模组设定选项 - Opções de Extensão - Настройки Дополнений - Options des addons - Ustawienia addonów - Eklenti Ayarları - Opzioni degli addon - Možnosti addonu - - - Adjust addon settings. - Addon-Einstellungen anpassen. - Permet d'ajuster les paramètres des addons. - Zmień ustawienia addonów. - Eklenti ayarlarını değiştir. - アドオンの設定を調整します。 - Aggiusta le impostazioni per gli addon - Upravit nastavení addonu. - 調整插件設定。 - 调整插件设置。 - Отрегулировать настройки дополнений. - - - Addon Options... - Addon-Optionen... - アドオン オプション... - 模組設定選項... - 模组设定选项... - Opções ded Extensão... - Настройки Дополнений... - Ajuster les paramètres des addons... - Ustawienia addonów... - Eklenti Ayarları... - Opzioni per gli addon ... - Možnosti addonu... - - - Server - Server - サーバー - 伺服器 - 服务器 - Servidor - Сервер - Serveur - Serwer - Sunucu - Server - Server - - - Look at the server's settings. Log in as admin to change. - Server-Einstellungen ansehen. Als Admin einloggen, um zu ändern. - サーバー設定を確認します。管理者が変更すると記録します。 - 查看伺服器的設定。必須登入成管理員才能編輯設定。 - 查看服务器的设定。必须登入管理员才能编辑设定。 - Olhe as configurações dos servidores. Acesse como administrador para alterá-las. - Смотреть настройки сервера. Войдите под администратором, чтобы менять. - Permet de visualiser les paramètres du serveur. Se connecter en tant qu'administrateur pour les changer. - Zobacz ustawienia serwera. Zaloguj się jako administrator aby zmienić. - Sunucu ayarlarına bak. Değiştirmek için admin olarak giriş yapın. - Visualizza le impostazioni del server. Entra come amministratore per cambiarle. - Podívejte se na nastavení serveru. Přihlaste se jako admin pro změnu. - - - Mission - Mission - ミッション - 任務 - 任务 - Missão - Миссия - Misja - Mission - Görev - Missione - Mise - - - Look at the mission's settings. - Missionseinstellungen ansehen. - ミッションの設定を確認します。 - 查看任務的設定。 - 查看任务的设定。 - Olhe as configurações de missão. - Смотреть настройки миссии. - Permet de visualiser les paramètres de la mission. - Zobacz ustawienia misji. - Görev'in ayarlarına bak. - Visualizza le impostazioni della missione. - Podívejte se na nastavení mise. - - - Edit the mission's settings. - Missionseinstellungen bearbeiten. - ミッションの設定を編集します。 - 編輯任務的設定。 - 编辑任务的设定。 - Edite as configurações de missões. - Редактировать настройки миссии. - Editer les paramètres de la mission. - Edytuj ustawienia misji. - Görev'in ayarlarını değiştir. - Cambia le impostazioni della missione. - Upravit nastavení mise. - - - Client - Client - クライアント - 客戶端 - 客户端 - Cliente - Клиент - Klient - Client - Oyuncu - Client - Klient - - - Edit your local settings. - Lokale Einstellungen bearbeiten. - ローカル設定を編集します。 - 編輯你本地端的設定。 - 编辑你本地端的设定。 - Edite as configurações locais. - Изменить локальные настройки. - Modifier vos paramètres locaux. - Edytuj swoje lokalne ustawienia. - Yerel ayarlarınızı değiştirin. - Cambia le tue impostazioni locali. - Upravit vaše lokální nastavení. - - - Local - Lokal - ローカル - 本地端 - 本地端 - Local - Локальные настройки - Lokalne - Local - Yerel - Locale - Lokální - - - Save current settings as preset. - Derzeitige Einstellungen als Vorlage speichern. - 現在の設定をプリセットとして保存します。 - 保存當前的設定為預設。 - 保存当前的设定为预设。 - Salvar as configurações atuais como padrões. - Сохранить текущие настройки как предустановки. - Enregistrer un préréglage des paramètres actuels. - Zapisz obecne ustawienia do szablonu. - Şuanki ayaları şablon olarak kaydet. - Salva le impostazioni attuali come predefinite - Uložit nynější nastavení jako předvolbu. - - - Load settings from preset. - Einstellungen aus Vorlage laden. - プリセットから設定を読み込みます。 - 載入預設的設定。 - 载入预设的设定。 - Carregue as configurações padrão. - Загрузить настройки из предустановок. - Charger les paramètres à partir d'un préréglage. - Załaduj ustawienia z szablonu. - Şablondan ayarları yükle. - Carica le impostazioni da quelle predefinite - Načíst nastavení z předvolby. - - - Import - Import - 取り込み - 匯入 - 导入 - Importar - Импорт - Importer - Import - Import - Importa - Import - - - Import settings from clipboard. - Einstellungen aus Zwischenablage einfügen. - クリップボードから設定を取り込みします。 - 從剪貼簿匯入設定。 - 从剪贴板导入设定。 - Importar configurações da prancheta. - Импортировать настройки из буфера обмена. - Importer les paramètres depuis le presse-papier. - Import ustawień ze schowka. - Ayarları panodan çek. - Importa le impostazioni dagli appunti. - Importovat nastavení ze schránky. - - - Export - Export - 出力 - 匯出 - 导出 - Exportar - Экспорт - Exporter - Eksport - Export - Esporta - Export - - - Export settings to clipboard. - Einstellungen in Zwischenablage speichern. - クリップボードに設定を出力します。 - 匯出設定到剪貼簿。 - 导出设定到剪贴板。 - Exportar configurações para a prancheta. - Экспортировать настройки в буфер обмена. - Exporter les paramètres dans le presse-papier. - Eksport ustawień do schowka. - Ayarları panoya kopyala. - Esporta le impostazioni negli appunti. - Exportovat nastavení do schránky. - - - Reset to default value. - Zur Standardeinstellung zurücksetzen. - 標準値へ初期化します。 - 重設成預設數值。 - 重设成预设数值。 - Resetar para os valores padrões. - Сбросить на значение по умолчанию. - Réinitialiser à la valeur par défaut. - Przywróć domyślne wartości. - Varsayılan ayarlara geri dön. - Reimposta ai valori originali. - Resetovat na původní hodnotu. - - - Overwrite\nClients - Clients\nüberschreiben - ｸﾗｲｱﾝﾄ側で\n上書き - 覆寫\n客戶端 - 覆写\n客户端 - Sobrescrever \nClientes - Перезапись\nКлиент - Ecraser\nClients - Nadpisz\nKlienci - Oyunculara\nAyar Zorla - Sovrascrive\ni client - Přepsat \nClients - - - Overwrite\nMission - Mission\nüberschreiben - ﾐｯｼｮﾝ側で\n上書き - 覆寫\n任務 - 覆写\n任务 - Sobrescrever \nMissão - Перезапись\nМиссия - Ecraser\nMission - Nadpisz\nMisja - Göreve\nAyar Zorla - Sovrascrive\nla missione - Přepsat \nMission - - - Overwrite\nServer - Server\nüberschreiben - ｻｰﾊﾞｰ側で\n上書き - 覆寫\n伺服器 - 覆写\n服务器 - Sobrescrever \nServidor - Перезапись\nСервер - Ecraser\nServeur - Nadpisz\nSerwer - Sunucuya\nAyar Zorla - Sovrascrive\nil server - Přepsat \nServer - - - This setting applies. - Diese Einstellung gilt. - Ce paramètre s'applique. - To ustawienie dotyczy. - Bu ayar geçerli. - 設定を適用します。 - Prevale questa impostazione. - Toto nastavení je aktuální. - 設定已套用。 - 设置已套用。 - Этот параметр применён. - - - This setting applies after the next mission restart. - Diese Einstellung gilt nach dem nächsten Neustart der Mission. - Ce paramètre s'appliquera au prochain redémarrage de la mission. - To ustawienie zostanie zastosowanie po restarcie misji. - Bu ayar oyun baştan başladıktan sonra geçerli olur. - この設定は次のミッション開始後に適用されます。 - Questa impostazione sarà valida dopo il riavvio della missione. - Toto nastavení bude aplikováno po restartu mise. - 這個設定將會在任務重置後生效 - 该设定将在任务重启后生效。 - Этот параметр будет применён после рестарта миссии. - - - This setting is overwritten by the clients. - Diese Einstellung wird von den Clients überschrieben. - この設定はクライアントによって上書きされます。 - 此項設定被客戶端給覆寫。 - 此项设定被客户端给覆写。 - Esta configuração é sobrescrita pelos clientes. - Этот параметр перезаписан клиентом. - Ta wartość została nadpisana przez klientów. - Ce paramètre est écrasé par les clients. - Oyuncular tarafından bu ayarın üstüne yazılmış. - I client sovrascrivono questa impostazione. - Toto nastavení je přepsáno klienty. - - - This setting is overwritten by the mission. - Diese Einstellung wird von der Mission überschrieben. - この設定はミッションによって上書きされます。 - 此項設定被任務給覆寫。 - 此项设定被任务给覆写。 - Esta configuração é sobrescrita pela missão. - Этот параметр перезаписан миссией. - Ta wartośc została nadpisana przez misję. - Ce paramètre est écrasé par la mission. - Görev tarafından bu ayarın üstüne yazılmış. - La missione sovrascrive questa impostazione. - Toto nastavení je přepsáno misí. - - - This setting is overwritten by the server. - Diese Einstellung wird vom Server überschrieben. - この設定はサーバーによって上書きされます。 - 此項設定被伺服器給覆寫。 - 此项设定被服务器给覆写。 - Esta configuração é sobrescrita pelo servidor. - Этот параметр перезаписан сервером. - Ta wartość została nadpisana przez serwer. - Ce paramètre est écrasé par le serveur. - Sunucu tarafından bu ayarın üstüne yazılmış. - Il server sovrascrive questa impostazione. - Toto nastavení je přepsáno serverem. - - - This setting is overwritten by the clients and only applies to the server. - Diese Einstellung wird von den Clients überschrieben und betrifft nur den Server. - この設定はクライアントによって上書きされ、サーバーにのみ適用されます。 - 此項設定被客戶端給覆寫並僅適用於伺服器。 - 此项设定被客户端给覆写并仅适用于服务器。 - Esta configuração é sobrescrita pelos clientes e é apenas aplicada no servidor. - Этот параметр перезаписан клиентом и применяется исключительно к серверу. - Ta wartość została nadpisana przez klientów i ma zastosowanie tylko na serwerze. - Ce paramètre est écrasé par les clients et ne s'applique qu'au serveur. - Oyuncular tarafından bu ayarın üstüne yazılmış, ayar sadece sunucuda geçerli. - Questa impostazione è sovrascritta dai client e si applica solo al server. - Toto nastavení je přepsáno klienty a platí pouze na serveru. - - - Overwritten by client with the same value. - Mit gleichem Wert durch Client überschrieben. - Nadpisane przez klienta z taką samą wartością. - Écrasé par le client, avec la même valeur. - Перезаписано клиентом с таким же значением. - 被客戶端以相同的值覆蓋。 - 被客户端以相同的值覆盖。 - - - Overwritten by mission with the same value. - Mit gleichem Wert durch Mission überschrieben. - Nadpisane przez misję z taką samą wartością. - Écrasé par la mission, avec la même valeur. - Перезаписано миссией с таким же значением. - 被任務以相同的值覆蓋。 - 被任务以相同的值覆盖。 - - - Overwritten by server with the same value. - Mit gleichem Wert durch Server überschrieben. - Nadpisane przez serwer z taką samą wartością. - Écrasé par le serveur, avec la même valeur. - Перезаписано сервером с таким же значением. - 被伺服器以相同的值覆蓋。 - 被服务器以相同的值覆盖。 - - - Copy to clipboard - In Zwischenablage - Скопировать в буфер обмена - 複製到剪貼簿 - 复制到剪贴板 - クリップボードへコピー - Copier - Skopiuj do schowka - Panoya kopyala - Copia negli appunti - Kopírovat do schránky - - - Show default values: - Zeige Standardeinstellungen: - Показать настройки по умолчанию: - 顯示預設值: - 显示预设值: - 標準値を表示: - Afficher les valeurs par défaut: - Pokaż domyślnę wartości: - Varsayılan değerleri göster: - Mostra i valori originali: - Ukázat původní hodnoty: - - + + + Community Base Addons - Settings + Community Base Addons - Einstellungen + Community Base Addons - 設定要素 + 社群基礎模組 - 設定組件 + 社群基础模组 - 设定组件 + Extensões de Base Comunitária - Componente das Configurações + Community Base Addons - Компонент Настроек + Community Base Addons - Komponent Ustawień + Community Base Addons - Paramètres + Community Base Addons - Ayarlar + Community Base Addons - Impostazioni + Community Base Addons - Nastavení + + + Configure Addons + Modifikationen anpassen + Konfiguracja addonów + アドオンの設定 + 模組設定 + 模组设定 + Configurar as Extensões + Настроить Дополнения + Configurer les addons + Eklenti Ayarları + Configura gli addon + Konfigurovat addony + + + Configure Base + Hauptspiel anpassen + Konfiguracja bazy + 基本設定 + 基礎設定 + 基础设定 + Configurar as Bases + Основные Настройки + Configurer la base + Oyun Ayarları + Configura il gioco base + Konfigurovat základ + + + Addon Options + Addon-Optionen + アドオン オプション + 模組設定選項 + 模组设定选项 + Opções de Extensão + Настройки Дополнений + Options des addons + Ustawienia addonów + Eklenti Ayarları + Opzioni degli addon + Možnosti addonu + + + Adjust addon settings. + Addon-Einstellungen anpassen. + Permet d'ajuster les paramètres des addons. + Zmień ustawienia addonów. + Eklenti ayarlarını değiştir. + アドオンの設定を調整します。 + Aggiusta le impostazioni per gli addon + Upravit nastavení addonu. + 調整插件設定。 + 调整插件设置。 + Отрегулировать настройки дополнений. + + + Addon Options... + Addon-Optionen... + アドオン オプション... + 模組設定選項... + 模组设定选项... + Opções ded Extensão... + Настройки Дополнений... + Ajuster les paramètres des addons... + Ustawienia addonów... + Eklenti Ayarları... + Opzioni per gli addon ... + Možnosti addonu... + + + Server + Server + サーバー + 伺服器 + 服务器 + Servidor + Сервер + Serveur + Serwer + Sunucu + Server + Server + + + Look at the server's settings. Log in as admin to change. + Server-Einstellungen ansehen. Als Admin einloggen, um zu ändern. + サーバー設定を確認します。管理者が変更すると記録します。 + 查看伺服器的設定。必須登入成管理員才能編輯設定。 + 查看服务器的设定。必须登入管理员才能编辑设定。 + Olhe as configurações dos servidores. Acesse como administrador para alterá-las. + Смотреть настройки сервера. Войдите под администратором, чтобы менять. + Permet de visualiser les paramètres du serveur. Se connecter en tant qu'administrateur pour les changer. + Zobacz ustawienia serwera. Zaloguj się jako administrator aby zmienić. + Sunucu ayarlarına bak. Değiştirmek için admin olarak giriş yapın. + Visualizza le impostazioni del server. Entra come amministratore per cambiarle. + Podívejte se na nastavení serveru. Přihlaste se jako admin pro změnu. + + + Mission + Mission + ミッション + 任務 + 任务 + Missão + Миссия + Misja + Mission + Görev + Missione + Mise + + + Look at the mission's settings. + Missionseinstellungen ansehen. + ミッションの設定を確認します。 + 查看任務的設定。 + 查看任务的设定。 + Olhe as configurações de missão. + Смотреть настройки миссии. + Permet de visualiser les paramètres de la mission. + Zobacz ustawienia misji. + Görev'in ayarlarına bak. + Visualizza le impostazioni della missione. + Podívejte se na nastavení mise. + + + Edit the mission's settings. + Missionseinstellungen bearbeiten. + ミッションの設定を編集します。 + 編輯任務的設定。 + 编辑任务的设定。 + Edite as configurações de missões. + Редактировать настройки миссии. + Editer les paramètres de la mission. + Edytuj ustawienia misji. + Görev'in ayarlarını değiştir. + Cambia le impostazioni della missione. + Upravit nastavení mise. + + + Client + Client + クライアント + 客戶端 + 客户端 + Cliente + Клиент + Klient + Client + Oyuncu + Client + Klient + + + Edit your local settings. + Lokale Einstellungen bearbeiten. + ローカル設定を編集します。 + 編輯你本地端的設定。 + 编辑你本地端的设定。 + Edite as configurações locais. + Изменить локальные настройки. + Modifier vos paramètres locaux. + Edytuj swoje lokalne ustawienia. + Yerel ayarlarınızı değiştirin. + Cambia le tue impostazioni locali. + Upravit vaše lokální nastavení. + + + Local + Lokal + ローカル + 本地端 + 本地端 + Local + Локальные настройки + Lokalne + Local + Yerel + Locale + Lokální + + + Save current settings as preset. + Derzeitige Einstellungen als Vorlage speichern. + 現在の設定をプリセットとして保存します。 + 保存當前的設定為預設。 + 保存当前的设定为预设。 + Salvar as configurações atuais como padrões. + Сохранить текущие настройки как предустановки. + Enregistrer un préréglage des paramètres actuels. + Zapisz obecne ustawienia do szablonu. + Şuanki ayaları şablon olarak kaydet. + Salva le impostazioni attuali come predefinite + Uložit nynější nastavení jako předvolbu. + + + Load settings from preset. + Einstellungen aus Vorlage laden. + プリセットから設定を読み込みます。 + 載入預設的設定。 + 载入预设的设定。 + Carregue as configurações padrão. + Загрузить настройки из предустановок. + Charger les paramètres à partir d'un préréglage. + Załaduj ustawienia z szablonu. + Şablondan ayarları yükle. + Carica le impostazioni da quelle predefinite + Načíst nastavení z předvolby. + + + Import + Import + 取り込み + 匯入 + 导入 + Importar + Импорт + Importer + Import + Import + Importa + Import + + + Import settings from clipboard. + Einstellungen aus Zwischenablage einfügen. + クリップボードから設定を取り込みします。 + 從剪貼簿匯入設定。 + 从剪贴板导入设定。 + Importar configurações da prancheta. + Импортировать настройки из буфера обмена. + Importer les paramètres depuis le presse-papier. + Import ustawień ze schowka. + Ayarları panodan çek. + Importa le impostazioni dagli appunti. + Importovat nastavení ze schránky. + + + Export + Export + 出力 + 匯出 + 导出 + Exportar + Экспорт + Exporter + Eksport + Export + Esporta + Export + + + Export settings to clipboard. + Einstellungen in Zwischenablage speichern. + クリップボードに設定を出力します。 + 匯出設定到剪貼簿。 + 导出设定到剪贴板。 + Exportar configurações para a prancheta. + Экспортировать настройки в буфер обмена. + Exporter les paramètres dans le presse-papier. + Eksport ustawień do schowka. + Ayarları panoya kopyala. + Esporta le impostazioni negli appunti. + Exportovat nastavení do schránky. + + + Reset to default value. + Zur Standardeinstellung zurücksetzen. + 標準値へ初期化します。 + 重設成預設數值。 + 重设成预设数值。 + Resetar para os valores padrões. + Сбросить на значение по умолчанию. + Réinitialiser à la valeur par défaut. + Przywróć domyślne wartości. + Varsayılan ayarlara geri dön. + Reimposta ai valori originali. + Resetovat na původní hodnotu. + + + Overwrite\nClients + Clients\nüberschreiben + ｸﾗｲｱﾝﾄ側で\n上書き + 覆寫\n客戶端 + 覆写\n客户端 + Sobrescrever \nClientes + Перезапись\nКлиент + Ecraser\nClients + Nadpisz\nKlienci + Oyunculara\nAyar Zorla + Sovrascrive\ni client + Přepsat \nClients + + + Overwrite\nMission + Mission\nüberschreiben + ﾐｯｼｮﾝ側で\n上書き + 覆寫\n任務 + 覆写\n任务 + Sobrescrever \nMissão + Перезапись\nМиссия + Ecraser\nMission + Nadpisz\nMisja + Göreve\nAyar Zorla + Sovrascrive\nla missione + Přepsat \nMission + + + Overwrite\nServer + Server\nüberschreiben + ｻｰﾊﾞｰ側で\n上書き + 覆寫\n伺服器 + 覆写\n服务器 + Sobrescrever \nServidor + Перезапись\nСервер + Ecraser\nServeur + Nadpisz\nSerwer + Sunucuya\nAyar Zorla + Sovrascrive\nil server + Přepsat \nServer + + + This setting applies. + Diese Einstellung gilt. + Ce paramètre s'applique. + To ustawienie dotyczy. + Bu ayar geçerli. + 設定を適用します。 + Prevale questa impostazione. + Toto nastavení je aktuální. + 設定已套用。 + 设置已套用。 + Этот параметр применён. + + + This setting applies after the next mission restart. + Diese Einstellung gilt nach dem nächsten Neustart der Mission. + Ce paramètre s'appliquera au prochain redémarrage de la mission. + To ustawienie zostanie zastosowanie po restarcie misji. + Bu ayar oyun baştan başladıktan sonra geçerli olur. + この設定は次のミッション開始後に適用されます。 + Questa impostazione sarà valida dopo il riavvio della missione. + Toto nastavení bude aplikováno po restartu mise. + 這個設定將會在任務重置後生效 + 该设定将在任务重启后生效。 + Этот параметр будет применён после рестарта миссии. + + + This setting is overwritten by the clients. + Diese Einstellung wird von den Clients überschrieben. + この設定はクライアントによって上書きされます。 + 此項設定被客戶端給覆寫。 + 此项设定被客户端给覆写。 + Esta configuração é sobrescrita pelos clientes. + Этот параметр перезаписан клиентом. + Ta wartość została nadpisana przez klientów. + Ce paramètre est écrasé par les clients. + Oyuncular tarafından bu ayarın üstüne yazılmış. + I client sovrascrivono questa impostazione. + Toto nastavení je přepsáno klienty. + + + This setting is overwritten by the mission. + Diese Einstellung wird von der Mission überschrieben. + この設定はミッションによって上書きされます。 + 此項設定被任務給覆寫。 + 此项设定被任务给覆写。 + Esta configuração é sobrescrita pela missão. + Этот параметр перезаписан миссией. + Ta wartośc została nadpisana przez misję. + Ce paramètre est écrasé par la mission. + Görev tarafından bu ayarın üstüne yazılmış. + La missione sovrascrive questa impostazione. + Toto nastavení je přepsáno misí. + + + This setting is overwritten by the server. + Diese Einstellung wird vom Server überschrieben. + この設定はサーバーによって上書きされます。 + 此項設定被伺服器給覆寫。 + 此项设定被服务器给覆写。 + Esta configuração é sobrescrita pelo servidor. + Этот параметр перезаписан сервером. + Ta wartość została nadpisana przez serwer. + Ce paramètre est écrasé par le serveur. + Sunucu tarafından bu ayarın üstüne yazılmış. + Il server sovrascrive questa impostazione. + Toto nastavení je přepsáno serverem. + + + This setting is overwritten by the clients and only applies to the server. + Diese Einstellung wird von den Clients überschrieben und betrifft nur den Server. + この設定はクライアントによって上書きされ、サーバーにのみ適用されます。 + 此項設定被客戶端給覆寫並僅適用於伺服器。 + 此项设定被客户端给覆写并仅适用于服务器。 + Esta configuração é sobrescrita pelos clientes e é apenas aplicada no servidor. + Этот параметр перезаписан клиентом и применяется исключительно к серверу. + Ta wartość została nadpisana przez klientów i ma zastosowanie tylko na serwerze. + Ce paramètre est écrasé par les clients et ne s'applique qu'au serveur. + Oyuncular tarafından bu ayarın üstüne yazılmış, ayar sadece sunucuda geçerli. + Questa impostazione è sovrascritta dai client e si applica solo al server. + Toto nastavení je přepsáno klienty a platí pouze na serveru. + + + Overwritten by client with the same value. + Mit gleichem Wert durch Client überschrieben. + Nadpisane przez klienta z taką samą wartością. + Écrasé par le client, avec la même valeur. + Перезаписано клиентом с таким же значением. + 被客戶端以相同的值覆蓋。 + 被客户端以相同的值覆盖。 + Toto nastavení je přepsáno klienty stejnou hodnotou. + + + Overwritten by mission with the same value. + Mit gleichem Wert durch Mission überschrieben. + Nadpisane przez misję z taką samą wartością. + Écrasé par la mission, avec la même valeur. + Перезаписано миссией с таким же значением. + 被任務以相同的值覆蓋。 + 被任务以相同的值覆盖。 + Toto nastavení je přepsáno misí stejnou hodnotou. + + + Overwritten by server with the same value. + Mit gleichem Wert durch Server überschrieben. + Nadpisane przez serwer z taką samą wartością. + Écrasé par le serveur, avec la même valeur. + Перезаписано сервером с таким же значением. + 被伺服器以相同的值覆蓋。 + 被服务器以相同的值覆盖。 + Toto nastavení je přepsáno serverem stejnou hodnotou. + + + Copy to clipboard + In Zwischenablage + Скопировать в буфер обмена + 複製到剪貼簿 + 复制到剪贴板 + クリップボードへコピー + Copier + Skopiuj do schowka + Panoya kopyala + Copia negli appunti + Kopírovat do schránky + + + Show default values: + Zeige Standardeinstellungen: + Показать настройки по умолчанию: + 顯示預設值: + 显示预设值: + 標準値を表示: + Afficher les valeurs par défaut: + Pokaż domyślnę wartości: + Varsayılan değerleri göster: + Mostra i valori originali: + Ukázat původní hodnoty: + + diff --git a/addons/strings/stringtable.xml b/addons/strings/stringtable.xml index 5677ad0e1a..73db7b03a7 100644 --- a/addons/strings/stringtable.xml +++ b/addons/strings/stringtable.xml @@ -1,49 +1,45 @@ - - - Community Base Addons - Strings - Community Base Addons - Zeichenketten - Community Base Addons - ストリングス - 社群基礎模組 - 字串 - 社群基础模组 - 字串 - Extensões de Base Comunitária - Palavras - Community Base Addons - Строки - Community Base Addons - Ciągi znaków - Community Base Addons - Textes - Community Base Addons - Yazılar - Community Base Addons - Stringhe - Community Base Addons - Texty - - - . - , - , - , - , - , - , - , - , - . - . - , - , - - - , - - . - - - - - , - , - , - , - . - . - - + + + Community Base Addons - Strings + Community Base Addons - Zeichenketten + Community Base Addons - ストリングス + 社群基礎模組 - 字串 + 社群基础模组 - 字串 + Extensões de Base Comunitária - Palavras + Community Base Addons - Строки + Community Base Addons - Ciągi znaków + Community Base Addons - Textes + Community Base Addons - Yazılar + Community Base Addons - Stringhe + Community Base Addons - Texty + + + . + , + , + , + , + , + , + , + , + . + . + , + , + + + , + . + . + , + , + , + , + . + . + + diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index 91a5558db6..0bfebb29d3 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -1,297 +1,301 @@ - - - Community Base Addons - User Interface - Community Base Addons - Benutzeroberfläche - Community Base Addons - ユーザー インターフェイス - 社群基礎模組 - 使用者介面 - 社群基础模组 - 玩家界面 - Extensões de Base Comunitária - Interface ao Usuário - Community Base Addons - Пользовательский Интерфейс - Community Base Addons - Interface utilisateur - Community Base Addons - Interfejs Użytkownika - Community Base Addons - Kullanıcı Arayüzü - Community Base Addons - Interfaccia utente - Community Base Addons - Uživatelské prostředí - Community Base Addons - Interfaz de usuario - - - User Interface - Uživatelské rozhraní - Interface do usuário - Interface Utilisateur - Интерфейс - ユーザ インタフェイス - Interfejs użytkownika - Benutzeroberfläche - 사용자 인터페이스 - Interfaccia Utente - 使用者介面 - 玩家界面 - Interfaz de usuario - Kullanıcı Arayüzü - - - Progress Bar - Fortschrittsanzeige - プログレス バー - Barre de progression - 進度條 - 进度条 - Pasek postępu - Yükleme Çubuğu - Barra di avanzamento - Ukazatel průběhu - Индикатор выполнения - Barra de progreso - - - Position of the progress bar. - Position der Fortschrittsanzeige. - プログレス バーの位置。 - Position de la barre de progression. - 進度條的位置。 - 进度条位置。 - Pozycja paska postępu. - Yükleme çubuğunun konumu. - Posizione della barra di avanzamento - Pozici ukazatele průběhu. - Позиция индикатора выполнения. - Posición de la barra de progreso. - - - Store Server Passwords - Serverpasswörter speichern - Zapamiętuj hasła serwerów - Enregistrer les mots de passe serveur - Sunucu şifrelerini kaydet - サーバーのパスワードを保存 - Salva le password per i server - Ukládat hesla serveru - 儲存伺服器密碼 - 存储服务器密码 - Запоминать пароли серверов - Almacenar contraseñas del servidor - - - Setting to store the passwords entered when connecting to a multiplayer server. - Einstellung zum Speichern der beim Betreten eines Mehrspielerservers eingegebenen Passwörter. - Opcja zapamiętywania wprowadzonych haseł do serwerów. - Paramètre permettant de stocker les mots de passe saisis lors de la connexion à un serveur multijoueur. - Çok oyunculu bir sunucuya bağlanırken girilen şifreleri kaydetme ayarı. - マルチプレイヤーのサーバーへ接続時に入力されたパスワードの保存設定を行います。 - Impostazione per salvare le password immesse quando ci si collega a server multiplayer. - Uloží zadané heslo, když se připojujete k multiplayerovému serveru. - 設定是否當連線到伺服器時儲存密碼 - 设置是否存储连接服务器时输入的密码。 - Параметр запоминания паролей сервера при входе на них. - Configuración para almacenar las contraseñas ingresadas al conectarse a un servidor multijugador. - - - Save passwords - Passwörter speichern - Zapisuj hasła - Sauvegarder les mots de passe - Şifreleri kaydet - パスワードを保存 - Salva le password - Ukládat hesla - 記住密碼 - 记住密码 - Сохранять пароли - Guardar contraseñas - - - Passwords are stored when connecting to a multiplayer server. - Passwörter werden beim Verbinden mit einem Mehrspielerserver gespeichert. - Hasła są zapisywane podczas łaczenia do serwerów. - Les mots de passe sont stockés lors de la connexion à un serveur multijoueur. - Çok oyunculu bir sunucuya girerken şifreler kaydedilir. - マルチプレイヤーのサーバーへ接続時にパスワードを保存します。 - Quando ci si connette ad un server multiplayer, le password verranno salvate. - Hesla jsou uložena, když se připojujete k multiplayerovému serveru. - 連線到伺服器時將記住密碼 - 连接到服务器时将记住密码 - Пароли будут сохраняться при входе на сервера. - Las contraseñas se almacenan cuando se conecta a un servidor multijugador - - - Do not save passwords - Passwörter nicht speichern - Nie zapisuj haseł - Ne pas sauvegarder les mots de passe - Şifreleri kaydetme - パスワードを保存しない - Non salvare le password - Neukládat hesla - 不保存密碼 - 不保存密码 - Не сохранять пароли - No guarde las contraseñas - - - Passwords are not stored when connecting to a multiplayer server. Already stored passwords will not be automatically entered. - Passwörter werden beim Verbinden mit einem Mehrspielerserver nicht gespeichert. Bereits gespeicherte Passwörter werden nicht automatisch eingegeben. - Hasła nie są zapisywane podczas łączenia do serwerów. Już zapisane hasła nie bedą wykorzystywane. - Les mots de passe ne sont pas stockés lors de la connexion à un serveur multijoueur. Les mots de passe déjà enregistrés ne seront pas automatiquement entrés. - Çok oyunculu bir sunucuya girerken şifreler kaydedilmez. Zaten kayıtlı olan şifreler otomatik olarak doldurulmaz. - マルチプレイヤーのサーバーへ接続時にパスワードを保存しません。既に保存されているパスワードも自動的に入力されません。 - Quando ci si collega ad un server multiplayer, le password non verranno salvate. Le password precedentemente salvate non verranno immesse automaticamente. - Hesla nejsou ukládána, když se připojujete k multiplayerovému serveru. Hesla, která již byla uložena, nebudou automaticky zadávána. - 當連線到伺服器時將不保存密碼。已有的保存密碼將不會自動填入。 - 当连接到服务器时将不保存密码。已保存的密码将不自动填写。 - Пароли не сохраняются при входе на сервера. Уже сохранённые пароли не будут автоматически вставлены. - Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas no se ingresarán automáticamente. - - - Delete passwords - Passwörter löschen - Usuń hasła - Supprimer les mots de passe - Şifreleri sil - パスワードを削除 - Cancella le password - Smazat hesla - 刪除密碼 - 删除密码 - Удалить пароли - Eliminar contraseñas - - - Passwords are not stored when connecting to a multiplayer server. Already stored passwords are deleted from the profile. - Passwörter werden beim Verbinden mit einem Mehrspielerserver nicht gespeichert. Bereits gespeicherte Passwörter werden aus dem Profil gelöscht. - Hasła nie są zapisywane podczas łączenia do serwerów. Już zapisane hasła zostaną usunięte z profilu. - Les mots de passe ne sont pas stockés lors de la connexion à un serveur multijoueur. Les mots de passe déjà enregistrés sont supprimés du profil. - Çok oyunculu bir sunucuya girerken şifreler kaydedilmez. Zaten kayıtlı olan şifreler bilgisayardan silinir. - マルチプレイヤーのサーバーへ接続時にパスワードを保存しません。既に保存されているパスワードはプロフィールから削除します。 - Quando ci si collega ad un server multiplayer, le password non verranno salvate. Non saranno usate password precedentemente salvate. - Hesla nejsou ukládána, když se připojujete k multiplayerovému serveru. Hesla, která již byla uložena, jsou smazána z profilu. - 當連線到伺服器時將不保存密碼。已有的保存密碼將會刪除。 - 当连接到服务器时将不保存密码。已保存的密码将会删除。 - Пароли не сохраняются при входе на сервера. Уже сохранённые пароли будут удалены. - Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas se eliminan del perfil. - - - Notification - Benachrichtigung - Powiadomienie - 通知 - Notifica - Upozornění - Bildirim - 通知 - 提示 - Notification - Уведомление - Notificación - - - Textual feedback to the player. - Textrückmeldung an den Spieler. - Tekstowa informacja dla gracza. - 文章でプレイヤーに通知します。 - Notifica testuale al giocatore. - Textová zpětná vazba hráči. - Yazıyla geri bildirim. - 回饋文字給玩家 - 反馈文本给玩家。 - Notification textuelle au joueur. - Текстовая информация для игрока. - Comentarios textuales para el jugador - - - Show all missions - Alle Missionen anzeigen - 全ミッションを表示 - Pokaż wszystkie misje - Mostra tutte le missioni - Ukázat všechny mise - Tüm görevleri göster - 顯示所有任務 - 显示所有任务 - Afficher toutes les missions - Показать все миссии - Mostrar todas las misiones - - - Show custom missions - Eigene Missionen anzeigen - カスタム ミッションを表示 - Pokaż własne/wgrane misje - Mostra missioni custom - Ukázat vlastní mise - Sonradan eklenen görevleri göster - 顯示目前任務 - 显示当前任务 - Afficher les missions personnalisées - Показать пользовательские миссии - Mostrar misiones personalizadas - - - Notification Lifetime - Benachrichtigung-Anzeigedauer - Doba trvání upozornění - Bildirim Süresi - 通知の表示時間 - 通知時長 - 提示显示时长 - Durée de vie des notifications - Продолжительность уведомления - Długość żywotności powiadomień - Duración de la notificación - - - Notification display duration in seconds. - Anzeigedauer der Benachrichtigungen in Sekunden. - Jak dlouho bude upozornění ukázáno (v sekundách). - Bildirim gözükme süresi (saniye olarak) - 通知が表示される時間を秒で変更できます。 - 設定通知的顯示時間（秒數）。 - 设置提示的显示时长（秒） - Durée d'affichage des notifications, en secondes. - Время в секундах, в течении которого будет видно уведомление. - Ilość czasu przez który widoczne jest powiadomienie - Duración de la visualización de notificaciones en segundos - - - Contact the server admin. - Serveradministrator benachrichtigen. - Sunucu yöneticisiyle iletişime geç. - サーバー管理者に連絡をして下さい。 - 聯絡伺服器的管理員 - 联系服务器管理员 - Contacter l'administrateur du serveur. - Уведомить администратора сервера. - Kontakt z administratorem serwera - Póngase en contacto con el administrador del servidor - - - Lobby Manager - Lobby Manager - Menadżer Lobby - Gestionnaire de Lobby - Gerente de lobby - 角色大廳管理 - 角色大厅管理 - - - Adjusting group order... - Reihenfolge der Gruppen wird angepasst ... - Modification de l'ordre des groupes... - Ajustar el orden del grupo... - Dostosowywanie kolejności w lobby... - 調整小隊順序 - 调整小队顺序 - - - Back up mission before using this tool. - Erstelle vor Gebrauch eine Sicherungskopie. - Sauvegardez la mission avant d'utiliser cet outil. - Haga una copia de seguridad de la misión antes de usar esta herramienta - Wykonaj kopię zapasową misji przed użyciem tego narzędzia. - 使用此工具前，請備份任務。 - 使用此工具之前，请备份任务。 - - + + + Community Base Addons - User Interface + Community Base Addons - Benutzeroberfläche + Community Base Addons - ユーザー インターフェイス + 社群基礎模組 - 使用者介面 + 社群基础模组 - 玩家界面 + Extensões de Base Comunitária - Interface ao Usuário + Community Base Addons - Пользовательский Интерфейс + Community Base Addons - Interface utilisateur + Community Base Addons - Interfejs Użytkownika + Community Base Addons - Kullanıcı Arayüzü + Community Base Addons - Interfaccia utente + Community Base Addons - Uživatelské prostředí + Community Base Addons - Interfaz de usuario + + + User Interface + Uživatelské rozhraní + Interface do usuário + Interface Utilisateur + Интерфейс + ユーザ インタフェイス + Interfejs użytkownika + Benutzeroberfläche + 사용자 인터페이스 + Interfaccia Utente + 使用者介面 + 玩家界面 + Interfaz de usuario + Kullanıcı Arayüzü + + + Progress Bar + Fortschrittsanzeige + プログレス バー + Barre de progression + 進度條 + 进度条 + Pasek postępu + Yükleme Çubuğu + Barra di avanzamento + Ukazatel průběhu + Индикатор выполнения + Barra de progreso + + + Position of the progress bar. + Position der Fortschrittsanzeige. + プログレス バーの位置。 + Position de la barre de progression. + 進度條的位置。 + 进度条位置。 + Pozycja paska postępu. + Yükleme çubuğunun konumu. + Posizione della barra di avanzamento + Pozici ukazatele průběhu. + Позиция индикатора выполнения. + Posición de la barra de progreso. + + + Store Server Passwords + Serverpasswörter speichern + Zapamiętuj hasła serwerów + Enregistrer les mots de passe serveur + Sunucu şifrelerini kaydet + サーバーのパスワードを保存 + Salva le password per i server + Ukládat hesla serveru + 儲存伺服器密碼 + 存储服务器密码 + Запоминать пароли серверов + Almacenar contraseñas del servidor + + + Setting to store the passwords entered when connecting to a multiplayer server. + Einstellung zum Speichern der beim Betreten eines Mehrspielerservers eingegebenen Passwörter. + Opcja zapamiętywania wprowadzonych haseł do serwerów. + Paramètre permettant de stocker les mots de passe saisis lors de la connexion à un serveur multijoueur. + Çok oyunculu bir sunucuya bağlanırken girilen şifreleri kaydetme ayarı. + マルチプレイヤーのサーバーへ接続時に入力されたパスワードの保存設定を行います。 + Impostazione per salvare le password immesse quando ci si collega a server multiplayer. + Uloží zadané heslo, když se připojujete k multiplayerovému serveru. + 設定是否當連線到伺服器時儲存密碼 + 设置是否存储连接服务器时输入的密码。 + Параметр запоминания паролей сервера при входе на них. + Configuración para almacenar las contraseñas ingresadas al conectarse a un servidor multijugador. + + + Save passwords + Passwörter speichern + Zapisuj hasła + Sauvegarder les mots de passe + Şifreleri kaydet + パスワードを保存 + Salva le password + Ukládat hesla + 記住密碼 + 记住密码 + Сохранять пароли + Guardar contraseñas + + + Passwords are stored when connecting to a multiplayer server. + Passwörter werden beim Verbinden mit einem Mehrspielerserver gespeichert. + Hasła są zapisywane podczas łaczenia do serwerów. + Les mots de passe sont stockés lors de la connexion à un serveur multijoueur. + Çok oyunculu bir sunucuya girerken şifreler kaydedilir. + マルチプレイヤーのサーバーへ接続時にパスワードを保存します。 + Quando ci si connette ad un server multiplayer, le password verranno salvate. + Hesla jsou uložena, když se připojujete k multiplayerovému serveru. + 連線到伺服器時將記住密碼 + 连接到服务器时将记住密码 + Пароли будут сохраняться при входе на сервера. + Las contraseñas se almacenan cuando se conecta a un servidor multijugador + + + Do not save passwords + Passwörter nicht speichern + Nie zapisuj haseł + Ne pas sauvegarder les mots de passe + Şifreleri kaydetme + パスワードを保存しない + Non salvare le password + Neukládat hesla + 不保存密碼 + 不保存密码 + Не сохранять пароли + No guarde las contraseñas + + + Passwords are not stored when connecting to a multiplayer server. Already stored passwords will not be automatically entered. + Passwörter werden beim Verbinden mit einem Mehrspielerserver nicht gespeichert. Bereits gespeicherte Passwörter werden nicht automatisch eingegeben. + Hasła nie są zapisywane podczas łączenia do serwerów. Już zapisane hasła nie bedą wykorzystywane. + Les mots de passe ne sont pas stockés lors de la connexion à un serveur multijoueur. Les mots de passe déjà enregistrés ne seront pas automatiquement entrés. + Çok oyunculu bir sunucuya girerken şifreler kaydedilmez. Zaten kayıtlı olan şifreler otomatik olarak doldurulmaz. + マルチプレイヤーのサーバーへ接続時にパスワードを保存しません。既に保存されているパスワードも自動的に入力されません。 + Quando ci si collega ad un server multiplayer, le password non verranno salvate. Le password precedentemente salvate non verranno immesse automaticamente. + Hesla nejsou ukládána, když se připojujete k multiplayerovému serveru. Hesla, která již byla uložena, nebudou automaticky zadávána. + 當連線到伺服器時將不保存密碼。已有的保存密碼將不會自動填入。 + 当连接到服务器时将不保存密码。已保存的密码将不自动填写。 + Пароли не сохраняются при входе на сервера. Уже сохранённые пароли не будут автоматически вставлены. + Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas no se ingresarán automáticamente. + + + Delete passwords + Passwörter löschen + Usuń hasła + Supprimer les mots de passe + Şifreleri sil + パスワードを削除 + Cancella le password + Smazat hesla + 刪除密碼 + 删除密码 + Удалить пароли + Eliminar contraseñas + + + Passwords are not stored when connecting to a multiplayer server. Already stored passwords are deleted from the profile. + Passwörter werden beim Verbinden mit einem Mehrspielerserver nicht gespeichert. Bereits gespeicherte Passwörter werden aus dem Profil gelöscht. + Hasła nie są zapisywane podczas łączenia do serwerów. Już zapisane hasła zostaną usunięte z profilu. + Les mots de passe ne sont pas stockés lors de la connexion à un serveur multijoueur. Les mots de passe déjà enregistrés sont supprimés du profil. + Çok oyunculu bir sunucuya girerken şifreler kaydedilmez. Zaten kayıtlı olan şifreler bilgisayardan silinir. + マルチプレイヤーのサーバーへ接続時にパスワードを保存しません。既に保存されているパスワードはプロフィールから削除します。 + Quando ci si collega ad un server multiplayer, le password non verranno salvate. Non saranno usate password precedentemente salvate. + Hesla nejsou ukládána, když se připojujete k multiplayerovému serveru. Hesla, která již byla uložena, jsou smazána z profilu. + 當連線到伺服器時將不保存密碼。已有的保存密碼將會刪除。 + 当连接到服务器时将不保存密码。已保存的密码将会删除。 + Пароли не сохраняются при входе на сервера. Уже сохранённые пароли будут удалены. + Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas se eliminan del perfil. + + + Notification + Benachrichtigung + Powiadomienie + 通知 + Notifica + Upozornění + Bildirim + 通知 + 提示 + Notification + Уведомление + Notificación + + + Textual feedback to the player. + Textrückmeldung an den Spieler. + Tekstowa informacja dla gracza. + 文章でプレイヤーに通知します。 + Notifica testuale al giocatore. + Textová zpětná vazba hráči. + Yazıyla geri bildirim. + 回饋文字給玩家 + 反馈文本给玩家。 + Notification textuelle au joueur. + Текстовая информация для игрока. + Comentarios textuales para el jugador + + + Show all missions + Alle Missionen anzeigen + 全ミッションを表示 + Pokaż wszystkie misje + Mostra tutte le missioni + Ukázat všechny mise + Tüm görevleri göster + 顯示所有任務 + 显示所有任务 + Afficher toutes les missions + Показать все миссии + Mostrar todas las misiones + + + Show custom missions + Eigene Missionen anzeigen + カスタム ミッションを表示 + Pokaż własne/wgrane misje + Mostra missioni custom + Ukázat vlastní mise + Sonradan eklenen görevleri göster + 顯示目前任務 + 显示当前任务 + Afficher les missions personnalisées + Показать пользовательские миссии + Mostrar misiones personalizadas + + + Notification Lifetime + Benachrichtigung-Anzeigedauer + Doba trvání upozornění + Bildirim Süresi + 通知の表示時間 + 通知時長 + 提示显示时长 + Durée de vie des notifications + Продолжительность уведомления + Długość żywotności powiadomień + Duración de la notificación + + + Notification display duration in seconds. + Anzeigedauer der Benachrichtigungen in Sekunden. + Jak dlouho bude upozornění ukázáno (v sekundách). + Bildirim gözükme süresi (saniye olarak) + 通知が表示される時間を秒で変更できます。 + 設定通知的顯示時間（秒數）。 + 设置提示的显示时长（秒） + Durée d'affichage des notifications, en secondes. + Время в секундах, в течении которого будет видно уведомление. + Ilość czasu przez który widoczne jest powiadomienie + Duración de la visualización de notificaciones en segundos + + + Contact the server admin. + Serveradministrator benachrichtigen. + Sunucu yöneticisiyle iletişime geç. + サーバー管理者に連絡をして下さい。 + 聯絡伺服器的管理員 + 联系服务器管理员 + Contacter l'administrateur du serveur. + Уведомить администратора сервера. + Kontakt z administratorem serwera + Póngase en contacto con el administrador del servidor + Kontaktujte správce serveru. + + + Lobby Manager + Lobby Manager + Menadżer Lobby + Gestionnaire de Lobby + Gerente de lobby + 角色大廳管理 + 角色大厅管理 + Manažer lobby + + + Adjusting group order... + Reihenfolge der Gruppen wird angepasst ... + Modification de l'ordre des groupes... + Ajustar el orden del grupo... + Dostosowywanie kolejności w lobby... + 調整小隊順序 + 调整小队顺序 + Upravuji pořadí skupiny... + + + Back up mission before using this tool. + Erstelle vor Gebrauch eine Sicherungskopie. + Sauvegardez la mission avant d'utiliser cet outil. + Haga una copia de seguridad de la misión antes de usar esta herramienta + Wykonaj kopię zapasową misji przed użyciem tego narzędzia. + 使用此工具前，請備份任務。 + 使用此工具之前，请备份任务。 + Zálohujte misi před použitím tohoto nástroje. + + From 2feec12c42fa635a7cf3d13ddce2940a25a2d774 Mon Sep 17 00:00:00 2001 From: YetheSamartaka <55753928+YetheSamartaka@users.noreply.github.com> Date: Thu, 21 Apr 2022 23:19:24 +0200 Subject: [PATCH 080/111] changed tabs to spaces --- addons/ai/stringtable.xml | 110 ++-- addons/diagnostic/stringtable.xml | 258 ++++---- addons/network/stringtable.xml | 203 ++++--- addons/settings/stringtable.xml | 950 +++++++++++++++--------------- addons/strings/stringtable.xml | 88 +-- addons/ui/stringtable.xml | 596 +++++++++---------- 6 files changed, 1104 insertions(+), 1101 deletions(-) diff --git a/addons/ai/stringtable.xml b/addons/ai/stringtable.xml index ccf059dcf9..3649dd4739 100644 --- a/addons/ai/stringtable.xml +++ b/addons/ai/stringtable.xml @@ -1,64 +1,64 @@ - - - Community Base Addons - Artificial Intelligence - Community Base Addons - Künstliche Intelligenz - Community Base Addons - 人工知能 - 社群基礎模組 - 人工智能 - 社群基础模组 - AI - Community Base Addons - Искуственный Интеллект - Community Base Addons - Intelligence artificielle - Community Base Addons - Sztuczna Inteligencja - Community Base Addons - Yapay Zeka - Community Base Addons - Intelligenza Artificiale - Community Base Addons - Umělá inteligence - - - AI Building Position - KI Gebäudeposition - Poloha stavby AI - AI Bina Pozisyonu - AI の建物内での位置 - AI在建築物內位置 + + + Community Base Addons - Artificial Intelligence + Community Base Addons - Künstliche Intelligenz + Community Base Addons - 人工知能 + 社群基礎模組 - 人工智能 + 社群基础模组 - AI + Community Base Addons - Искуственный Интеллект + Community Base Addons - Intelligence artificielle + Community Base Addons - Sztuczna Inteligencja + Community Base Addons - Yapay Zeka + Community Base Addons - Intelligenza Artificiale + Community Base Addons - Umělá inteligence + + + AI Building Position + KI Gebäudeposition + Poloha stavby AI + AI Bina Pozisyonu + AI の建物内での位置 + AI在建築物內位置 AI在建筑内部位置 - Position IA bâtiment - ИИ Место строительства - Pozycja AI w budynku - - - Invisible Target Soldier - Unsichtbares Ziel - Soldat - 隱形目標（士兵） - Cible invisible - Soldat - Soldado objetivo invisible - Soldato obiettivo invisibile - Żołnierz - niewidoczny cel - Невидимая цель - солдат + Position IA bâtiment + ИИ Место строительства + Pozycja AI w budynku + + + Invisible Target Soldier + Unsichtbares Ziel - Soldat + 隱形目標（士兵） + Cible invisible - Soldat + Soldado objetivo invisible + Soldato obiettivo invisibile + Żołnierz - niewidoczny cel + Невидимая цель - солдат Neviditelný cíl (Voják) - Soldado alvo invisível - 보이지 않는 표적 병사 - 隐形目标（士兵） - 隠れた標的兵士 - Görünmez Hedef Asker - - - Invisible Target Vehicle - Unsichtbares Ziel - Fahrzeug - Cible invisible - Véhicule - Pojazd - niewidoczny cel + Soldado alvo invisível + 보이지 않는 표적 병사 + 隐形目标（士兵） + 隠れた標的兵士 + Görünmez Hedef Asker + + + Invisible Target Vehicle + Unsichtbares Ziel - Fahrzeug + Cible invisible - Véhicule + Pojazd - niewidoczny cel 隱形目標（車輛） 隐形目标（车辆） - Neviditelný cíl (Vozidlo) - - - Invisible Target Airplane - Unsichtbares Ziel - Flugzeug - Cible invisible - Avion - Samolot - niewidoczny cel + Neviditelný cíl (Vozidlo) + + + Invisible Target Airplane + Unsichtbares Ziel - Flugzeug + Cible invisible - Avion + Samolot - niewidoczny cel 隱形目標（飛機） 隐形目标（飞机） - Neviditelný cíl (Letoun) - - + Neviditelný cíl (Letoun) + + diff --git a/addons/diagnostic/stringtable.xml b/addons/diagnostic/stringtable.xml index 64a73d0fa9..9f76359b26 100644 --- a/addons/diagnostic/stringtable.xml +++ b/addons/diagnostic/stringtable.xml @@ -1,142 +1,142 @@ - - - Community Base Addons - Diagnostics - Community Base Addons - Diagnose - Community Base Addons - 診断 - 社群基礎模組 - 診斷 - 社群基础模组 - 诊断 - Community Base Addons - Диагностика - Community Base Addons - Diagnostyka - Community Base Addons - Diagnostics - Community Base Addons - Teşhis - Community Base Addons - Diagnostica - Community Base Addons - Diagnostika - Community Base Addons - Diagnósticos - - - Extended Debug Console - Erweiterte Debug-Konsole - 拡張デバッグ コンソール - 擴展除錯控制台 - 扩展除错控制台 - Расширенная Консоль Отладки - Console de débogage étendue - Rozszerzona Konsola Debugowania - Geliştirilmiş Debug Konsolu - Console debug estesa - Rozšířená ladící konzole - Consola Extendida de Depuración - - - Previous Statement - Vorheriger Ausdruck - 前のコード - 上個陳述式 - 上个陈述式 - Пред. команда - Déclaration précédente - Poprzednie polecenie - Önceki İfade - Espressione Prec. - Předchozí zpráva - Expresión Anterior - - - Next Statement - Nächster Ausdruck - 次のコード - 下個陳述式 - 下个陈述式 - След. команда - Déclaration suivante - Następne polecenie - Sonraki İfade - Espressione Succ. - Následující zpráva - Expresión Siguiente - - - Target Exec - Ziel Ausf. - 対象へ実行 - 在目標執行 - 目标执行 - На цели - Wykonaj na celu - Cible Exec - Hedefte Çalıştır - Esegui Remoto - Cílový exec - Ejecutiva de Objetivo - - - Enable Target Debugging - Ziel-Debugging aktivieren - 対象デバッキングを有効化 - 開啟目標除錯模式 - 开启目标除错模式 - Включить Отладку Цели - Włącz debugowanie na celu - Activer le débogage de la cible - Hedefte Çalıştırmayı Aktifleştir - Attiva il debug remoto - Zapnout cílové ladění - Activar Depuración de Objetivo - - - [CBA] Allows remote target debugging. Requires Debug Console. - [CBA] Erlaubt Remote-Ziel-Debugging. Benötigt Debug-Konsole. - [CBA] リモート対象デバッキングを許可します。デバッグ コンソールが必要です。 - [CBA] 允許遠程為目標進行除錯。需要開啟除錯控制台。 - [CBA] 允许远程为目标进行除错。需要开启除错控制台。 - [CBA] Разрешает отладку дистанционной цели. Требуется Консоль Отладки. - [CBA] Włącza debugowanie zdalnego celu. Konsola Debugowania musi być dostęna. - [CBA] Permet le débogage de la cible distante. Nécessite la console de débogage. - [CBA] Başka hedefte çalıştırmayı aktifleştirir. Debug konsolu gerektirir. - [CBA] Abilita il debug remoto. Richiede la console di debug. - [CBA] Povoluje ladění vzdáleného cíle. Vyžaduje ladící konzoli. - [CBA] Permite la depuración de objetivos remotos. Requiere consola de depuración. - - - Debug Console Indentation - Indentacja w konsoli debugowania - Indentation dans la console de débogage - Espaciado de la Consola de Depuración + + + Community Base Addons - Diagnostics + Community Base Addons - Diagnose + Community Base Addons - 診断 + 社群基礎模組 - 診斷 + 社群基础模组 - 诊断 + Community Base Addons - Диагностика + Community Base Addons - Diagnostyka + Community Base Addons - Diagnostics + Community Base Addons - Teşhis + Community Base Addons - Diagnostica + Community Base Addons - Diagnostika + Community Base Addons - Diagnósticos + + + Extended Debug Console + Erweiterte Debug-Konsole + 拡張デバッグ コンソール + 擴展除錯控制台 + 扩展除错控制台 + Расширенная Консоль Отладки + Console de débogage étendue + Rozszerzona Konsola Debugowania + Geliştirilmiş Debug Konsolu + Console debug estesa + Rozšířená ladící konzole + Consola Extendida de Depuración + + + Previous Statement + Vorheriger Ausdruck + 前のコード + 上個陳述式 + 上个陈述式 + Пред. команда + Déclaration précédente + Poprzednie polecenie + Önceki İfade + Espressione Prec. + Předchozí zpráva + Expresión Anterior + + + Next Statement + Nächster Ausdruck + 次のコード + 下個陳述式 + 下个陈述式 + След. команда + Déclaration suivante + Następne polecenie + Sonraki İfade + Espressione Succ. + Následující zpráva + Expresión Siguiente + + + Target Exec + Ziel Ausf. + 対象へ実行 + 在目標執行 + 目标执行 + На цели + Wykonaj na celu + Cible Exec + Hedefte Çalıştır + Esegui Remoto + Cílový exec + Ejecutiva de Objetivo + + + Enable Target Debugging + Ziel-Debugging aktivieren + 対象デバッキングを有効化 + 開啟目標除錯模式 + 开启目标除错模式 + Включить Отладку Цели + Włącz debugowanie na celu + Activer le débogage de la cible + Hedefte Çalıştırmayı Aktifleştir + Attiva il debug remoto + Zapnout cílové ladění + Activar Depuración de Objetivo + + + [CBA] Allows remote target debugging. Requires Debug Console. + [CBA] Erlaubt Remote-Ziel-Debugging. Benötigt Debug-Konsole. + [CBA] リモート対象デバッキングを許可します。デバッグ コンソールが必要です。 + [CBA] 允許遠程為目標進行除錯。需要開啟除錯控制台。 + [CBA] 允许远程为目标进行除错。需要开启除错控制台。 + [CBA] Разрешает отладку дистанционной цели. Требуется Консоль Отладки. + [CBA] Włącza debugowanie zdalnego celu. Konsola Debugowania musi być dostęna. + [CBA] Permet le débogage de la cible distante. Nécessite la console de débogage. + [CBA] Başka hedefte çalıştırmayı aktifleştirir. Debug konsolu gerektirir. + [CBA] Abilita il debug remoto. Richiede la console di debug. + [CBA] Povoluje ladění vzdáleného cíle. Vyžaduje ladící konzoli. + [CBA] Permite la depuración de objetivos remotos. Requiere consola de depuración. + + + Debug Console Indentation + Indentacja w konsoli debugowania + Indentation dans la console de débogage + Espaciado de la Consola de Depuración 調試控制台縮進 调试控制台缩进 - Odsazení ladící konzole - - - Type of indentation that can be added to expression in the debug console by pressing Tab key or removed by pressing Shift + Tab. - Rodzaj indentacji która może być dodana do wyrażenia w konsoli debugowania za pomocą klawisza Tab lub usunięta za pomocą Shift + Tab. - Type d'indentation qui peut être employée dans la console de débogage.\nTab ajoute une indentation, et Shift + Tab en supprime une. - Tipo de sangría que se puede agregar a la expresión en la consola de depuración presionando la tecla Tab o eliminar presionando Shift + Tab + Odsazení ladící konzole + + + Type of indentation that can be added to expression in the debug console by pressing Tab key or removed by pressing Shift + Tab. + Rodzaj indentacji która może być dodana do wyrażenia w konsoli debugowania za pomocą klawisza Tab lub usunięta za pomocą Shift + Tab. + Type d'indentation qui peut être employée dans la console de débogage.\nTab ajoute une indentation, et Shift + Tab en supprime une. + Tipo de sangría que se puede agregar a la expresión en la consola de depuración presionando la tecla Tab o eliminar presionando Shift + Tab 可以通過按 Tab 鍵為添加到調試控制台中的表達式縮進或通過按 Shift + Tab 鍵為其刪除縮進。 可以通过按 Tab 键为添加到调试控制台中的表达式缩进或通过按 Shift + Tab 键为其删除缩进。 - Typ odsazení, které lze přidat do výrazu v ladicí konzoli stisknutím klávesy Tab nebo odstranit stisknutím Shift + Tab. - - - Refresh rate target watcher field + Typ odsazení, které lze přidat do výrazu v ladicí konzoli stisknutím klávesy Tab nebo odstranit stisknutím Shift + Tab. + + + Refresh rate target watcher field 刷新率 刷新率 - Pole cílového sledování obnovovací frekvence - - - Refresh rate (in seconds) for the CBA target watcher fields to the right of the debug console. + Pole cílového sledování obnovovací frekvence + + + Refresh rate (in seconds) for the CBA target watcher fields to the right of the debug console. 調試控制台右側的 CBA 目標監視器字段的刷新率（以秒為單位）。 调试控制台右侧的 CBA 目标监视器字段的刷新率（以秒为单位）。 - Obnovovací frekvence (v sekundách) pro pole sledování cíle CBA napravo od konzole ladění. - - - 4 Spaces - 4 Spacje - 4 espaces - 4 Espacios + Obnovovací frekvence (v sekundách) pro pole sledování cíle CBA napravo od konzole ladění. + + + 4 Spaces + 4 Spacje + 4 espaces + 4 Espacios 4 個空格 4 个空格 - 4 mezery - - + 4 mezery + + diff --git a/addons/network/stringtable.xml b/addons/network/stringtable.xml index b9b668f7a4..3d40ba2b46 100644 --- a/addons/network/stringtable.xml +++ b/addons/network/stringtable.xml @@ -1,105 +1,104 @@ - - - CBA Network - CBA Netzwerk - CBA ネットワーク - CBA 網路 - CBA 网路 - CBA Rede - CBA Сеть - CBA Réseau - CBA Sieć - CBA Ağ - CBA Rete - CBA Síť - - - Network - Netzwerk - ネットワーク - 網路 - 网路 - Rede - Сеть - Réseau - Sieć - Ağ - Rete - Síť - - - Loadout Validation - Überprüfung von Ausrüstungen - Vérification de l'équipement - Sprawdzenie wyposażenia - 驗證加載 - 验证加载 - Ověření výbavy - - - Validate loadout of units. Fixes an issue where units appear naked after changing locality. - Überprüfe die Ausrüstung von Einheiten. Korrigiert den Fehler, bei dem Einheiten nackt sind nach einer Änderung deren Lokalität. - Vérifie l'équipement des unités. Correction d'un bug où les unités se retrouvaient nues après avoir changé de localité. - Sprawdza wyposażenie jednostek. Naprawia problem, który powodował pojawianie się jednostek nagich, przy zmianie lokalności. - 驗證單位加載。修復單位在更改大廳位置後顯示為裸體的問題。 - 验证单位加载。修复单位在更改大厅位置后显示为裸体的问题。 - Ověřovat výbavu jednotek. Opravuje problém s nahými jednotkami když mění lokálnost. - - - Never - Niemals - Jamais - Nigdy - 從不 - 从不 - Nikdy - - - Never validate loadouts - Überprüfe niemals Ausrüstungen - Ne jamais vérifier les équipements - Nigdy nie sprawdzaj wyposażenia - 從不驗證加載 - 从不验证加载 - Nikdy neověřovat výbavy - - - Playable units only - Nur spielbare Einheiten - Pour les unités jouables - Tylko grywalne jednostki - 僅可玩單位 - 仅可玩单位 - Pouze hratelné jednotky - - - Validate only loadout of playable units - Überprüfe nur die Ausrüstung von spielbaren Einheiten - Vérifier uniquement l'équipement des unités jouables - Sprawdza wyposażenie tylko jednostek oznaczonych jako grywalne - 僅驗證可玩單位的加載 - 仅验证可玩单位的加载 - Ověřovat pouze výbavu hratelných jednotek - - - All units - Alle Einheiten - Pour toutes les unités - Wszystkie jednostki - 所有單位 - 所有单位 - Všechny jednotky - - - Validate loadout of all units - Überprüfe die Ausrüstungen von allen Einheiten - Vérifier l'équipement de toutes les unités - Sprawdza wyposażenie wszystkich jednostek - 驗證所有單位的加載 - 验证所有单位的加载 - Ověřovat výbavu všech jednotek - - + + + CBA Network + CBA Netzwerk + CBA ネットワーク + CBA 網路 + CBA 网路 + CBA Rede + CBA Сеть + CBA Réseau + CBA Sieć + CBA Ağ + CBA Rete + CBA Síť + + + Network + Netzwerk + ネットワーク + 網路 + 网路 + Rede + Сеть + Réseau + Sieć + Ağ + Rete + Síť + + + Loadout Validation + Überprüfung von Ausrüstungen + Vérification de l'équipement + Sprawdzenie wyposażenia + 驗證加載 + 验证加载 + + + Validate loadout of units. Fixes an issue where units appear naked after changing locality. + Überprüfe die Ausrüstung von Einheiten. Korrigiert den Fehler, bei dem Einheiten nackt sind nach einer Änderung deren Lokalität. + Vérifie l'équipement des unités. Correction d'un bug où les unités se retrouvaient nues après avoir changé de localité. + Sprawdza wyposażenie jednostek. Naprawia problem, który powodował pojawianie się jednostek nagich, przy zmianie lokalności. + 驗證單位加載。修復單位在更改大廳位置後顯示為裸體的問題。 + 验证单位加载。修复单位在更改大厅位置后显示为裸体的问题。 + Ověřovat výbavu jednotek. Opravuje problém s nahými jednotkami když mění lokálnost. + + + Never + Niemals + Jamais + Nigdy + 從不 + 从不 + Nikdy + + + Never validate loadouts + Überprüfe niemals Ausrüstungen + Ne jamais vérifier les équipements + Nigdy nie sprawdzaj wyposażenia + 從不驗證加載 + 从不验证加载 + Nikdy neověřovat výbavu + + + Playable units only + Nur spielbare Einheiten + Pour les unités jouables + Tylko grywalne jednostki + 僅可玩單位 + 仅可玩单位 + Pouze hratelné jednotky + + + Validate only loadout of playable units + Überprüfe nur die Ausrüstung von spielbaren Einheiten + Vérifier uniquement l'équipement des unités jouables + Sprawdza wyposażenie tylko jednostek oznaczonych jako grywalne + 僅驗證可玩單位的加載 + 仅验证可玩单位的加载 + Ověřovat pouze výbavu hratelných jednotek + + + All units + Alle Einheiten + Pour toutes les unités + Wszystkie jednostki + 所有單位 + 所有单位 + Všechny jednotky + + + Validate loadout of all units + Überprüfe die Ausrüstungen von allen Einheiten + Vérifier l'équipement de toutes les unités + Sprawdza wyposażenie wszystkich jednostek + 驗證所有單位的加載 + 验证所有单位的加载 + Ověřovat výbavu všech jednotek + + diff --git a/addons/settings/stringtable.xml b/addons/settings/stringtable.xml index 31b184d699..f0c7c53f9a 100644 --- a/addons/settings/stringtable.xml +++ b/addons/settings/stringtable.xml @@ -1,478 +1,478 @@ - - - Community Base Addons - Settings - Community Base Addons - Einstellungen - Community Base Addons - 設定要素 - 社群基礎模組 - 設定組件 - 社群基础模组 - 设定组件 - Extensões de Base Comunitária - Componente das Configurações - Community Base Addons - Компонент Настроек - Community Base Addons - Komponent Ustawień - Community Base Addons - Paramètres - Community Base Addons - Ayarlar - Community Base Addons - Impostazioni - Community Base Addons - Nastavení - - - Configure Addons - Modifikationen anpassen - Konfiguracja addonów - アドオンの設定 - 模組設定 - 模组设定 - Configurar as Extensões - Настроить Дополнения - Configurer les addons - Eklenti Ayarları - Configura gli addon - Konfigurovat addony - - - Configure Base - Hauptspiel anpassen - Konfiguracja bazy - 基本設定 - 基礎設定 - 基础设定 - Configurar as Bases - Основные Настройки - Configurer la base - Oyun Ayarları - Configura il gioco base - Konfigurovat základ - - - Addon Options - Addon-Optionen - アドオン オプション - 模組設定選項 - 模组设定选项 - Opções de Extensão - Настройки Дополнений - Options des addons - Ustawienia addonów - Eklenti Ayarları - Opzioni degli addon - Možnosti addonu - - - Adjust addon settings. - Addon-Einstellungen anpassen. - Permet d'ajuster les paramètres des addons. - Zmień ustawienia addonów. - Eklenti ayarlarını değiştir. - アドオンの設定を調整します。 - Aggiusta le impostazioni per gli addon - Upravit nastavení addonu. - 調整插件設定。 - 调整插件设置。 - Отрегулировать настройки дополнений. - - - Addon Options... - Addon-Optionen... - アドオン オプション... - 模組設定選項... - 模组设定选项... - Opções ded Extensão... - Настройки Дополнений... - Ajuster les paramètres des addons... - Ustawienia addonów... - Eklenti Ayarları... - Opzioni per gli addon ... - Možnosti addonu... - - - Server - Server - サーバー - 伺服器 - 服务器 - Servidor - Сервер - Serveur - Serwer - Sunucu - Server - Server - - - Look at the server's settings. Log in as admin to change. - Server-Einstellungen ansehen. Als Admin einloggen, um zu ändern. - サーバー設定を確認します。管理者が変更すると記録します。 - 查看伺服器的設定。必須登入成管理員才能編輯設定。 - 查看服务器的设定。必须登入管理员才能编辑设定。 - Olhe as configurações dos servidores. Acesse como administrador para alterá-las. - Смотреть настройки сервера. Войдите под администратором, чтобы менять. - Permet de visualiser les paramètres du serveur. Se connecter en tant qu'administrateur pour les changer. - Zobacz ustawienia serwera. Zaloguj się jako administrator aby zmienić. - Sunucu ayarlarına bak. Değiştirmek için admin olarak giriş yapın. - Visualizza le impostazioni del server. Entra come amministratore per cambiarle. - Podívejte se na nastavení serveru. Přihlaste se jako admin pro změnu. - - - Mission - Mission - ミッション - 任務 - 任务 - Missão - Миссия - Misja - Mission - Görev - Missione - Mise - - - Look at the mission's settings. - Missionseinstellungen ansehen. - ミッションの設定を確認します。 - 查看任務的設定。 - 查看任务的设定。 - Olhe as configurações de missão. - Смотреть настройки миссии. - Permet de visualiser les paramètres de la mission. - Zobacz ustawienia misji. - Görev'in ayarlarına bak. - Visualizza le impostazioni della missione. - Podívejte se na nastavení mise. - - - Edit the mission's settings. - Missionseinstellungen bearbeiten. - ミッションの設定を編集します。 - 編輯任務的設定。 - 编辑任务的设定。 - Edite as configurações de missões. - Редактировать настройки миссии. - Editer les paramètres de la mission. - Edytuj ustawienia misji. - Görev'in ayarlarını değiştir. - Cambia le impostazioni della missione. - Upravit nastavení mise. - - - Client - Client - クライアント - 客戶端 - 客户端 - Cliente - Клиент - Klient - Client - Oyuncu - Client - Klient - - - Edit your local settings. - Lokale Einstellungen bearbeiten. - ローカル設定を編集します。 - 編輯你本地端的設定。 - 编辑你本地端的设定。 - Edite as configurações locais. - Изменить локальные настройки. - Modifier vos paramètres locaux. - Edytuj swoje lokalne ustawienia. - Yerel ayarlarınızı değiştirin. - Cambia le tue impostazioni locali. - Upravit vaše lokální nastavení. - - - Local - Lokal - ローカル - 本地端 - 本地端 - Local - Локальные настройки - Lokalne - Local - Yerel - Locale - Lokální - - - Save current settings as preset. - Derzeitige Einstellungen als Vorlage speichern. - 現在の設定をプリセットとして保存します。 - 保存當前的設定為預設。 - 保存当前的设定为预设。 - Salvar as configurações atuais como padrões. - Сохранить текущие настройки как предустановки. - Enregistrer un préréglage des paramètres actuels. - Zapisz obecne ustawienia do szablonu. - Şuanki ayaları şablon olarak kaydet. - Salva le impostazioni attuali come predefinite - Uložit nynější nastavení jako předvolbu. - - - Load settings from preset. - Einstellungen aus Vorlage laden. - プリセットから設定を読み込みます。 - 載入預設的設定。 - 载入预设的设定。 - Carregue as configurações padrão. - Загрузить настройки из предустановок. - Charger les paramètres à partir d'un préréglage. - Załaduj ustawienia z szablonu. - Şablondan ayarları yükle. - Carica le impostazioni da quelle predefinite - Načíst nastavení z předvolby. - - - Import - Import - 取り込み - 匯入 - 导入 - Importar - Импорт - Importer - Import - Import - Importa - Import - - - Import settings from clipboard. - Einstellungen aus Zwischenablage einfügen. - クリップボードから設定を取り込みします。 - 從剪貼簿匯入設定。 - 从剪贴板导入设定。 - Importar configurações da prancheta. - Импортировать настройки из буфера обмена. - Importer les paramètres depuis le presse-papier. - Import ustawień ze schowka. - Ayarları panodan çek. - Importa le impostazioni dagli appunti. - Importovat nastavení ze schránky. - - - Export - Export - 出力 - 匯出 - 导出 - Exportar - Экспорт - Exporter - Eksport - Export - Esporta - Export - - - Export settings to clipboard. - Einstellungen in Zwischenablage speichern. - クリップボードに設定を出力します。 - 匯出設定到剪貼簿。 - 导出设定到剪贴板。 - Exportar configurações para a prancheta. - Экспортировать настройки в буфер обмена. - Exporter les paramètres dans le presse-papier. - Eksport ustawień do schowka. - Ayarları panoya kopyala. - Esporta le impostazioni negli appunti. - Exportovat nastavení do schránky. - - - Reset to default value. - Zur Standardeinstellung zurücksetzen. - 標準値へ初期化します。 - 重設成預設數值。 - 重设成预设数值。 - Resetar para os valores padrões. - Сбросить на значение по умолчанию. - Réinitialiser à la valeur par défaut. - Przywróć domyślne wartości. - Varsayılan ayarlara geri dön. - Reimposta ai valori originali. - Resetovat na původní hodnotu. - - - Overwrite\nClients - Clients\nüberschreiben - ｸﾗｲｱﾝﾄ側で\n上書き - 覆寫\n客戶端 - 覆写\n客户端 - Sobrescrever \nClientes - Перезапись\nКлиент - Ecraser\nClients - Nadpisz\nKlienci - Oyunculara\nAyar Zorla - Sovrascrive\ni client - Přepsat \nClients - - - Overwrite\nMission - Mission\nüberschreiben - ﾐｯｼｮﾝ側で\n上書き - 覆寫\n任務 - 覆写\n任务 - Sobrescrever \nMissão - Перезапись\nМиссия - Ecraser\nMission - Nadpisz\nMisja - Göreve\nAyar Zorla - Sovrascrive\nla missione - Přepsat \nMission - - - Overwrite\nServer - Server\nüberschreiben - ｻｰﾊﾞｰ側で\n上書き - 覆寫\n伺服器 - 覆写\n服务器 - Sobrescrever \nServidor - Перезапись\nСервер - Ecraser\nServeur - Nadpisz\nSerwer - Sunucuya\nAyar Zorla - Sovrascrive\nil server - Přepsat \nServer - - - This setting applies. - Diese Einstellung gilt. - Ce paramètre s'applique. - To ustawienie dotyczy. - Bu ayar geçerli. - 設定を適用します。 - Prevale questa impostazione. - Toto nastavení je aktuální. - 設定已套用。 - 设置已套用。 - Этот параметр применён. - - - This setting applies after the next mission restart. - Diese Einstellung gilt nach dem nächsten Neustart der Mission. - Ce paramètre s'appliquera au prochain redémarrage de la mission. - To ustawienie zostanie zastosowanie po restarcie misji. - Bu ayar oyun baştan başladıktan sonra geçerli olur. - この設定は次のミッション開始後に適用されます。 - Questa impostazione sarà valida dopo il riavvio della missione. - Toto nastavení bude aplikováno po restartu mise. - 這個設定將會在任務重置後生效 - 该设定将在任务重启后生效。 - Этот параметр будет применён после рестарта миссии. - - - This setting is overwritten by the clients. - Diese Einstellung wird von den Clients überschrieben. - この設定はクライアントによって上書きされます。 - 此項設定被客戶端給覆寫。 - 此项设定被客户端给覆写。 - Esta configuração é sobrescrita pelos clientes. - Этот параметр перезаписан клиентом. - Ta wartość została nadpisana przez klientów. - Ce paramètre est écrasé par les clients. - Oyuncular tarafından bu ayarın üstüne yazılmış. - I client sovrascrivono questa impostazione. - Toto nastavení je přepsáno klienty. - - - This setting is overwritten by the mission. - Diese Einstellung wird von der Mission überschrieben. - この設定はミッションによって上書きされます。 - 此項設定被任務給覆寫。 - 此项设定被任务给覆写。 - Esta configuração é sobrescrita pela missão. - Этот параметр перезаписан миссией. - Ta wartośc została nadpisana przez misję. - Ce paramètre est écrasé par la mission. - Görev tarafından bu ayarın üstüne yazılmış. - La missione sovrascrive questa impostazione. - Toto nastavení je přepsáno misí. - - - This setting is overwritten by the server. - Diese Einstellung wird vom Server überschrieben. - この設定はサーバーによって上書きされます。 - 此項設定被伺服器給覆寫。 - 此项设定被服务器给覆写。 - Esta configuração é sobrescrita pelo servidor. - Этот параметр перезаписан сервером. - Ta wartość została nadpisana przez serwer. - Ce paramètre est écrasé par le serveur. - Sunucu tarafından bu ayarın üstüne yazılmış. - Il server sovrascrive questa impostazione. - Toto nastavení je přepsáno serverem. - - - This setting is overwritten by the clients and only applies to the server. - Diese Einstellung wird von den Clients überschrieben und betrifft nur den Server. - この設定はクライアントによって上書きされ、サーバーにのみ適用されます。 - 此項設定被客戶端給覆寫並僅適用於伺服器。 - 此项设定被客户端给覆写并仅适用于服务器。 - Esta configuração é sobrescrita pelos clientes e é apenas aplicada no servidor. - Этот параметр перезаписан клиентом и применяется исключительно к серверу. - Ta wartość została nadpisana przez klientów i ma zastosowanie tylko na serwerze. - Ce paramètre est écrasé par les clients et ne s'applique qu'au serveur. - Oyuncular tarafından bu ayarın üstüne yazılmış, ayar sadece sunucuda geçerli. - Questa impostazione è sovrascritta dai client e si applica solo al server. - Toto nastavení je přepsáno klienty a platí pouze na serveru. - - - Overwritten by client with the same value. - Mit gleichem Wert durch Client überschrieben. - Nadpisane przez klienta z taką samą wartością. - Écrasé par le client, avec la même valeur. - Перезаписано клиентом с таким же значением. - 被客戶端以相同的值覆蓋。 - 被客户端以相同的值覆盖。 - Toto nastavení je přepsáno klienty stejnou hodnotou. - - - Overwritten by mission with the same value. - Mit gleichem Wert durch Mission überschrieben. - Nadpisane przez misję z taką samą wartością. - Écrasé par la mission, avec la même valeur. - Перезаписано миссией с таким же значением. - 被任務以相同的值覆蓋。 - 被任务以相同的值覆盖。 - Toto nastavení je přepsáno misí stejnou hodnotou. - - - Overwritten by server with the same value. - Mit gleichem Wert durch Server überschrieben. - Nadpisane przez serwer z taką samą wartością. - Écrasé par le serveur, avec la même valeur. - Перезаписано сервером с таким же значением. - 被伺服器以相同的值覆蓋。 - 被服务器以相同的值覆盖。 - Toto nastavení je přepsáno serverem stejnou hodnotou. - - - Copy to clipboard - In Zwischenablage - Скопировать в буфер обмена - 複製到剪貼簿 - 复制到剪贴板 - クリップボードへコピー - Copier - Skopiuj do schowka - Panoya kopyala - Copia negli appunti - Kopírovat do schránky - - - Show default values: - Zeige Standardeinstellungen: - Показать настройки по умолчанию: - 顯示預設值: - 显示预设值: - 標準値を表示: - Afficher les valeurs par défaut: - Pokaż domyślnę wartości: - Varsayılan değerleri göster: - Mostra i valori originali: - Ukázat původní hodnoty: - - + + + Community Base Addons - Settings + Community Base Addons - Einstellungen + Community Base Addons - 設定要素 + 社群基礎模組 - 設定組件 + 社群基础模组 - 设定组件 + Extensões de Base Comunitária - Componente das Configurações + Community Base Addons - Компонент Настроек + Community Base Addons - Komponent Ustawień + Community Base Addons - Paramètres + Community Base Addons - Ayarlar + Community Base Addons - Impostazioni + Community Base Addons - Nastavení + + + Configure Addons + Modifikationen anpassen + Konfiguracja addonów + アドオンの設定 + 模組設定 + 模组设定 + Configurar as Extensões + Настроить Дополнения + Configurer les addons + Eklenti Ayarları + Configura gli addon + Konfigurovat addony + + + Configure Base + Hauptspiel anpassen + Konfiguracja bazy + 基本設定 + 基礎設定 + 基础设定 + Configurar as Bases + Основные Настройки + Configurer la base + Oyun Ayarları + Configura il gioco base + Konfigurovat základ + + + Addon Options + Addon-Optionen + アドオン オプション + 模組設定選項 + 模组设定选项 + Opções de Extensão + Настройки Дополнений + Options des addons + Ustawienia addonów + Eklenti Ayarları + Opzioni degli addon + Možnosti addonu + + + Adjust addon settings. + Addon-Einstellungen anpassen. + Permet d'ajuster les paramètres des addons. + Zmień ustawienia addonów. + Eklenti ayarlarını değiştir. + アドオンの設定を調整します。 + Aggiusta le impostazioni per gli addon + Upravit nastavení addonu. + 調整插件設定。 + 调整插件设置。 + Отрегулировать настройки дополнений. + + + Addon Options... + Addon-Optionen... + アドオン オプション... + 模組設定選項... + 模组设定选项... + Opções ded Extensão... + Настройки Дополнений... + Ajuster les paramètres des addons... + Ustawienia addonów... + Eklenti Ayarları... + Opzioni per gli addon ... + Možnosti addonu... + + + Server + Server + サーバー + 伺服器 + 服务器 + Servidor + Сервер + Serveur + Serwer + Sunucu + Server + Server + + + Look at the server's settings. Log in as admin to change. + Server-Einstellungen ansehen. Als Admin einloggen, um zu ändern. + サーバー設定を確認します。管理者が変更すると記録します。 + 查看伺服器的設定。必須登入成管理員才能編輯設定。 + 查看服务器的设定。必须登入管理员才能编辑设定。 + Olhe as configurações dos servidores. Acesse como administrador para alterá-las. + Смотреть настройки сервера. Войдите под администратором, чтобы менять. + Permet de visualiser les paramètres du serveur. Se connecter en tant qu'administrateur pour les changer. + Zobacz ustawienia serwera. Zaloguj się jako administrator aby zmienić. + Sunucu ayarlarına bak. Değiştirmek için admin olarak giriş yapın. + Visualizza le impostazioni del server. Entra come amministratore per cambiarle. + Podívejte se na nastavení serveru. Přihlaste se jako admin pro změnu. + + + Mission + Mission + ミッション + 任務 + 任务 + Missão + Миссия + Misja + Mission + Görev + Missione + Mise + + + Look at the mission's settings. + Missionseinstellungen ansehen. + ミッションの設定を確認します。 + 查看任務的設定。 + 查看任务的设定。 + Olhe as configurações de missão. + Смотреть настройки миссии. + Permet de visualiser les paramètres de la mission. + Zobacz ustawienia misji. + Görev'in ayarlarına bak. + Visualizza le impostazioni della missione. + Podívejte se na nastavení mise. + + + Edit the mission's settings. + Missionseinstellungen bearbeiten. + ミッションの設定を編集します。 + 編輯任務的設定。 + 编辑任务的设定。 + Edite as configurações de missões. + Редактировать настройки миссии. + Editer les paramètres de la mission. + Edytuj ustawienia misji. + Görev'in ayarlarını değiştir. + Cambia le impostazioni della missione. + Upravit nastavení mise. + + + Client + Client + クライアント + 客戶端 + 客户端 + Cliente + Клиент + Klient + Client + Oyuncu + Client + Klient + + + Edit your local settings. + Lokale Einstellungen bearbeiten. + ローカル設定を編集します。 + 編輯你本地端的設定。 + 编辑你本地端的设定。 + Edite as configurações locais. + Изменить локальные настройки. + Modifier vos paramètres locaux. + Edytuj swoje lokalne ustawienia. + Yerel ayarlarınızı değiştirin. + Cambia le tue impostazioni locali. + Upravit vaše lokální nastavení. + + + Local + Lokal + ローカル + 本地端 + 本地端 + Local + Локальные настройки + Lokalne + Local + Yerel + Locale + Lokální + + + Save current settings as preset. + Derzeitige Einstellungen als Vorlage speichern. + 現在の設定をプリセットとして保存します。 + 保存當前的設定為預設。 + 保存当前的设定为预设。 + Salvar as configurações atuais como padrões. + Сохранить текущие настройки как предустановки. + Enregistrer un préréglage des paramètres actuels. + Zapisz obecne ustawienia do szablonu. + Şuanki ayaları şablon olarak kaydet. + Salva le impostazioni attuali come predefinite + Uložit nynější nastavení jako předvolbu. + + + Load settings from preset. + Einstellungen aus Vorlage laden. + プリセットから設定を読み込みます。 + 載入預設的設定。 + 载入预设的设定。 + Carregue as configurações padrão. + Загрузить настройки из предустановок. + Charger les paramètres à partir d'un préréglage. + Załaduj ustawienia z szablonu. + Şablondan ayarları yükle. + Carica le impostazioni da quelle predefinite + Načíst nastavení z předvolby. + + + Import + Import + 取り込み + 匯入 + 导入 + Importar + Импорт + Importer + Import + Import + Importa + Import + + + Import settings from clipboard. + Einstellungen aus Zwischenablage einfügen. + クリップボードから設定を取り込みします。 + 從剪貼簿匯入設定。 + 从剪贴板导入设定。 + Importar configurações da prancheta. + Импортировать настройки из буфера обмена. + Importer les paramètres depuis le presse-papier. + Import ustawień ze schowka. + Ayarları panodan çek. + Importa le impostazioni dagli appunti. + Importovat nastavení ze schránky. + + + Export + Export + 出力 + 匯出 + 导出 + Exportar + Экспорт + Exporter + Eksport + Export + Esporta + Export + + + Export settings to clipboard. + Einstellungen in Zwischenablage speichern. + クリップボードに設定を出力します。 + 匯出設定到剪貼簿。 + 导出设定到剪贴板。 + Exportar configurações para a prancheta. + Экспортировать настройки в буфер обмена. + Exporter les paramètres dans le presse-papier. + Eksport ustawień do schowka. + Ayarları panoya kopyala. + Esporta le impostazioni negli appunti. + Exportovat nastavení do schránky. + + + Reset to default value. + Zur Standardeinstellung zurücksetzen. + 標準値へ初期化します。 + 重設成預設數值。 + 重设成预设数值。 + Resetar para os valores padrões. + Сбросить на значение по умолчанию. + Réinitialiser à la valeur par défaut. + Przywróć domyślne wartości. + Varsayılan ayarlara geri dön. + Reimposta ai valori originali. + Resetovat na původní hodnotu. + + + Overwrite\nClients + Clients\nüberschreiben + ｸﾗｲｱﾝﾄ側で\n上書き + 覆寫\n客戶端 + 覆写\n客户端 + Sobrescrever \nClientes + Перезапись\nКлиент + Ecraser\nClients + Nadpisz\nKlienci + Oyunculara\nAyar Zorla + Sovrascrive\ni client + Přepsat \nClients + + + Overwrite\nMission + Mission\nüberschreiben + ﾐｯｼｮﾝ側で\n上書き + 覆寫\n任務 + 覆写\n任务 + Sobrescrever \nMissão + Перезапись\nМиссия + Ecraser\nMission + Nadpisz\nMisja + Göreve\nAyar Zorla + Sovrascrive\nla missione + Přepsat \nMission + + + Overwrite\nServer + Server\nüberschreiben + ｻｰﾊﾞｰ側で\n上書き + 覆寫\n伺服器 + 覆写\n服务器 + Sobrescrever \nServidor + Перезапись\nСервер + Ecraser\nServeur + Nadpisz\nSerwer + Sunucuya\nAyar Zorla + Sovrascrive\nil server + Přepsat \nServer + + + This setting applies. + Diese Einstellung gilt. + Ce paramètre s'applique. + To ustawienie dotyczy. + Bu ayar geçerli. + 設定を適用します。 + Prevale questa impostazione. + Toto nastavení je aktuální. + 設定已套用。 + 设置已套用。 + Этот параметр применён. + + + This setting applies after the next mission restart. + Diese Einstellung gilt nach dem nächsten Neustart der Mission. + Ce paramètre s'appliquera au prochain redémarrage de la mission. + To ustawienie zostanie zastosowanie po restarcie misji. + Bu ayar oyun baştan başladıktan sonra geçerli olur. + この設定は次のミッション開始後に適用されます。 + Questa impostazione sarà valida dopo il riavvio della missione. + Toto nastavení bude aplikováno po restartu mise. + 這個設定將會在任務重置後生效 + 该设定将在任务重启后生效。 + Этот параметр будет применён после рестарта миссии. + + + This setting is overwritten by the clients. + Diese Einstellung wird von den Clients überschrieben. + この設定はクライアントによって上書きされます。 + 此項設定被客戶端給覆寫。 + 此项设定被客户端给覆写。 + Esta configuração é sobrescrita pelos clientes. + Этот параметр перезаписан клиентом. + Ta wartość została nadpisana przez klientów. + Ce paramètre est écrasé par les clients. + Oyuncular tarafından bu ayarın üstüne yazılmış. + I client sovrascrivono questa impostazione. + Toto nastavení je přepsáno klienty. + + + This setting is overwritten by the mission. + Diese Einstellung wird von der Mission überschrieben. + この設定はミッションによって上書きされます。 + 此項設定被任務給覆寫。 + 此项设定被任务给覆写。 + Esta configuração é sobrescrita pela missão. + Этот параметр перезаписан миссией. + Ta wartośc została nadpisana przez misję. + Ce paramètre est écrasé par la mission. + Görev tarafından bu ayarın üstüne yazılmış. + La missione sovrascrive questa impostazione. + Toto nastavení je přepsáno misí. + + + This setting is overwritten by the server. + Diese Einstellung wird vom Server überschrieben. + この設定はサーバーによって上書きされます。 + 此項設定被伺服器給覆寫。 + 此项设定被服务器给覆写。 + Esta configuração é sobrescrita pelo servidor. + Этот параметр перезаписан сервером. + Ta wartość została nadpisana przez serwer. + Ce paramètre est écrasé par le serveur. + Sunucu tarafından bu ayarın üstüne yazılmış. + Il server sovrascrive questa impostazione. + Toto nastavení je přepsáno serverem. + + + This setting is overwritten by the clients and only applies to the server. + Diese Einstellung wird von den Clients überschrieben und betrifft nur den Server. + この設定はクライアントによって上書きされ、サーバーにのみ適用されます。 + 此項設定被客戶端給覆寫並僅適用於伺服器。 + 此项设定被客户端给覆写并仅适用于服务器。 + Esta configuração é sobrescrita pelos clientes e é apenas aplicada no servidor. + Этот параметр перезаписан клиентом и применяется исключительно к серверу. + Ta wartość została nadpisana przez klientów i ma zastosowanie tylko na serwerze. + Ce paramètre est écrasé par les clients et ne s'applique qu'au serveur. + Oyuncular tarafından bu ayarın üstüne yazılmış, ayar sadece sunucuda geçerli. + Questa impostazione è sovrascritta dai client e si applica solo al server. + Toto nastavení je přepsáno klienty a platí pouze na serveru. + + + Overwritten by client with the same value. + Mit gleichem Wert durch Client überschrieben. + Nadpisane przez klienta z taką samą wartością. + Écrasé par le client, avec la même valeur. + Перезаписано клиентом с таким же значением. + 被客戶端以相同的值覆蓋。 + 被客户端以相同的值覆盖。 + Toto nastavení je přepsáno klienty stejnou hodnotou. + + + Overwritten by mission with the same value. + Mit gleichem Wert durch Mission überschrieben. + Nadpisane przez misję z taką samą wartością. + Écrasé par la mission, avec la même valeur. + Перезаписано миссией с таким же значением. + 被任務以相同的值覆蓋。 + 被任务以相同的值覆盖。 + Toto nastavení je přepsáno misí stejnou hodnotou. + + + Overwritten by server with the same value. + Mit gleichem Wert durch Server überschrieben. + Nadpisane przez serwer z taką samą wartością. + Écrasé par le serveur, avec la même valeur. + Перезаписано сервером с таким же значением. + 被伺服器以相同的值覆蓋。 + 被服务器以相同的值覆盖。 + Toto nastavení je přepsáno serverem stejnou hodnotou. + + + Copy to clipboard + In Zwischenablage + Скопировать в буфер обмена + 複製到剪貼簿 + 复制到剪贴板 + クリップボードへコピー + Copier + Skopiuj do schowka + Panoya kopyala + Copia negli appunti + Kopírovat do schránky + + + Show default values: + Zeige Standardeinstellungen: + Показать настройки по умолчанию: + 顯示預設值: + 显示预设值: + 標準値を表示: + Afficher les valeurs par défaut: + Pokaż domyślnę wartości: + Varsayılan değerleri göster: + Mostra i valori originali: + Ukázat původní hodnoty: + + diff --git a/addons/strings/stringtable.xml b/addons/strings/stringtable.xml index 73db7b03a7..5677ad0e1a 100644 --- a/addons/strings/stringtable.xml +++ b/addons/strings/stringtable.xml @@ -1,45 +1,49 @@ - - - Community Base Addons - Strings - Community Base Addons - Zeichenketten - Community Base Addons - ストリングス - 社群基礎模組 - 字串 - 社群基础模组 - 字串 - Extensões de Base Comunitária - Palavras - Community Base Addons - Строки - Community Base Addons - Ciągi znaków - Community Base Addons - Textes - Community Base Addons - Yazılar - Community Base Addons - Stringhe - Community Base Addons - Texty - - - . - , - , - , - , - , - , - , - , - . - . - , - , - - - , - . - . - , - , - , - , - . - . - - + + + Community Base Addons - Strings + Community Base Addons - Zeichenketten + Community Base Addons - ストリングス + 社群基礎模組 - 字串 + 社群基础模组 - 字串 + Extensões de Base Comunitária - Palavras + Community Base Addons - Строки + Community Base Addons - Ciągi znaków + Community Base Addons - Textes + Community Base Addons - Yazılar + Community Base Addons - Stringhe + Community Base Addons - Texty + + + . + , + , + , + , + , + , + , + , + . + . + , + , + + + , + + . + + + + + , + , + , + , + . + . + + diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index 0bfebb29d3..9c0feb21fa 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -1,301 +1,301 @@ - - - Community Base Addons - User Interface - Community Base Addons - Benutzeroberfläche - Community Base Addons - ユーザー インターフェイス - 社群基礎模組 - 使用者介面 - 社群基础模组 - 玩家界面 - Extensões de Base Comunitária - Interface ao Usuário - Community Base Addons - Пользовательский Интерфейс - Community Base Addons - Interface utilisateur - Community Base Addons - Interfejs Użytkownika - Community Base Addons - Kullanıcı Arayüzü - Community Base Addons - Interfaccia utente - Community Base Addons - Uživatelské prostředí - Community Base Addons - Interfaz de usuario - - - User Interface - Uživatelské rozhraní - Interface do usuário - Interface Utilisateur - Интерфейс - ユーザ インタフェイス - Interfejs użytkownika - Benutzeroberfläche - 사용자 인터페이스 - Interfaccia Utente - 使用者介面 - 玩家界面 - Interfaz de usuario - Kullanıcı Arayüzü - - - Progress Bar - Fortschrittsanzeige - プログレス バー - Barre de progression - 進度條 - 进度条 - Pasek postępu - Yükleme Çubuğu - Barra di avanzamento - Ukazatel průběhu - Индикатор выполнения - Barra de progreso - - - Position of the progress bar. - Position der Fortschrittsanzeige. - プログレス バーの位置。 - Position de la barre de progression. - 進度條的位置。 - 进度条位置。 - Pozycja paska postępu. - Yükleme çubuğunun konumu. - Posizione della barra di avanzamento - Pozici ukazatele průběhu. - Позиция индикатора выполнения. - Posición de la barra de progreso. - - - Store Server Passwords - Serverpasswörter speichern - Zapamiętuj hasła serwerów - Enregistrer les mots de passe serveur - Sunucu şifrelerini kaydet - サーバーのパスワードを保存 - Salva le password per i server - Ukládat hesla serveru - 儲存伺服器密碼 - 存储服务器密码 - Запоминать пароли серверов - Almacenar contraseñas del servidor - - - Setting to store the passwords entered when connecting to a multiplayer server. - Einstellung zum Speichern der beim Betreten eines Mehrspielerservers eingegebenen Passwörter. - Opcja zapamiętywania wprowadzonych haseł do serwerów. - Paramètre permettant de stocker les mots de passe saisis lors de la connexion à un serveur multijoueur. - Çok oyunculu bir sunucuya bağlanırken girilen şifreleri kaydetme ayarı. - マルチプレイヤーのサーバーへ接続時に入力されたパスワードの保存設定を行います。 - Impostazione per salvare le password immesse quando ci si collega a server multiplayer. - Uloží zadané heslo, když se připojujete k multiplayerovému serveru. - 設定是否當連線到伺服器時儲存密碼 - 设置是否存储连接服务器时输入的密码。 - Параметр запоминания паролей сервера при входе на них. - Configuración para almacenar las contraseñas ingresadas al conectarse a un servidor multijugador. - - - Save passwords - Passwörter speichern - Zapisuj hasła - Sauvegarder les mots de passe - Şifreleri kaydet - パスワードを保存 - Salva le password - Ukládat hesla - 記住密碼 - 记住密码 - Сохранять пароли - Guardar contraseñas - - - Passwords are stored when connecting to a multiplayer server. - Passwörter werden beim Verbinden mit einem Mehrspielerserver gespeichert. - Hasła są zapisywane podczas łaczenia do serwerów. - Les mots de passe sont stockés lors de la connexion à un serveur multijoueur. - Çok oyunculu bir sunucuya girerken şifreler kaydedilir. - マルチプレイヤーのサーバーへ接続時にパスワードを保存します。 - Quando ci si connette ad un server multiplayer, le password verranno salvate. - Hesla jsou uložena, když se připojujete k multiplayerovému serveru. - 連線到伺服器時將記住密碼 - 连接到服务器时将记住密码 - Пароли будут сохраняться при входе на сервера. - Las contraseñas se almacenan cuando se conecta a un servidor multijugador - - - Do not save passwords - Passwörter nicht speichern - Nie zapisuj haseł - Ne pas sauvegarder les mots de passe - Şifreleri kaydetme - パスワードを保存しない - Non salvare le password - Neukládat hesla - 不保存密碼 - 不保存密码 - Не сохранять пароли - No guarde las contraseñas - - - Passwords are not stored when connecting to a multiplayer server. Already stored passwords will not be automatically entered. - Passwörter werden beim Verbinden mit einem Mehrspielerserver nicht gespeichert. Bereits gespeicherte Passwörter werden nicht automatisch eingegeben. - Hasła nie są zapisywane podczas łączenia do serwerów. Już zapisane hasła nie bedą wykorzystywane. - Les mots de passe ne sont pas stockés lors de la connexion à un serveur multijoueur. Les mots de passe déjà enregistrés ne seront pas automatiquement entrés. - Çok oyunculu bir sunucuya girerken şifreler kaydedilmez. Zaten kayıtlı olan şifreler otomatik olarak doldurulmaz. - マルチプレイヤーのサーバーへ接続時にパスワードを保存しません。既に保存されているパスワードも自動的に入力されません。 - Quando ci si collega ad un server multiplayer, le password non verranno salvate. Le password precedentemente salvate non verranno immesse automaticamente. - Hesla nejsou ukládána, když se připojujete k multiplayerovému serveru. Hesla, která již byla uložena, nebudou automaticky zadávána. - 當連線到伺服器時將不保存密碼。已有的保存密碼將不會自動填入。 - 当连接到服务器时将不保存密码。已保存的密码将不自动填写。 - Пароли не сохраняются при входе на сервера. Уже сохранённые пароли не будут автоматически вставлены. - Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas no se ingresarán automáticamente. - - - Delete passwords - Passwörter löschen - Usuń hasła - Supprimer les mots de passe - Şifreleri sil - パスワードを削除 - Cancella le password - Smazat hesla - 刪除密碼 - 删除密码 - Удалить пароли - Eliminar contraseñas - - - Passwords are not stored when connecting to a multiplayer server. Already stored passwords are deleted from the profile. - Passwörter werden beim Verbinden mit einem Mehrspielerserver nicht gespeichert. Bereits gespeicherte Passwörter werden aus dem Profil gelöscht. - Hasła nie są zapisywane podczas łączenia do serwerów. Już zapisane hasła zostaną usunięte z profilu. - Les mots de passe ne sont pas stockés lors de la connexion à un serveur multijoueur. Les mots de passe déjà enregistrés sont supprimés du profil. - Çok oyunculu bir sunucuya girerken şifreler kaydedilmez. Zaten kayıtlı olan şifreler bilgisayardan silinir. - マルチプレイヤーのサーバーへ接続時にパスワードを保存しません。既に保存されているパスワードはプロフィールから削除します。 - Quando ci si collega ad un server multiplayer, le password non verranno salvate. Non saranno usate password precedentemente salvate. - Hesla nejsou ukládána, když se připojujete k multiplayerovému serveru. Hesla, která již byla uložena, jsou smazána z profilu. - 當連線到伺服器時將不保存密碼。已有的保存密碼將會刪除。 - 当连接到服务器时将不保存密码。已保存的密码将会删除。 - Пароли не сохраняются при входе на сервера. Уже сохранённые пароли будут удалены. - Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas se eliminan del perfil. - - - Notification - Benachrichtigung - Powiadomienie - 通知 - Notifica - Upozornění - Bildirim - 通知 - 提示 - Notification - Уведомление - Notificación - - - Textual feedback to the player. - Textrückmeldung an den Spieler. - Tekstowa informacja dla gracza. - 文章でプレイヤーに通知します。 - Notifica testuale al giocatore. - Textová zpětná vazba hráči. - Yazıyla geri bildirim. - 回饋文字給玩家 - 反馈文本给玩家。 - Notification textuelle au joueur. - Текстовая информация для игрока. - Comentarios textuales para el jugador - - - Show all missions - Alle Missionen anzeigen - 全ミッションを表示 - Pokaż wszystkie misje - Mostra tutte le missioni - Ukázat všechny mise - Tüm görevleri göster - 顯示所有任務 - 显示所有任务 - Afficher toutes les missions - Показать все миссии - Mostrar todas las misiones - - - Show custom missions - Eigene Missionen anzeigen - カスタム ミッションを表示 - Pokaż własne/wgrane misje - Mostra missioni custom - Ukázat vlastní mise - Sonradan eklenen görevleri göster - 顯示目前任務 - 显示当前任务 - Afficher les missions personnalisées - Показать пользовательские миссии - Mostrar misiones personalizadas - - - Notification Lifetime - Benachrichtigung-Anzeigedauer - Doba trvání upozornění - Bildirim Süresi - 通知の表示時間 - 通知時長 - 提示显示时长 - Durée de vie des notifications - Продолжительность уведомления - Długość żywotności powiadomień - Duración de la notificación - - - Notification display duration in seconds. - Anzeigedauer der Benachrichtigungen in Sekunden. - Jak dlouho bude upozornění ukázáno (v sekundách). - Bildirim gözükme süresi (saniye olarak) - 通知が表示される時間を秒で変更できます。 - 設定通知的顯示時間（秒數）。 - 设置提示的显示时长（秒） - Durée d'affichage des notifications, en secondes. - Время в секундах, в течении которого будет видно уведомление. - Ilość czasu przez który widoczne jest powiadomienie - Duración de la visualización de notificaciones en segundos - - - Contact the server admin. - Serveradministrator benachrichtigen. - Sunucu yöneticisiyle iletişime geç. - サーバー管理者に連絡をして下さい。 - 聯絡伺服器的管理員 - 联系服务器管理员 - Contacter l'administrateur du serveur. - Уведомить администратора сервера. - Kontakt z administratorem serwera - Póngase en contacto con el administrador del servidor - Kontaktujte správce serveru. - - - Lobby Manager - Lobby Manager - Menadżer Lobby - Gestionnaire de Lobby - Gerente de lobby - 角色大廳管理 - 角色大厅管理 - Manažer lobby - - - Adjusting group order... - Reihenfolge der Gruppen wird angepasst ... - Modification de l'ordre des groupes... - Ajustar el orden del grupo... - Dostosowywanie kolejności w lobby... - 調整小隊順序 - 调整小队顺序 - Upravuji pořadí skupiny... - - - Back up mission before using this tool. - Erstelle vor Gebrauch eine Sicherungskopie. - Sauvegardez la mission avant d'utiliser cet outil. - Haga una copia de seguridad de la misión antes de usar esta herramienta - Wykonaj kopię zapasową misji przed użyciem tego narzędzia. - 使用此工具前，請備份任務。 - 使用此工具之前，请备份任务。 - Zálohujte misi před použitím tohoto nástroje. - - + + + Community Base Addons - User Interface + Community Base Addons - Benutzeroberfläche + Community Base Addons - ユーザー インターフェイス + 社群基礎模組 - 使用者介面 + 社群基础模组 - 玩家界面 + Extensões de Base Comunitária - Interface ao Usuário + Community Base Addons - Пользовательский Интерфейс + Community Base Addons - Interface utilisateur + Community Base Addons - Interfejs Użytkownika + Community Base Addons - Kullanıcı Arayüzü + Community Base Addons - Interfaccia utente + Community Base Addons - Uživatelské prostředí + Community Base Addons - Interfaz de usuario + + + User Interface + Uživatelské rozhraní + Interface do usuário + Interface Utilisateur + Интерфейс + ユーザ インタフェイス + Interfejs użytkownika + Benutzeroberfläche + 사용자 인터페이스 + Interfaccia Utente + 使用者介面 + 玩家界面 + Interfaz de usuario + Kullanıcı Arayüzü + + + Progress Bar + Fortschrittsanzeige + プログレス バー + Barre de progression + 進度條 + 进度条 + Pasek postępu + Yükleme Çubuğu + Barra di avanzamento + Ukazatel průběhu + Индикатор выполнения + Barra de progreso + + + Position of the progress bar. + Position der Fortschrittsanzeige. + プログレス バーの位置。 + Position de la barre de progression. + 進度條的位置。 + 进度条位置。 + Pozycja paska postępu. + Yükleme çubuğunun konumu. + Posizione della barra di avanzamento + Pozici ukazatele průběhu. + Позиция индикатора выполнения. + Posición de la barra de progreso. + + + Store Server Passwords + Serverpasswörter speichern + Zapamiętuj hasła serwerów + Enregistrer les mots de passe serveur + Sunucu şifrelerini kaydet + サーバーのパスワードを保存 + Salva le password per i server + Ukládat hesla serveru + 儲存伺服器密碼 + 存储服务器密码 + Запоминать пароли серверов + Almacenar contraseñas del servidor + + + Setting to store the passwords entered when connecting to a multiplayer server. + Einstellung zum Speichern der beim Betreten eines Mehrspielerservers eingegebenen Passwörter. + Opcja zapamiętywania wprowadzonych haseł do serwerów. + Paramètre permettant de stocker les mots de passe saisis lors de la connexion à un serveur multijoueur. + Çok oyunculu bir sunucuya bağlanırken girilen şifreleri kaydetme ayarı. + マルチプレイヤーのサーバーへ接続時に入力されたパスワードの保存設定を行います。 + Impostazione per salvare le password immesse quando ci si collega a server multiplayer. + Uloží zadané heslo, když se připojujete k multiplayerovému serveru. + 設定是否當連線到伺服器時儲存密碼 + 设置是否存储连接服务器时输入的密码。 + Параметр запоминания паролей сервера при входе на них. + Configuración para almacenar las contraseñas ingresadas al conectarse a un servidor multijugador. + + + Save passwords + Passwörter speichern + Zapisuj hasła + Sauvegarder les mots de passe + Şifreleri kaydet + パスワードを保存 + Salva le password + Ukládat hesla + 記住密碼 + 记住密码 + Сохранять пароли + Guardar contraseñas + + + Passwords are stored when connecting to a multiplayer server. + Passwörter werden beim Verbinden mit einem Mehrspielerserver gespeichert. + Hasła są zapisywane podczas łaczenia do serwerów. + Les mots de passe sont stockés lors de la connexion à un serveur multijoueur. + Çok oyunculu bir sunucuya girerken şifreler kaydedilir. + マルチプレイヤーのサーバーへ接続時にパスワードを保存します。 + Quando ci si connette ad un server multiplayer, le password verranno salvate. + Hesla jsou uložena, když se připojujete k multiplayerovému serveru. + 連線到伺服器時將記住密碼 + 连接到服务器时将记住密码 + Пароли будут сохраняться при входе на сервера. + Las contraseñas se almacenan cuando se conecta a un servidor multijugador + + + Do not save passwords + Passwörter nicht speichern + Nie zapisuj haseł + Ne pas sauvegarder les mots de passe + Şifreleri kaydetme + パスワードを保存しない + Non salvare le password + Neukládat hesla + 不保存密碼 + 不保存密码 + Не сохранять пароли + No guarde las contraseñas + + + Passwords are not stored when connecting to a multiplayer server. Already stored passwords will not be automatically entered. + Passwörter werden beim Verbinden mit einem Mehrspielerserver nicht gespeichert. Bereits gespeicherte Passwörter werden nicht automatisch eingegeben. + Hasła nie są zapisywane podczas łączenia do serwerów. Już zapisane hasła nie bedą wykorzystywane. + Les mots de passe ne sont pas stockés lors de la connexion à un serveur multijoueur. Les mots de passe déjà enregistrés ne seront pas automatiquement entrés. + Çok oyunculu bir sunucuya girerken şifreler kaydedilmez. Zaten kayıtlı olan şifreler otomatik olarak doldurulmaz. + マルチプレイヤーのサーバーへ接続時にパスワードを保存しません。既に保存されているパスワードも自動的に入力されません。 + Quando ci si collega ad un server multiplayer, le password non verranno salvate. Le password precedentemente salvate non verranno immesse automaticamente. + Hesla nejsou ukládána, když se připojujete k multiplayerovému serveru. Hesla, která již byla uložena, nebudou automaticky zadávána. + 當連線到伺服器時將不保存密碼。已有的保存密碼將不會自動填入。 + 当连接到服务器时将不保存密码。已保存的密码将不自动填写。 + Пароли не сохраняются при входе на сервера. Уже сохранённые пароли не будут автоматически вставлены. + Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas no se ingresarán automáticamente. + + + Delete passwords + Passwörter löschen + Usuń hasła + Supprimer les mots de passe + Şifreleri sil + パスワードを削除 + Cancella le password + Smazat hesla + 刪除密碼 + 删除密码 + Удалить пароли + Eliminar contraseñas + + + Passwords are not stored when connecting to a multiplayer server. Already stored passwords are deleted from the profile. + Passwörter werden beim Verbinden mit einem Mehrspielerserver nicht gespeichert. Bereits gespeicherte Passwörter werden aus dem Profil gelöscht. + Hasła nie są zapisywane podczas łączenia do serwerów. Już zapisane hasła zostaną usunięte z profilu. + Les mots de passe ne sont pas stockés lors de la connexion à un serveur multijoueur. Les mots de passe déjà enregistrés sont supprimés du profil. + Çok oyunculu bir sunucuya girerken şifreler kaydedilmez. Zaten kayıtlı olan şifreler bilgisayardan silinir. + マルチプレイヤーのサーバーへ接続時にパスワードを保存しません。既に保存されているパスワードはプロフィールから削除します。 + Quando ci si collega ad un server multiplayer, le password non verranno salvate. Non saranno usate password precedentemente salvate. + Hesla nejsou ukládána, když se připojujete k multiplayerovému serveru. Hesla, která již byla uložena, jsou smazána z profilu. + 當連線到伺服器時將不保存密碼。已有的保存密碼將會刪除。 + 当连接到服务器时将不保存密码。已保存的密码将会删除。 + Пароли не сохраняются при входе на сервера. Уже сохранённые пароли будут удалены. + Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas se eliminan del perfil. + + + Notification + Benachrichtigung + Powiadomienie + 通知 + Notifica + Upozornění + Bildirim + 通知 + 提示 + Notification + Уведомление + Notificación + + + Textual feedback to the player. + Textrückmeldung an den Spieler. + Tekstowa informacja dla gracza. + 文章でプレイヤーに通知します。 + Notifica testuale al giocatore. + Textová zpětná vazba hráči. + Yazıyla geri bildirim. + 回饋文字給玩家 + 反馈文本给玩家。 + Notification textuelle au joueur. + Текстовая информация для игрока. + Comentarios textuales para el jugador + + + Show all missions + Alle Missionen anzeigen + 全ミッションを表示 + Pokaż wszystkie misje + Mostra tutte le missioni + Ukázat všechny mise + Tüm görevleri göster + 顯示所有任務 + 显示所有任务 + Afficher toutes les missions + Показать все миссии + Mostrar todas las misiones + + + Show custom missions + Eigene Missionen anzeigen + カスタム ミッションを表示 + Pokaż własne/wgrane misje + Mostra missioni custom + Ukázat vlastní mise + Sonradan eklenen görevleri göster + 顯示目前任務 + 显示当前任务 + Afficher les missions personnalisées + Показать пользовательские миссии + Mostrar misiones personalizadas + + + Notification Lifetime + Benachrichtigung-Anzeigedauer + Doba trvání upozornění + Bildirim Süresi + 通知の表示時間 + 通知時長 + 提示显示时长 + Durée de vie des notifications + Продолжительность уведомления + Długość żywotności powiadomień + Duración de la notificación + + + Notification display duration in seconds. + Anzeigedauer der Benachrichtigungen in Sekunden. + Jak dlouho bude upozornění ukázáno (v sekundách). + Bildirim gözükme süresi (saniye olarak) + 通知が表示される時間を秒で変更できます。 + 設定通知的顯示時間（秒數）。 + 设置提示的显示时长（秒） + Durée d'affichage des notifications, en secondes. + Время в секундах, в течении которого будет видно уведомление. + Ilość czasu przez który widoczne jest powiadomienie + Duración de la visualización de notificaciones en segundos + + + Contact the server admin. + Serveradministrator benachrichtigen. + Sunucu yöneticisiyle iletişime geç. + サーバー管理者に連絡をして下さい。 + 聯絡伺服器的管理員 + 联系服务器管理员 + Contacter l'administrateur du serveur. + Уведомить администратора сервера. + Kontakt z administratorem serwera + Póngase en contacto con el administrador del servidor + Kontaktujte správce serveru. + + + Lobby Manager + Lobby Manager + Menadżer Lobby + Gestionnaire de Lobby + Gerente de lobby + 角色大廳管理 + 角色大厅管理 + Manažer lobby + + + Adjusting group order... + Reihenfolge der Gruppen wird angepasst ... + Modification de l'ordre des groupes... + Ajustar el orden del grupo... + Dostosowywanie kolejności w lobby... + 調整小隊順序 + 调整小队顺序 + Upravuji pořadí skupiny... + + + Back up mission before using this tool. + Erstelle vor Gebrauch eine Sicherungskopie. + Sauvegardez la mission avant d'utiliser cet outil. + Haga una copia de seguridad de la misión antes de usar esta herramienta + Wykonaj kopię zapasową misji przed użyciem tego narzędzia. + 使用此工具前，請備份任務。 + 使用此工具之前，请备份任务。 + Zálohujte misi před použitím tohoto nástroje. + + From 7a1ccd1e3851866f5797115136e70932b86ce2c4 Mon Sep 17 00:00:00 2001 From: Brett Date: Sun, 1 May 2022 01:29:04 -0600 Subject: [PATCH 081/111] use events --- addons/loadout/CfgFunctions.hpp | 3 -- addons/loadout/XEH_preInit.sqf | 5 --- addons/loadout/fnc_addLoadoutGetHandler.sqf | 33 -------------- addons/loadout/fnc_addLoadoutSetHandler.sqf | 43 ------------------- addons/loadout/fnc_getLoadout.sqf | 7 +-- .../loadout/fnc_removeLoadoutSetHandler.sqf | 39 ----------------- addons/loadout/fnc_setLoadout.sqf | 9 +--- 7 files changed, 3 insertions(+), 136 deletions(-) delete mode 100644 addons/loadout/fnc_addLoadoutGetHandler.sqf delete mode 100644 addons/loadout/fnc_addLoadoutSetHandler.sqf delete mode 100644 addons/loadout/fnc_removeLoadoutSetHandler.sqf diff --git a/addons/loadout/CfgFunctions.hpp b/addons/loadout/CfgFunctions.hpp index 680dbcf609..e46a149c07 100644 --- a/addons/loadout/CfgFunctions.hpp +++ b/addons/loadout/CfgFunctions.hpp @@ -1,9 +1,6 @@ class CfgFunctions { class CBA { class Loadout { - PATHTO_FNC(addLoadoutGetHandler); - PATHTO_FNC(addLoadoutSetHandler); - PATHTO_FNC(removeLoadoutSetHandler); PATHTO_FNC(getLoadout); PATHTO_FNC(setLoadout); }; diff --git a/addons/loadout/XEH_preInit.sqf b/addons/loadout/XEH_preInit.sqf index ab2deab1ff..19f1494f29 100644 --- a/addons/loadout/XEH_preInit.sqf +++ b/addons/loadout/XEH_preInit.sqf @@ -1,8 +1,3 @@ #include "script_component.hpp" -ADDON = false; - -GVAR(getHandlers) = createHashMap; -GVAR(setHandlers) = createHashMap; - ADDON = true; diff --git a/addons/loadout/fnc_addLoadoutGetHandler.sqf b/addons/loadout/fnc_addLoadoutGetHandler.sqf deleted file mode 100644 index f34fa6c3b8..0000000000 --- a/addons/loadout/fnc_addLoadoutGetHandler.sqf +++ /dev/null @@ -1,33 +0,0 @@ -#include "script_component.hpp" -/* ---------------------------------------------------------------------------- -Function: CBA_fnc_addLoadoutGetHandler -Description: - Add a handler for CBA_fnc_setLoadout. -Parameters: - _id - The id of the handler. - _function - The function you wish to execute. -Passed Arguments: - _this - 0: _unit - The unit to set the loadout on. - 1: _loadout - The unit's loadout -Returns: - true if a previous handler existed, false otherwise. -Examples: - (begin example) - ["earplugs", { - params ["_unit"]; - [_unit] call my_earplug_mod_fnc_hasEarplugs; - }] call CBA_fnc_addLoadoutGetHandler; - (end) -Author: - Brett Mayson ----------------------------------------------------------------------------- */ - -params [ - ["_id", "", [""]], - ["_function", {}, [{}]] -]; - -if (_id isEqualTo "") exitWith {-1}; - -GVAR(getHandlers) set [_id, _function]; diff --git a/addons/loadout/fnc_addLoadoutSetHandler.sqf b/addons/loadout/fnc_addLoadoutSetHandler.sqf deleted file mode 100644 index 2d1fbf667a..0000000000 --- a/addons/loadout/fnc_addLoadoutSetHandler.sqf +++ /dev/null @@ -1,43 +0,0 @@ -#include "script_component.hpp" -/* ---------------------------------------------------------------------------- -Function: CBA_fnc_addLoadoutSetHandler -Description: - Add a handler for CBA_fnc_setUnitLoadout. -Parameters: - _id - The id of the handler. - _function - The function you wish to execute. - _default - The default value when the get handler return nil -Passed Arguments: - _this - 0: _unit - The unit to set the loadout on. - 1: _params - The parameters stored by CBA_fnc_getLoadout. -Returns: - Nothing. -Examples: - (begin example) - ["earplugs", { - params ["_unit", "_state"]; - if (_state) then { - [_unit] call my_earplug_mod_fnc_giveEarplugs; - } else { - [_unit] call my_earplug_mod_fnc_removeEarplugs; - }; - }] call CBA_fnc_addLoadoutSetHandler; - (end) -Author: - Brett Mayson ----------------------------------------------------------------------------- */ - -params [ - ["_id", "", [""]], - ["_function", {}, [{}]], - "_default" -]; - -if (_id isEqualTo "") exitWith {-1}; - -if !(_id in (GVAR(setHandlers))) then { - GVAR(setHandlers) set [_id, []]; -}; - -(GVAR(setHandlers) get _id) pushBack [_function, _default]; diff --git a/addons/loadout/fnc_getLoadout.sqf b/addons/loadout/fnc_getLoadout.sqf index ffbb6381a6..431407d202 100644 --- a/addons/loadout/fnc_getLoadout.sqf +++ b/addons/loadout/fnc_getLoadout.sqf @@ -24,12 +24,7 @@ if (_unit isEqualTo objNull) exitWith {[]}; private _loadout = getUnitLoadout _unit; private _extendedInfo = createHashMap; -{ - private _info = [_unit, _loadout] call _y; - if !(isNil "_info") then { - _extendedInfo set [_x, _info]; - }; -} forEach GVAR(getHandlers); +["CBA_loadoutGet", [_unit, _loadout, _extendedInfo]] call CBA_fnc_localEvent; [ _loadout, diff --git a/addons/loadout/fnc_removeLoadoutSetHandler.sqf b/addons/loadout/fnc_removeLoadoutSetHandler.sqf deleted file mode 100644 index 3d9d33cd9a..0000000000 --- a/addons/loadout/fnc_removeLoadoutSetHandler.sqf +++ /dev/null @@ -1,39 +0,0 @@ -#include "script_component.hpp" -/* ---------------------------------------------------------------------------- -Function: CBA_fnc_removeLoadoutSetHandler -Description: - Remove a handler for CBA_fnc_setUnitLoadout. -Parameters: - _id - The id of the handler. - _index - The index of the handler. -Returns: - Nothing. -Examples: - (begin example) - MY_HANDLER = ["earplugs", { - params ["_unit", "_state"]; - if (_state) then { - [_unit] call my_earplug_mod_fnc_giveEarplugs; - } else { - [_unit] call my_earplug_mod_fnc_removeEarplugs; - }; - ["earplugs", MY_HANDLER] call CBA_fnc_removeLoadoutSetHandler; - }] call CBA_fnc_addLoadoutSetHandler; - (end) -Author: - Brett Mayson ----------------------------------------------------------------------------- */ - -params [ - ["_id", "", [""]], - ["_index", -1, [0]] -]; - -if (_id isEqualTo "") exitWith {false}; -if (_index isEqualTo -1) exitWith {false}; - -if !(_id in (GVAR(setHandlers))) exitWith {false}; - -(GVAR(setHandlers) get _id) set [_index, {}]; - -true diff --git a/addons/loadout/fnc_setLoadout.sqf b/addons/loadout/fnc_setLoadout.sqf index f45fbb6afa..7518a906d9 100644 --- a/addons/loadout/fnc_setLoadout.sqf +++ b/addons/loadout/fnc_setLoadout.sqf @@ -25,6 +25,7 @@ params [ if (isNull _unit) exitWith {}; +// A regular loadout array was passed in if (count _loadout == 10) exitWith { _unit setUnitLoadout [_loadout, _fullMagazines]; }; @@ -33,10 +34,4 @@ _unit setUnitLoadout [_loadout select 0, _fullMagazines]; private _extendedInfo = createHashMapFromArray (_loadout select 1); -{ - private _id = _x; - { - _x params ["_function", "_default"]; - [_unit, _extendedInfo getOrDefault [_id, _default]] call _function; - } forEach _y; -} forEach GVAR(setHandlers); +["CBA_loadoutSet", [_unit, _loadout, _extendedInfo]] call CBA_fnc_localEvent; From 4ac81a7ecc2236c48600624b19d88aeae6e7927a Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 11 May 2022 13:23:32 -0500 Subject: [PATCH 082/111] tabs --- addons/ai/stringtable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/ai/stringtable.xml b/addons/ai/stringtable.xml index 3649dd4739..1e737f2314 100644 --- a/addons/ai/stringtable.xml +++ b/addons/ai/stringtable.xml @@ -35,7 +35,7 @@ Soldato obiettivo invisibile Żołnierz - niewidoczny cel Невидимая цель - солдат - Neviditelný cíl (Voják) + Neviditelný cíl (Voják) Soldado alvo invisível 보이지 않는 표적 병사 隐形目标（士兵） From 3fa9059f76ba3aab410c38022acc137ab832675e Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 13 May 2022 17:57:06 -0600 Subject: [PATCH 083/111] Update addons/loadout/config.cpp Co-authored-by: PabstMirror --- addons/loadout/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/loadout/config.cpp b/addons/loadout/config.cpp index 3877bc307e..da3b5e7da5 100644 --- a/addons/loadout/config.cpp +++ b/addons/loadout/config.cpp @@ -2,7 +2,7 @@ class CfgPatches { class ADDON { - name = CSTRING(component); + name = "Community Base Addons - Loadout Framework" units[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"cba_common", "cba_events"}; From 54d977e6eed96d5ba4a69fb41baa3c8c24b83338 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 13 May 2022 17:58:20 -0600 Subject: [PATCH 084/111] Update addons/loadout/fnc_setLoadout.sqf Co-authored-by: PabstMirror --- addons/loadout/fnc_setLoadout.sqf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/loadout/fnc_setLoadout.sqf b/addons/loadout/fnc_setLoadout.sqf index 7518a906d9..5b162e56c4 100644 --- a/addons/loadout/fnc_setLoadout.sqf +++ b/addons/loadout/fnc_setLoadout.sqf @@ -32,6 +32,7 @@ if (count _loadout == 10) exitWith { _unit setUnitLoadout [_loadout select 0, _fullMagazines]; -private _extendedInfo = createHashMapFromArray (_loadout select 1); +private _extendedInfo = _loadout select 1; +if (_extendedInfo isEqualType []) then { _extendedInfo = createHashMapFromArray _extendedInfo; }; ["CBA_loadoutSet", [_unit, _loadout, _extendedInfo]] call CBA_fnc_localEvent; From 6619b6045fc5742478c7ca35106906050757c218 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 13 May 2022 19:55:35 -0500 Subject: [PATCH 085/111] Update addons/loadout/config.cpp --- addons/loadout/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/loadout/config.cpp b/addons/loadout/config.cpp index da3b5e7da5..10af0c1d27 100644 --- a/addons/loadout/config.cpp +++ b/addons/loadout/config.cpp @@ -2,7 +2,7 @@ class CfgPatches { class ADDON { - name = "Community Base Addons - Loadout Framework" + name = "Community Base Addons - Loadout Framework"; units[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"cba_common", "cba_events"}; From 31c0ee357f7e6e4a92ce102b2ed9239df345111f Mon Sep 17 00:00:00 2001 From: Brett Date: Sat, 14 May 2022 00:24:00 -0600 Subject: [PATCH 086/111] Update fnc_setLoadout.sqf --- addons/loadout/fnc_setLoadout.sqf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/loadout/fnc_setLoadout.sqf b/addons/loadout/fnc_setLoadout.sqf index 5b162e56c4..70cfcd9d95 100644 --- a/addons/loadout/fnc_setLoadout.sqf +++ b/addons/loadout/fnc_setLoadout.sqf @@ -30,9 +30,10 @@ if (count _loadout == 10) exitWith { _unit setUnitLoadout [_loadout, _fullMagazines]; }; -_unit setUnitLoadout [_loadout select 0, _fullMagazines]; +_loadout params ["_loadoutArray", "extendedInfo"]; + +_unit setUnitLoadout [_loadoutArray, _fullMagazines]; -private _extendedInfo = _loadout select 1; if (_extendedInfo isEqualType []) then { _extendedInfo = createHashMapFromArray _extendedInfo; }; ["CBA_loadoutSet", [_unit, _loadout, _extendedInfo]] call CBA_fnc_localEvent; From db40acd55a19cd51908ada20c4bc53a6ba86e68e Mon Sep 17 00:00:00 2001 From: Brett Date: Sat, 14 May 2022 00:24:33 -0600 Subject: [PATCH 087/111] Update fnc_setLoadout.sqf --- addons/loadout/fnc_setLoadout.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/loadout/fnc_setLoadout.sqf b/addons/loadout/fnc_setLoadout.sqf index 70cfcd9d95..1d61a44505 100644 --- a/addons/loadout/fnc_setLoadout.sqf +++ b/addons/loadout/fnc_setLoadout.sqf @@ -30,7 +30,7 @@ if (count _loadout == 10) exitWith { _unit setUnitLoadout [_loadout, _fullMagazines]; }; -_loadout params ["_loadoutArray", "extendedInfo"]; +_loadout params ["_loadoutArray", "_extendedInfo"]; _unit setUnitLoadout [_loadoutArray, _fullMagazines]; From 81a8c06c5912c4da9999a3781e9c3ed60341a59a Mon Sep 17 00:00:00 2001 From: mharis001 Date: Sun, 15 May 2022 11:40:29 -0400 Subject: [PATCH 088/111] Keybinding - Sort subcategories using localized names --- addons/keybinding/fnc_gui_update.sqf | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/keybinding/fnc_gui_update.sqf b/addons/keybinding/fnc_gui_update.sqf index fa36f108a9..04c63f2845 100644 --- a/addons/keybinding/fnc_gui_update.sqf +++ b/addons/keybinding/fnc_gui_update.sqf @@ -34,6 +34,10 @@ private _categoryKeyActions = []; private _action = format ["%1$%2", _addon, _x]; private _subcategory = (GVAR(actions) getVariable _action) param [8, "", [""]]; + if (isLocalized _subcategory) then { + _subcategory = localize _subcategory; + }; + _categoryKeyActions pushBack [_subcategory, _forEachIndex, _x]; } forEach _addonActions; @@ -94,11 +98,6 @@ private _tablePosY = 0; // add subcategory header if (_createHeader) then { private _header = _display ctrlCreate [QGVAR(subCat), -1, _ctrlKeyList]; - - if (isLocalized _subcategory) then { - _subcategory = localize _subcategory; - }; - (_header controlsGroupCtrl IDC_SUBCATEGORY_NAME) ctrlSetText format ["%1:", _subcategory]; _header ctrlSetPosition [POS_W(0), _tablePosY]; _header ctrlCommit 0; From 5484cdcee9cba6f3cd93d9c857dd47e802fea883 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 16 May 2022 01:54:06 -0500 Subject: [PATCH 089/111] AI - Add basic delay for `CBA_fnc_searchNearby` while loop Co-Authored-By: mrzachhiggins <53547287+mrzachhigginsofficial@users.noreply.github.com> --- addons/ai/fnc_searchNearby.sqf | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/ai/fnc_searchNearby.sqf b/addons/ai/fnc_searchNearby.sqf index 524cd8143f..1a1c6d8774 100644 --- a/addons/ai/fnc_searchNearby.sqf +++ b/addons/ai/fnc_searchNearby.sqf @@ -66,6 +66,7 @@ if ((leader _group) distanceSqr _building > 250e3) exitwith {}; sleep 2; }; } forEach _units; + sleep 0.25; }; _group lockWP false; }; From 9b22faaa434c7834cc36e0693ffd62fe847fc69b Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 17 May 2022 17:34:23 -0500 Subject: [PATCH 090/111] Prep v3.15.7 --- README.md | 2 +- addons/main/script_version.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7aa94cfec0..e024594c65 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Community Base Addons [![](https://img.shields.io/travis/CBATeam/CBA_A3.svg?style=flat-square)](https://travis-ci.org/CBATeam/CBA_A3) [![](https://img.shields.io/badge/Changelog-Link-orange.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) -[![](https://img.shields.io/badge/Release-3.15.6-blue.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) +[![](https://img.shields.io/badge/Release-3.15.7-blue.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) [![](https://img.shields.io/badge/Github-Wiki-lightgrey.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/wiki) [![](https://img.shields.io/badge/BIF-Thread-lightgrey.svg?style=flat-square)](https://forums.bistudio.com/topic/168277-cba-community-base-addons-arma-3) [![](https://img.shields.io/badge/Function-Documentation-yellow.svg?style=flat-square)](https://cbateam.github.io/CBA_A3/docs/files/overview-txt.html) diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 31f33db8a1..15a34c2656 100755 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 3 #define MINOR 15 -#define PATCHLVL 6 +#define PATCHLVL 7 #define BUILD 000000 From 2d472f8bad5737d2ea0b303d900f92699cbafe72 Mon Sep 17 00:00:00 2001 From: Brett Date: Tue, 24 May 2022 17:01:26 -0600 Subject: [PATCH 091/111] Fix bug in CBA_fnc_setLoadout Should've not gotten distracted with Reforger and got stuff done on this, would've caught it before release. Nothing is using this right now anyway, hotfix before anyone tries to use it? --- addons/loadout/fnc_setLoadout.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/loadout/fnc_setLoadout.sqf b/addons/loadout/fnc_setLoadout.sqf index 1d61a44505..e2308546ff 100644 --- a/addons/loadout/fnc_setLoadout.sqf +++ b/addons/loadout/fnc_setLoadout.sqf @@ -36,4 +36,4 @@ _unit setUnitLoadout [_loadoutArray, _fullMagazines]; if (_extendedInfo isEqualType []) then { _extendedInfo = createHashMapFromArray _extendedInfo; }; -["CBA_loadoutSet", [_unit, _loadout, _extendedInfo]] call CBA_fnc_localEvent; +["CBA_loadoutSet", [_unit, _loadoutArray, _extendedInfo]] call CBA_fnc_localEvent; From 4bcb9401eda27166a5b1c070298f141274f6690e Mon Sep 17 00:00:00 2001 From: Dedmen Miller Date: Mon, 27 Jun 2022 14:30:34 +0200 Subject: [PATCH 092/111] Fix JR case typo SLot vs Slot --- addons/jr/jr_classes.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/jr/jr_classes.hpp b/addons/jr/jr_classes.hpp index 9febbda886..a1f503b551 100644 --- a/addons/jr/jr_classes.hpp +++ b/addons/jr/jr_classes.hpp @@ -280,7 +280,7 @@ class asdg_MuzzleSlot_762R: asdg_MuzzleSlot { // for 7.62x39 suppressors class compatibleItems {}; }; -class asdg_MuzzleSLot_762R_VZ58: asdg_MuzzleSlot { // for 7.62x39 Sa vz. 58 (M14x1 threading) +class asdg_MuzzleSlot_762R_VZ58: asdg_MuzzleSlot { // for 7.62x39 Sa vz. 58 (M14x1 threading) class compatibleItems {}; }; From 6b9dfef7d1bb2485ef2631dcdc9c8147db613c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Wed, 13 Jul 2022 13:14:04 +0200 Subject: [PATCH 093/111] XEH - Add missing event handlers with SOG PF 1.2 patch --- addons/xeh/CfgVehicles.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/xeh/CfgVehicles.hpp b/addons/xeh/CfgVehicles.hpp index 7e0285a782..eca2c913a4 100644 --- a/addons/xeh/CfgVehicles.hpp +++ b/addons/xeh/CfgVehicles.hpp @@ -438,6 +438,10 @@ class CfgVehicles { XEH_ENABLED; }; + class vn_parachute_base: ParachuteBase { + XEH_ENABLED; + }; + class vn_parachute_02_base: ParachuteBase {}; class vn_b_parachute_02: vn_parachute_02_base {}; class vn_b_parachute_02_blu82: vn_b_parachute_02 {}; From d421349873d09f649215c0458467bc236feade61 Mon Sep 17 00:00:00 2001 From: inty Date: Tue, 6 Sep 2022 14:41:18 +0000 Subject: [PATCH 094/111] Settings - Fix _isGlobal data type in docs --- addons/settings/fnc_addSetting.sqf | 2 +- addons/settings/fnc_init.sqf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/settings/fnc_addSetting.sqf b/addons/settings/fnc_addSetting.sqf index 7ba84c3fe9..11d45398f7 100644 --- a/addons/settings/fnc_addSetting.sqf +++ b/addons/settings/fnc_addSetting.sqf @@ -11,7 +11,7 @@ Parameters: _title - Display name or display name + tooltip (optional, default: same as setting name) _category - Category for the settings menu + optional sub-category _valueInfo - Extra properties of the setting depending of _settingType. See examples below - _isGlobal - 1: all clients share the same setting, 2: setting can't be overwritten (optional, default: 0) + _isGlobal - 1: all clients share the same setting, 2: setting can't be overwritten (optional, default: 0) _script - Script to execute when setting is changed. (optional) _needRestart - Setting will be marked as needing mission restart after being changed. (optional, default false) diff --git a/addons/settings/fnc_init.sqf b/addons/settings/fnc_init.sqf index 6abe3c5f4b..173b9aeb6c 100644 --- a/addons/settings/fnc_init.sqf +++ b/addons/settings/fnc_init.sqf @@ -11,7 +11,7 @@ Parameters: _title - Display name or display name + tooltip (optional, default: same as setting name) _category - Category for the settings menu + optional sub-category _valueInfo - Extra properties of the setting depending of _settingType. See examples below - _isGlobal - 1: all clients share the same setting, 2: setting can't be overwritten (optional, default: 0) + _isGlobal - 1: all clients share the same setting, 2: setting can't be overwritten (optional, default: 0) _script - Script to execute when setting is changed. (optional) _needRestart - Setting will be marked as needing mission restart after being changed. (optional, default false) From 7b031be5b4fc0deabbcd855e48fa8b0e4c9298bc Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 12 Sep 2022 16:39:53 -0500 Subject: [PATCH 095/111] Prep v3.15.8 --- README.md | 2 +- addons/main/script_version.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e024594c65..9cefa896a8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Community Base Addons [![](https://img.shields.io/travis/CBATeam/CBA_A3.svg?style=flat-square)](https://travis-ci.org/CBATeam/CBA_A3) [![](https://img.shields.io/badge/Changelog-Link-orange.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) -[![](https://img.shields.io/badge/Release-3.15.7-blue.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) +[![](https://img.shields.io/badge/Release-3.15.8-blue.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest) [![](https://img.shields.io/badge/Github-Wiki-lightgrey.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/wiki) [![](https://img.shields.io/badge/BIF-Thread-lightgrey.svg?style=flat-square)](https://forums.bistudio.com/topic/168277-cba-community-base-addons-arma-3) [![](https://img.shields.io/badge/Function-Documentation-yellow.svg?style=flat-square)](https://cbateam.github.io/CBA_A3/docs/files/overview-txt.html) diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 15a34c2656..a89ee49f93 100755 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 3 #define MINOR 15 -#define PATCHLVL 7 +#define PATCHLVL 8 #define BUILD 000000 From 6602c4518ffa83e80eac16a199a81df088fc8d3c Mon Sep 17 00:00:00 2001 From: Fratee Date: Wed, 4 Jan 2023 18:20:33 +0100 Subject: [PATCH 096/111] Add and fix some Italian translations --- addons/accessory/stringtable.xml | 2 +- addons/ai/stringtable.xml | 5 ++++- addons/characters/stringtable.xml | 2 ++ addons/common/stringtable.xml | 2 +- addons/diagnostic/stringtable.xml | 3 +++ addons/disposable/stringtable.xml | 10 ++++++++++ addons/events/stringtable.xml | 8 ++++++++ addons/modules/stringtable.xml | 2 +- addons/network/stringtable.xml | 8 ++++++++ addons/optics/stringtable.xml | 2 ++ addons/settings/stringtable.xml | 3 +++ addons/ui/stringtable.xml | 6 ++++++ 12 files changed, 49 insertions(+), 4 deletions(-) diff --git a/addons/accessory/stringtable.xml b/addons/accessory/stringtable.xml index 368ee51f36..e743adf6ac 100644 --- a/addons/accessory/stringtable.xml +++ b/addons/accessory/stringtable.xml @@ -115,7 +115,7 @@ Przełącza na poprzedni dostępny tryb optyki Basculer sur le mode précédent de l'optique. Varolan nişangahınızı önceki moduna geçirir - Passa alla modalità precedenta della tua ottica + Passa alla modalità precedente della tua ottica Přepíná na předchozí možný režim doplňku slotu pro zaměřovač diff --git a/addons/ai/stringtable.xml b/addons/ai/stringtable.xml index 1e737f2314..cfb880e3a4 100644 --- a/addons/ai/stringtable.xml +++ b/addons/ai/stringtable.xml @@ -25,6 +25,7 @@ Position IA bâtiment ИИ Место строительства Pozycja AI w budynku + Posizione edificio AI Invisible Target Soldier @@ -32,7 +33,7 @@ 隱形目標（士兵） Cible invisible - Soldat Soldado objetivo invisible - Soldato obiettivo invisibile + Obiettivo invisibile - Soldato Żołnierz - niewidoczny cel Невидимая цель - солдат Neviditelný cíl (Voják) @@ -50,6 +51,7 @@ 隱形目標（車輛） 隐形目标（车辆） Neviditelný cíl (Vozidlo) + Obiettivo invisibile - Veicolo Invisible Target Airplane @@ -59,6 +61,7 @@ 隱形目標（飛機） 隐形目标（飞机） Neviditelný cíl (Letoun) + Obiettivo invisibile - Velivolo diff --git a/addons/characters/stringtable.xml b/addons/characters/stringtable.xml index 708585ccbb..09286763b7 100755 --- a/addons/characters/stringtable.xml +++ b/addons/characters/stringtable.xml @@ -8,6 +8,7 @@ Community Base Addons - Postacie 社區基礎插件 - 角色 社区基础插件-角色 + Community Base Addons - Personaggi Men (Malaria-Infected) @@ -16,6 +17,7 @@ Ludzie (Zainfekowani malarią) 男子(瘧疾感染者) 男子(疟疾感染者) + Uomo (Infetto da malaria) diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index dc696bd24c..4bab0c762b 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -21,7 +21,7 @@ Należy najpierw uruchomić misję. Önce bir görev başlatmalısınız. ミッションを開始しておく必要があります。 - Prima deve far partire una missione. + Prima devi far partire una missione. První musíte zapnout misi. 你必須先加載世界或執行一個任務。 你必须先开始一个任务。 diff --git a/addons/diagnostic/stringtable.xml b/addons/diagnostic/stringtable.xml index 9f76359b26..121a8fd152 100644 --- a/addons/diagnostic/stringtable.xml +++ b/addons/diagnostic/stringtable.xml @@ -107,6 +107,7 @@ 調試控制台縮進 调试控制台缩进 Odsazení ladící konzole + Indentazione console di debug Type of indentation that can be added to expression in the debug console by pressing Tab key or removed by pressing Shift + Tab. @@ -116,6 +117,7 @@ 可以通過按 Tab 鍵為添加到調試控制台中的表達式縮進或通過按 Shift + Tab 鍵為其刪除縮進。 可以通过按 Tab 键为添加到调试控制台中的表达式缩进或通过按 Shift + Tab 键为其删除缩进。 Typ odsazení, které lze přidat do výrazu v ladicí konzoli stisknutím klávesy Tab nebo odstranit stisknutím Shift + Tab. + Il tipo di intentazione che può essere aggiunta all'espressione nella console di debug premendo il tasto Tab o rimossa premendo Shift + Tab Refresh rate target watcher field @@ -137,6 +139,7 @@ 4 個空格 4 个空格 4 mezery + 4 Spazi diff --git a/addons/disposable/stringtable.xml b/addons/disposable/stringtable.xml index 87497405d7..916a96bfb9 100644 --- a/addons/disposable/stringtable.xml +++ b/addons/disposable/stringtable.xml @@ -12,6 +12,7 @@ 社群基础模组 - 一次性武器 Community Base Addons - Одноразовое оружие Community Base Addons - Bronie jednorazowe + Community Base Addons - Armi monouso Drop Used Disposable Launcher @@ -24,6 +25,7 @@ Lâcher le lanceur usagé Выбрасывать использованный одноразовый гранатомёт Wyrzuć zużyty przedmiot + Butta lanciatore usato Never @@ -36,6 +38,7 @@ Jamais Никогда Nigdy + Mai Don't automatically drop the used disposable launcher. @@ -48,6 +51,7 @@ Ne lâche jamais automatiquement le lanceur usagé. Не выбрасывать автоматически использованный одноразовый гранатомёт. Nie wyrzucaj automatycznie wyrzutni jednorazowej. + Non buttare automaticamente il lanciatore usato. AI Only @@ -60,6 +64,7 @@ IA seulement Только ИИ Tylko AI + Solo AI Only AI drops the used disposable launcher. @@ -72,6 +77,7 @@ Seules les unités IA lâchent leur lanceur après emploi. Только ИИ выбрасывает использованный одноразовый гранатомёт. Tylko AI wyrzuca wyrzutnie jednorazową. + Solo le unità AI buttano il lanciatore usato. Selected Another Weapon @@ -84,6 +90,7 @@ Si autre arme sélectionnée Выбрано другое оружие Wybierz inną Broń + Seleziona un'altra arma Automatically drop the used disposable launcher as soon as another weapon is selected. @@ -96,6 +103,7 @@ Lâche automatiquement le lanceur usagé dès qu'une autre arme est sélectionnée. Автоматически выбрасывать использованный одноразовый гранатомёт, как только будет выбрано другие оружие. Automatycznie wyrzucaj wyrzutnie jednorazową gdy tylko zostanie wybrana kolejna broń. + Butta automaticamente il lanciatore usato non appena un'altra arma viene selezionata Replace Disposable Launcher @@ -108,6 +116,7 @@ Remplacer le lanceur à usage unique Заменять одноразовые гранатомёты Zamien wyrzutnie jednorazową + Sostituisci lanciatore monouso If enabled, disposable launchers can only be used once. Ammunition for disposable launchers in containers and vehicles will be replaced with loaded disposable launchers. If disabled, disposable launchers can be reloaded after use. @@ -120,6 +129,7 @@ Si activé, les lanceurs à usage unique ne peuvent être utilisés qu'une seule fois. Les munitions pour lanceurs à usage unique situés dans les conteneurs et les véhicules seront remplacées par des lanceurs à usage unique chargés. Si désactivé, les lanceurs à usage unique peuvent être rechargés après emploi. Если включено, одноразовые гранатомёты могут быть использованы лишь один раз. Боеприпасы для них в контейнерах и технике будут заменены на соответствующие им заряженные одноразовые гранатомёты. Если выключено, одноразовые гранатомёты могут быть перезаряжены и использованы повторно. Gdy ta opcja jest włączona wyrzutnie jednorazowe mogą być użyte tylko raz, Amunicja do wyrzutni jednorazowych dostępna w kontenerach i pojazdach zostanie zamieniona w załadowaną wyrzutnie jednorazową. Jeżeli ta opcja jest wyłączona, wtedy wyrzutnie jednorazowe nie zostaną przeładowane po użyciu. + Se abilitato, i lanciatori monouso possono essere usati una sola volta. Le munizioni per i lanciatori monouso che si trovano nei contenitori e nei veicoli saranno sostituiti con lanciatori monouso carichi. Se disabilitato, i lanciatori monouso possono essere ricaricati dopo l'uso. diff --git a/addons/events/stringtable.xml b/addons/events/stringtable.xml index 6e20e2e228..6744976f25 100644 --- a/addons/events/stringtable.xml +++ b/addons/events/stringtable.xml @@ -25,6 +25,7 @@ 武器连发模式 Mode de réarmement Режим повторной стрельбы + Modalità di ricarica dell'arma Mode of bolting or pumping weapons. @@ -37,6 +38,7 @@ 设置武器拉栓及退膛状态 Mode de réarmement des armes à verrou et à pompe. Режим повторной стрельбы помпового оружия или оружия с продольно-скользящим затвором. + Modalità di ricarica o riarmo delle armi. Leave Optics View @@ -49,6 +51,7 @@ 离开瞄准视野 Maintenir vue lunette Выход из прицела + Esci dalla vista ottica Bolt or rack weapon by leaving optics view. @@ -61,6 +64,7 @@ 当武器拉栓以及退膛时是否离开瞄准视野 Réarme l'arme tout en maintenant la visée dans la lunette. Перезаряжать оружие после выхода из прицела. + Ricarica l'arma uscendo dalla vista dell'ottica. Release Trigger @@ -73,6 +77,7 @@ 松开板机 Relâcher la détente Отпускание курка + Rilascia il grilletto Bolt or rack weapon by releasing trigger (hold trigger to prevent immediate action). @@ -85,6 +90,7 @@ 当松开板机后拉栓或退膛（扣住板机以避免突然的动作）。 Réarme l'arme au relâchement de la détente (maintenir la détente enfoncée pour éviter le réarmement immédiat). Перезаряжать оружие после отпускания курка (держите курок чтобы не перезаряжать). + Ricarica l'arma rilasciando il grilletto (mantieni premuto il grilletto per prevenire la ricarica immediata). Press Trigger @@ -97,6 +103,7 @@ 按下板机 Presser la détente Нажатие курка + Premi il grilletto Bolt or rack weapon by pressing the trigger again. @@ -109,6 +116,7 @@ 再次按下板机才能拉栓或退膛 Réarme l'arme en pressant la détente encore une fois. Перезаряжать оружие повторным нажатием на курок. + Ricarica l'arma premendo nuovamente il grilletto diff --git a/addons/modules/stringtable.xml b/addons/modules/stringtable.xml index 3c955092ab..1a80accf2c 100644 --- a/addons/modules/stringtable.xml +++ b/addons/modules/stringtable.xml @@ -609,7 +609,7 @@ Krąż Flâner Bekle - Indulgiare + Indugiare Postávat diff --git a/addons/network/stringtable.xml b/addons/network/stringtable.xml index 3d40ba2b46..1138990be5 100644 --- a/addons/network/stringtable.xml +++ b/addons/network/stringtable.xml @@ -36,6 +36,7 @@ Sprawdzenie wyposażenia 驗證加載 验证加载 + Verifica l'equipaggiamento Validate loadout of units. Fixes an issue where units appear naked after changing locality. @@ -45,6 +46,7 @@ 驗證單位加載。修復單位在更改大廳位置後顯示為裸體的問題。 验证单位加载。修复单位在更改大厅位置后显示为裸体的问题。 Ověřovat výbavu jednotek. Opravuje problém s nahými jednotkami když mění lokálnost. + Verifica l'equipaggiamento delle unità. Corregge un bug che faceva apparire un'unità nuda dopo aver cambiato località. Never @@ -54,6 +56,7 @@ 從不 从不 Nikdy + Mai Never validate loadouts @@ -63,6 +66,7 @@ 從不驗證加載 从不验证加载 Nikdy neověřovat výbavu + Non validare mai gli equipaggiamenti Playable units only @@ -72,6 +76,7 @@ 僅可玩單位 仅可玩单位 Pouze hratelné jednotky + Solo unità giocabili Validate only loadout of playable units @@ -81,6 +86,7 @@ 僅驗證可玩單位的加載 仅验证可玩单位的加载 Ověřovat pouze výbavu hratelných jednotek + Valida solo le unità giocabili All units @@ -90,6 +96,7 @@ 所有單位 所有单位 Všechny jednotky + Tutte le unità Validate loadout of all units @@ -99,6 +106,7 @@ 驗證所有單位的加載 验证所有单位的加载 Ověřovat výbavu všech jednotek + Valida l'equipaggiamento di tutte unità diff --git a/addons/optics/stringtable.xml b/addons/optics/stringtable.xml index 32d428c42d..93e28e1b76 100644 --- a/addons/optics/stringtable.xml +++ b/addons/optics/stringtable.xml @@ -31,6 +31,7 @@ Toggle Reticle Absehen umschalten Zapnout retikulum + Cambia reticolo Dürbün çizgilerini değiştir 照準線切り替え 切換瞄準線 @@ -43,6 +44,7 @@ Manually switch the reticle of the optic. Absehen der Optik manuell umschalten. Manuálně přepnout retikulum optiky + Cambia manualmente il reticolo dell'ottica. Dürbünün çizgilerini elle değiştirmek için. 照準器の照準線を手動で切り替えます。 手動切換瞄具的瞄準線 diff --git a/addons/settings/stringtable.xml b/addons/settings/stringtable.xml index f0c7c53f9a..cd98c5204f 100644 --- a/addons/settings/stringtable.xml +++ b/addons/settings/stringtable.xml @@ -427,6 +427,7 @@ 被客戶端以相同的值覆蓋。 被客户端以相同的值覆盖。 Toto nastavení je přepsáno klienty stejnou hodnotou. + Sovrascritto dal client con lo stesso valore. Overwritten by mission with the same value. @@ -437,6 +438,7 @@ 被任務以相同的值覆蓋。 被任务以相同的值覆盖。 Toto nastavení je přepsáno misí stejnou hodnotou. + Sovrascritto dalla missione con lo stesso valore. Overwritten by server with the same value. @@ -447,6 +449,7 @@ 被伺服器以相同的值覆蓋。 被服务器以相同的值覆盖。 Toto nastavení je přepsáno serverem stejnou hodnotou. + Sovrascritto dal server con lo stesso valore. Copy to clipboard diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index 9c0feb21fa..b453fb85db 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -240,6 +240,7 @@ Продолжительность уведомления Długość żywotności powiadomień Duración de la notificación + Durata notifica Notification display duration in seconds. @@ -253,6 +254,7 @@ Время в секундах, в течении которого будет видно уведомление. Ilość czasu przez który widoczne jest powiadomienie Duración de la visualización de notificaciones en segundos + Durata della notifica in secondi. Contact the server admin. @@ -266,6 +268,7 @@ Kontakt z administratorem serwera Póngase en contacto con el administrador del servidor Kontaktujte správce serveru. + Contatta l'amministratore del server. Lobby Manager @@ -276,6 +279,7 @@ 角色大廳管理 角色大厅管理 Manažer lobby + Gestore lobby. Adjusting group order... @@ -286,6 +290,7 @@ 調整小隊順序 调整小队顺序 Upravuji pořadí skupiny... + Riordinando il gruppo... Back up mission before using this tool. @@ -296,6 +301,7 @@ 使用此工具前，請備份任務。 使用此工具之前，请备份任务。 Zálohujte misi před použitím tohoto nástroje. + Salva una copia della missione prima di usare questo strumento. From 9db07db9a6f1e14e92f79814fb491c51e9e6066d Mon Sep 17 00:00:00 2001 From: BaerMitUmlaut Date: Tue, 17 Jan 2023 13:24:46 +0100 Subject: [PATCH 097/111] Add function to create UUIDs (#1459) --- addons/common/CfgFunctions.hpp | 1 + addons/common/fnc_createUUID.sqf | 40 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 addons/common/fnc_createUUID.sqf diff --git a/addons/common/CfgFunctions.hpp b/addons/common/CfgFunctions.hpp index 118b7ed605..17478a7557 100644 --- a/addons/common/CfgFunctions.hpp +++ b/addons/common/CfgFunctions.hpp @@ -134,6 +134,7 @@ class CfgFunctions { PATHTO_FNC(waitAndExecute); PATHTO_FNC(waitUntilAndExecute); PATHTO_FNC(compileFinal); + PATHTO_FNC(createUUID); }; class Broken { diff --git a/addons/common/fnc_createUUID.sqf b/addons/common/fnc_createUUID.sqf new file mode 100644 index 0000000000..919ba9234a --- /dev/null +++ b/addons/common/fnc_createUUID.sqf @@ -0,0 +1,40 @@ +#include "script_component.hpp" +/* ---------------------------------------------------------------------------- +Function: CBA_fnc_createUUID + +Description: + Creates a version 4 UUID (universally unique identifier). + +Parameters: + None + +Returns: + UUID [String] + +Example: + (begin example) + private _uuid = call CBA_fnc_createUUID; + (end) + +Author: + BaerMitUmlaut +--------------------------------------------------------------------------- */ +SCRIPT(createUUID); + +private _hexDigits = [ + "0", "1", "2", "3", "4", "5", "6", "7", + "8", "9", "a", "b", "c", "d", "e", "f" +]; +private _versionByte = "4"; +private _variantByte = selectRandom ["8", "9", "a", "b"]; + +private _uuid = []; +for "_i" from 0 to 29 do { + _uuid pushBack selectRandom _hexDigits; +}; + +_uuid insert [8, ["-"]]; +_uuid insert [13, ["-", _versionByte]]; +_uuid insert [17, ["-", _variantByte]]; +_uuid insert [22, ["-"]]; +_uuid joinString "" From f07a4d639f2354057bfa1e843f84973c315a0299 Mon Sep 17 00:00:00 2001 From: Psycool Date: Tue, 21 Feb 2023 07:07:40 +0900 Subject: [PATCH 098/111] Korean Translation Added Korean translation 100% completed in current version. --- addons/accessory/stringtable.xml | 9 +++++ addons/ai/stringtable.xml | 4 +++ addons/arrays/stringtable.xml | 1 + addons/characters/stringtable.xml | 2 ++ addons/common/stringtable.xml | 3 ++ addons/diagnostic/stringtable.xml | 12 +++++++ addons/disposable/stringtable.xml | 15 +++++++-- addons/events/stringtable.xml | 9 +++++ addons/hashes/stringtable.xml | 1 + addons/help/stringtable.xml | 4 +++ addons/jam/stringtable.xml | 1 + addons/jr/stringtable.xml | 2 ++ addons/keybinding/stringtable.xml | 4 +++ addons/main/stringtable.xml | 6 ++++ addons/modules/stringtable.xml | 52 +++++++++++++++++++++++++++++ addons/music/stringtable.xml | 1 + addons/network/stringtable.xml | 10 ++++++ addons/optics/stringtable.xml | 4 +++ addons/settings/stringtable.xml | 35 +++++++++++++++++++ addons/statemachine/stringtable.xml | 1 + addons/strings/stringtable.xml | 3 ++ addons/ui/stringtable.xml | 22 ++++++++++++ addons/vectors/stringtable.xml | 1 + addons/versioning/stringtable.xml | 1 + addons/xeh/stringtable.xml | 1 + optionals/legacy_jr/stringtable.xml | 1 + 26 files changed, 203 insertions(+), 2 deletions(-) diff --git a/addons/accessory/stringtable.xml b/addons/accessory/stringtable.xml index e743adf6ac..a4523ccd14 100644 --- a/addons/accessory/stringtable.xml +++ b/addons/accessory/stringtable.xml @@ -13,6 +13,7 @@ Community Base Addons - Aksesuar Fonksiyonları Community Base Addons - Funzioni per Accessori Community Base Addons - Funkce doplňků + 커뮤니티 베이스 애드온 - 부착물 기능 Next rail item state @@ -26,6 +27,7 @@ Sonraki ray aksesuarı Stato successivo dell'oggetto sulla slitta Další režim doplňku na liště + 다음 레일 아이템 상태 Cycles to the next mode available for your rail slot attachment @@ -39,6 +41,7 @@ Ray aksesuarınızı sonraki moda geçirir Passa alla modalità successiva del tuo accessorio sulla slitta Přepíná na další možný režim doplňku na liště + 레일 부착물에 이용 가능한 다음 모드로 전환 Prev rail item state @@ -52,6 +55,7 @@ Önceki ray aksesuarı Stato precedente dell'oggetto sulla slitta Předchozí režim doplňku na liště + 이전 레일 아이템 상태 Cycles to the previous mode available for your rail slot attachment @@ -65,6 +69,7 @@ Ray aksesuarınızı önceki moda geçirir Passa alla modalità precedente del tuo accessorio sulla slitta Přepíná na předchozí možný režim doplňku na liště + 레일 부착물에 이용 가능한 이전 모드로 전환 Next optics state @@ -78,6 +83,7 @@ Sonraki nişangah modu Stato successivo dell'ottica Další režim zaměřovače + 다음 광학장치 상태 Cycles to the next mode available for your optics slot attachment @@ -91,6 +97,7 @@ Varolan nişangahınızı sonraki moduna geçirir Passa alla modalità successiva della tua ottica Přepíná na další možný režim doplňku slotu pro zaměřovač + 광학장치 부착물에 이용 가능한 다음 모드로 전환 Prev optics state @@ -104,6 +111,7 @@ Önceki nişangah modu Stato precedente dell'ottica Předchozí režim zaměřovače + 이전 광학장치 상태 Cycles to the previous mode available for your optics slot attachment @@ -117,6 +125,7 @@ Varolan nişangahınızı önceki moduna geçirir Passa alla modalità precedente della tua ottica Přepíná na předchozí možný režim doplňku slotu pro zaměřovač + 광학장치 부착물에 이용 가능한 이전 모드로 전환 diff --git a/addons/ai/stringtable.xml b/addons/ai/stringtable.xml index cfb880e3a4..ceaec1176a 100644 --- a/addons/ai/stringtable.xml +++ b/addons/ai/stringtable.xml @@ -13,6 +13,7 @@ Community Base Addons - Yapay Zeka Community Base Addons - Intelligenza Artificiale Community Base Addons - Umělá inteligence + 커뮤니티 베이스 애드온- 인공지능 AI Building Position @@ -26,6 +27,7 @@ ИИ Место строительства Pozycja AI w budynku Posizione edificio AI + 인공지능 건물 위치 Invisible Target Soldier @@ -52,6 +54,7 @@ 隐形目标（车辆） Neviditelný cíl (Vozidlo) Obiettivo invisibile - Veicolo + 보이지 않는 표적 차량 Invisible Target Airplane @@ -62,6 +65,7 @@ 隐形目标（飞机） Neviditelný cíl (Letoun) Obiettivo invisibile - Velivolo + 보이지 않는 표적 항공기 diff --git a/addons/arrays/stringtable.xml b/addons/arrays/stringtable.xml index afe94eb329..49b37d445e 100644 --- a/addons/arrays/stringtable.xml +++ b/addons/arrays/stringtable.xml @@ -13,6 +13,7 @@ Community Base Addons - Diziler Community Base Addons - Array Community Base Addons - Pole + 커뮤니티 베이스 애드온 - 어레이 diff --git a/addons/characters/stringtable.xml b/addons/characters/stringtable.xml index 09286763b7..6ab5166fa1 100755 --- a/addons/characters/stringtable.xml +++ b/addons/characters/stringtable.xml @@ -9,6 +9,7 @@ 社區基礎插件 - 角色 社区基础插件-角色 Community Base Addons - Personaggi + 커뮤니티 베이스 애드온 - 캐릭터 Men (Malaria-Infected) @@ -18,6 +19,7 @@ 男子(瘧疾感染者) 男子(疟疾感染者) Uomo (Infetto da malaria) + 사람(말라리아 감염) diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index 4bab0c762b..d8102a1508 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -13,6 +13,7 @@ Community Base Addons - Ortak Bileşenler Community Base Addons - Componenti Comuni Community Base Addons - Společná součást + 커뮤니티 베이스 애드온 - 일반 구성 요소 You must first start a mission. @@ -26,6 +27,7 @@ 你必須先加載世界或執行一個任務。 你必须先开始一个任务。 Вначале необходимо запустить миссию. + 미션을 먼저 시작해야 합니다. CBA Weapons @@ -39,6 +41,7 @@ CBA 武器 CBA Armes CBA Оружие + CBA 무기 diff --git a/addons/diagnostic/stringtable.xml b/addons/diagnostic/stringtable.xml index 121a8fd152..3d7e48ff1d 100644 --- a/addons/diagnostic/stringtable.xml +++ b/addons/diagnostic/stringtable.xml @@ -14,6 +14,7 @@ Community Base Addons - Diagnostica Community Base Addons - Diagnostika Community Base Addons - Diagnósticos + 커뮤니티 베이스 애드온 - 진단 Extended Debug Console @@ -28,6 +29,7 @@ Console debug estesa Rozšířená ladící konzole Consola Extendida de Depuración + 확장 디버그 콘솔 Previous Statement @@ -42,6 +44,7 @@ Espressione Prec. Předchozí zpráva Expresión Anterior + 이전 명령 Next Statement @@ -56,6 +59,7 @@ Espressione Succ. Následující zpráva Expresión Siguiente + 다음 명령 Target Exec @@ -70,6 +74,7 @@ Esegui Remoto Cílový exec Ejecutiva de Objetivo + 대상 실행 Enable Target Debugging @@ -84,6 +89,7 @@ Attiva il debug remoto Zapnout cílové ladění Activar Depuración de Objetivo + 대상 디버깅 활성화 [CBA] Allows remote target debugging. Requires Debug Console. @@ -98,6 +104,7 @@ [CBA] Abilita il debug remoto. Richiede la console di debug. [CBA] Povoluje ladění vzdáleného cíle. Vyžaduje ladící konzoli. [CBA] Permite la depuración de objetivos remotos. Requiere consola de depuración. + [CBA] 원격 대상 디버깅을 허용합니다. 디버그 콘솔 필요 Debug Console Indentation @@ -108,6 +115,7 @@ 调试控制台缩进 Odsazení ladící konzole Indentazione console di debug + 디버그 콘솔 들여쓰기 Type of indentation that can be added to expression in the debug console by pressing Tab key or removed by pressing Shift + Tab. @@ -118,18 +126,21 @@ 可以通过按 Tab 键为添加到调试控制台中的表达式缩进或通过按 Shift + Tab 键为其删除缩进。 Typ odsazení, které lze přidat do výrazu v ladicí konzoli stisknutím klávesy Tab nebo odstranit stisknutím Shift + Tab. Il tipo di intentazione che può essere aggiunta all'espressione nella console di debug premendo il tasto Tab o rimossa premendo Shift + Tab + Tab 키를 눌러서 디버그 콘솔의 식에 추가하거나 Shift + Tab을 눌러 제거할 수 있는 들여쓰기 유형입니다. Refresh rate target watcher field 刷新率 刷新率 Pole cílového sledování obnovovací frekvence + 대상 관찰자 필드 새로 고침 빈도 Refresh rate (in seconds) for the CBA target watcher fields to the right of the debug console. 調試控制台右側的 CBA 目標監視器字段的刷新率（以秒為單位）。 调试控制台右侧的 CBA 目标监视器字段的刷新率（以秒为单位）。 Obnovovací frekvence (v sekundách) pro pole sledování cíle CBA napravo od konzole ladění. + 디버그 콘솔 오른쪽에 있는 CBA의 대상 관찰자 필드의 새로 고침 빈도입니다. (초 단위) 4 Spaces @@ -140,6 +151,7 @@ 4 个空格 4 mezery 4 Spazi + 4 공간 diff --git a/addons/disposable/stringtable.xml b/addons/disposable/stringtable.xml index 916a96bfb9..8193925c14 100644 --- a/addons/disposable/stringtable.xml +++ b/addons/disposable/stringtable.xml @@ -13,6 +13,7 @@ Community Base Addons - Одноразовое оружие Community Base Addons - Bronie jednorazowe Community Base Addons - Armi monouso + 커뮤니티 베이스 애드온 - 일회용 무기 Drop Used Disposable Launcher @@ -26,6 +27,7 @@ Выбрасывать использованный одноразовый гранатомёт Wyrzuć zużyty przedmiot Butta lanciatore usato + 사용한 일회용 발사기 떨어뜨리기 Never @@ -39,6 +41,7 @@ Никогда Nigdy Mai + 없음 Don't automatically drop the used disposable launcher. @@ -52,6 +55,7 @@ Не выбрасывать автоматически использованный одноразовый гранатомёт. Nie wyrzucaj automatycznie wyrzutni jednorazowej. Non buttare automaticamente il lanciatore usato. + 사용한 일회용 발사기를 자동으로 떨어뜨리지 않습니다. AI Only @@ -65,6 +69,7 @@ Только ИИ Tylko AI Solo AI + 인공지능만 Only AI drops the used disposable launcher. @@ -78,6 +83,7 @@ Только ИИ выбрасывает использованный одноразовый гранатомёт. Tylko AI wyrzuca wyrzutnie jednorazową. Solo le unità AI buttano il lanciatore usato. + 인공지능만이 사용한 일회용 발사기를 떨어뜨립니다. Selected Another Weapon @@ -90,7 +96,8 @@ Si autre arme sélectionnée Выбрано другое оружие Wybierz inną Broń - Seleziona un'altra arma + Seleziona un'altra arma + 다른 무기 선택 Automatically drop the used disposable launcher as soon as another weapon is selected. @@ -103,7 +110,9 @@ Lâche automatiquement le lanceur usagé dès qu'une autre arme est sélectionnée. Автоматически выбрасывать использованный одноразовый гранатомёт, как только будет выбрано другие оружие. Automatycznie wyrzucaj wyrzutnie jednorazową gdy tylko zostanie wybrana kolejna broń. - Butta automaticamente il lanciatore usato non appena un'altra arma viene selezionata + Butta automaticamente il lanciatore usato non appena un'altra arma viene selezionata + 다른 무기를 선택하는 즉시 사용한 일회용 발사기를 자동으로 떨어뜨립니다. + Replace Disposable Launcher @@ -117,6 +126,7 @@ Заменять одноразовые гранатомёты Zamien wyrzutnie jednorazową Sostituisci lanciatore monouso + 일회용 발사기 대체 If enabled, disposable launchers can only be used once. Ammunition for disposable launchers in containers and vehicles will be replaced with loaded disposable launchers. If disabled, disposable launchers can be reloaded after use. @@ -130,6 +140,7 @@ Если включено, одноразовые гранатомёты могут быть использованы лишь один раз. Боеприпасы для них в контейнерах и технике будут заменены на соответствующие им заряженные одноразовые гранатомёты. Если выключено, одноразовые гранатомёты могут быть перезаряжены и использованы повторно. Gdy ta opcja jest włączona wyrzutnie jednorazowe mogą być użyte tylko raz, Amunicja do wyrzutni jednorazowych dostępna w kontenerach i pojazdach zostanie zamieniona w załadowaną wyrzutnie jednorazową. Jeżeli ta opcja jest wyłączona, wtedy wyrzutnie jednorazowe nie zostaną przeładowane po użyciu. Se abilitato, i lanciatori monouso possono essere usati una sola volta. Le munizioni per i lanciatori monouso che si trovano nei contenitori e nei veicoli saranno sostituiti con lanciatori monouso carichi. Se disabilitato, i lanciatori monouso possono essere ricaricati dopo l'uso. + 활성화 시 일회용 발사기는 한번만 사용 가능합니다. 컨테이너와 차량에 담긴 일회용 발사기 탄약은 장전된 일회용 발사기로 대체됩니다. 비활성화 시 사용 후 일회용 발사기를 재장전할 수 있습니다. diff --git a/addons/events/stringtable.xml b/addons/events/stringtable.xml index 6744976f25..dabbf8b2eb 100644 --- a/addons/events/stringtable.xml +++ b/addons/events/stringtable.xml @@ -13,6 +13,7 @@ Community Base Addons - Durumlar Community Base Addons - Eventi Community Base Addons - Události + 커뮤니티 베이스 애드온 - 이벤트 Weapon Repetition Mode @@ -26,6 +27,7 @@ Mode de réarmement Режим повторной стрельбы Modalità di ricarica dell'arma + 무기 반복 모드 Mode of bolting or pumping weapons. @@ -39,6 +41,7 @@ Mode de réarmement des armes à verrou et à pompe. Режим повторной стрельбы помпового оружия или оружия с продольно-скользящим затвором. Modalità di ricarica o riarmo delle armi. + 무기를 볼트나 펌프로 수동장전하는 모드입니다. Leave Optics View @@ -52,6 +55,7 @@ Maintenir vue lunette Выход из прицела Esci dalla vista ottica + 조준 화면 벗어나기 Bolt or rack weapon by leaving optics view. @@ -65,6 +69,7 @@ Réarme l'arme tout en maintenant la visée dans la lunette. Перезаряжать оружие после выхода из прицела. Ricarica l'arma uscendo dalla vista dell'ottica. + 볼트나 펌프 장전 시 조준 화면을 벗어납니다. Release Trigger @@ -78,6 +83,7 @@ Relâcher la détente Отпускание курка Rilascia il grilletto + 방아쇠 놓기 Bolt or rack weapon by releasing trigger (hold trigger to prevent immediate action). @@ -91,6 +97,7 @@ Réarme l'arme au relâchement de la détente (maintenir la détente enfoncée pour éviter le réarmement immédiat). Перезаряжать оружие после отпускания курка (держите курок чтобы не перезаряжать). Ricarica l'arma rilasciando il grilletto (mantieni premuto il grilletto per prevenire la ricarica immediata). + 발사 키를 놓음으로써 볼트나 펌프 장전을 합니다.(즉각적인 행동을 방지하기 위해 발사 키를 꾹 누르십시오) Press Trigger @@ -104,6 +111,7 @@ Presser la détente Нажатие курка Premi il grilletto + 방아쇠 누르기 Bolt or rack weapon by pressing the trigger again. @@ -117,6 +125,7 @@ Réarme l'arme en pressant la détente encore une fois. Перезаряжать оружие повторным нажатием на курок. Ricarica l'arma premendo nuovamente il grilletto + 발사 키를 다시 누르면 볼트나 펌프 장전을 합니다. diff --git a/addons/hashes/stringtable.xml b/addons/hashes/stringtable.xml index f98a9f9872..938ec359a7 100644 --- a/addons/hashes/stringtable.xml +++ b/addons/hashes/stringtable.xml @@ -13,6 +13,7 @@ Community Base Addons - Hashler Community Base Addons - Hash Community Base Addons - Hashe + 커뮤니티 베이스 애드온 - 해쉬 diff --git a/addons/help/stringtable.xml b/addons/help/stringtable.xml index 8fb3dc2631..69fe277922 100644 --- a/addons/help/stringtable.xml +++ b/addons/help/stringtable.xml @@ -14,6 +14,7 @@ Community Base Addons - Yardım Community Base Addons - Aiuto Community Base Addons - Pomoc + 커뮤니티 베이스 애드온 - 도움 Keybindings @@ -29,6 +30,7 @@ 按鍵綁定 按键绑定 Klavye Tuşları + 키 설정 Credits @@ -44,6 +46,7 @@ 製作組 制作组 Yapımcılar + 크레딧 Addons @@ -59,6 +62,7 @@ 模組 模组 Modüller + 애드온 diff --git a/addons/jam/stringtable.xml b/addons/jam/stringtable.xml index 79f3a80fd1..ef31f3bb2a 100644 --- a/addons/jam/stringtable.xml +++ b/addons/jam/stringtable.xml @@ -12,6 +12,7 @@ 社群基礎模組 - 聯合彈匣 社区基础插件—通用弹匣 Community Base Addons - Общие патроны и магазины + 커뮤니티 베이스 애드온 - 탄약 및 탄창 통합 Caliber: 7.62x51 mm Tracer - Green<br/>Rounds: 150 diff --git a/addons/jr/stringtable.xml b/addons/jr/stringtable.xml index 6af9ae0e6c..4779df8d8b 100644 --- a/addons/jr/stringtable.xml +++ b/addons/jr/stringtable.xml @@ -13,6 +13,7 @@ Community Base Addons - Birleştirilmiş Raylar Community Base Addons - Joint Rails Community Base Addons - Joint Rails + 커뮤니티 베이스 애드온 - 레일 통합 Sound Suppressor MG @@ -28,6 +29,7 @@ 機槍用消音器 机枪用消音器 Community Base Addons - MG Susturucusu + 소음기(기관총) diff --git a/addons/keybinding/stringtable.xml b/addons/keybinding/stringtable.xml index 08957d1944..6fc447b828 100644 --- a/addons/keybinding/stringtable.xml +++ b/addons/keybinding/stringtable.xml @@ -14,6 +14,7 @@ Community Base Addons - Klavye Tuşları Community Base Addons - Configurazione Tasti Community Base Addons - Klávesy + 커뮤니티 베이스 애드온 - 키 설정 Configure Addons @@ -28,6 +29,7 @@ Eklentileri Düzenle Configura gli addon Konfigurovat addony + 애드온 설정 Configure Base @@ -42,6 +44,7 @@ Temeli Düzenle Configura il gioco base Konfigurovat základ + 기본 설정 Unknown Key %1 @@ -56,6 +59,7 @@ Bilinmeyen Tuş %1 "%1" è un tasto sconosciuto Neznámá klávesa %1 + %1 키는 미지정입니다 diff --git a/addons/main/stringtable.xml b/addons/main/stringtable.xml index bacede3cc2..22417187e7 100644 --- a/addons/main/stringtable.xml +++ b/addons/main/stringtable.xml @@ -14,6 +14,7 @@ CBA Takımı Squadra CBA CBA tým + CBA 팀 https://www.github.com/CBATeam/CBA_A3 @@ -30,6 +31,7 @@ https://www.github.com/CBATeam/CBA_A3 https://www.github.com/CBATeam/CBA_A3 https://www.github.com/CBATeam/CBA_A3 + https://www.github.com/CBATeam/CBA_A3 Community Base Addons @@ -44,6 +46,7 @@ Community Base Addons Community Base Addons Community Base Addons + 커뮤니티 베이스 애드온 Community Base Addons - Main Component @@ -58,6 +61,7 @@ Community Base Addons - Ana Bileşenler Community Base Addons - Componente Principale Community Base Addons - Hlavní součást + 커뮤니티 베이스 애드온 - 메인 구성 요소 Community Base Addons - Optional Component @@ -72,6 +76,7 @@ Community Base Addons - Opsiyonel Bileşenler Community Base Addons - Componente Opzionale Community Base Addons - Volitelná součást + 커뮤니티 베이스 애드온 - 선택적 요소 ADDON: @@ -85,6 +90,7 @@ EKLENTİ: ADDON: ADDON: + 애드온: diff --git a/addons/modules/stringtable.xml b/addons/modules/stringtable.xml index 1a80accf2c..6dcae96b81 100644 --- a/addons/modules/stringtable.xml +++ b/addons/modules/stringtable.xml @@ -13,6 +13,7 @@ Community Base Addons - Modüller Community Base Addons - Moduli Community Base Addons - Moduly + 커뮤니티 베이스 애드온 - 모듈 CBA Modules @@ -26,6 +27,7 @@ CBA Modülleri CBA - Moduli CBA Moduly + CBA 모듈 Attack @@ -39,6 +41,7 @@ Saldır Attaccare Útok + 공격 Attack Location Type @@ -52,6 +55,7 @@ Saldırı Konum Tipi Tipo di posizione per l'attacco Typ lokace útoku + 공격 위치 유형 Set what kind of object is being passed as the center point @@ -65,6 +69,7 @@ Merkez noktası olarak nasıl bir objenin verildiğini gör Scegliere quale oggetto passare al punto centrale Určit, jaký typ objektu je nastaven jako centrální bod + 중앙 지점으로 통과시킬 개체 종류를 설정합니다 Module Position @@ -78,6 +83,7 @@ Modül Konumu Posizione del modulo Pozice modulu + 모듈 위치 Object/Location @@ -91,6 +97,7 @@ Obje/Konum Posizione oggetto Objekt/Lokace + 개체/위치 Group @@ -104,6 +111,7 @@ Grup Gruppo Skupina + 그룹 Array @@ -117,6 +125,7 @@ Liste Array Pole + 어레이 Marker @@ -130,6 +139,7 @@ İşaret Indicatore Značka + 마커 Task @@ -143,6 +153,7 @@ Görev Incarico Úkol + 과업 Set Position @@ -156,6 +167,7 @@ Konum Belirle Posiziona Nastavit pozici + 지정 위치 Attack Position @@ -169,6 +181,7 @@ Saldırı Konumu Posizione per l'attacco Pozice útoku + 공격 위치 Enter an array with brackets or name without quotes @@ -182,6 +195,7 @@ Parantezler olmadan bir liste ya da tırnaklar olmadan bir isim girin Inserire un array in parentesi quadre o nome in doppi apici. Zadejte pole hodnot se závorkami nebo jméno bez závorek + 대괄호가 있는 어레이 또는 따옴표가 없이 이름 입력합니다 Search Radius @@ -195,6 +209,7 @@ Arama Menzili Raggio di ricerca Rádius hledání + 반경 수색 Enter a number for size of the radius to search @@ -208,6 +223,7 @@ Aranıcak alanın çapı için bir sayı girin Immettere un numero per la dimensione del raggio in cui cercare Vložte číslo pro velikost rádiu hledání + 수색할 반경의 크기에 대한 숫자를 입력합니다 Sync to leader of group to attack a parsed location @@ -221,6 +237,7 @@ Bir grup liderine senkronize ederek taranmış bir konuma saldırtın Sincronizza con un capogruppo per attaccare una posizione designata. Synchronizovat s velitelem skupiny k útoku na danou lokaci + 분석된 위치를 공격할 그룹의 리더와 동기화합니다 Allow Override @@ -234,6 +251,7 @@ Üstüne Yazmayı Etkinleştir Permettere Sovrascrittura Povolit přepsání + 덮어쓰기 허용 Allow the module to remove old waypoints and assign an attack waypoint @@ -247,6 +265,7 @@ Modülün eski waypoint'leri silip saldırı waypoint'i koymasına izin ver Permette al modulo di togliere waypoint precedenti e assegnarne uno di attacco. Povolit modulu odstranit staré waypointy a přiřadit waypoint k útoku + 모듈이 이전 경유지를 제거하고 공격 경유지를 할당하도록 허용합니다 Defend @@ -260,6 +279,7 @@ Savun Difendere Bránit + 방어 Defend Position Type @@ -273,6 +293,7 @@ Savunma Konum Tipi Tipo di posizione per la difesa Typ pozice útoku + 방어 위치 유형 Set what kind of object is being passed as the center point @@ -286,6 +307,7 @@ Merkez noktası olarak nasıl bir objenin verildiğini gör Scegliere quale oggetto passare al punto centrale Určit, jaký typ objektu je nastaven jako centrální bod + 중앙 지점으로 통과시킬 개체 종류를 설정합니다 Defend Position @@ -299,6 +321,7 @@ Konumu Savun Difendere Posizione Bránit pozici + 방어 위치 Enter an array with brackets or name without quotes @@ -312,6 +335,7 @@ Parantezler olmadan bir liste ya da tırnaklar olmadan bir isim girin Inserire un array in parentesi quadre o nome in doppi apici. Zadejte pole hodnot se závorkami nebo jméno bez závorek + 대괄호가 있는 어레이 또는 따옴표가 없이 이름 입력합니다 Defend Radius @@ -325,6 +349,7 @@ Belli Bir Çapı Savun Raggio di Difesa Rádius obrany + 방어 반경 The max distance to defend from the center point @@ -338,6 +363,7 @@ Merkez noktadan savunulacak maksimum uzaklık Distanza massima dal punto centrale entro cui difendere. Maximální vzdálenost obrany od centrálního bodu + 중앙 지점으로부터 방어할 최대 거리 Building Size Threshold @@ -351,6 +377,7 @@ Bina Boyutu Limiti Soglia Dimensione Edificio Práh velikosti stavby + 건물 크기 임계값 Smaller the number the more buildings available @@ -364,6 +391,7 @@ Sayı küçüldükçe daha fazla sayıda bina mümkün olur Più piccolo il numero più edifici saranno disponibili Čím menší číslo tím více budov je k dispozici + 숫자가 작을수록 더 많은 건물을 사용할 수 있습니다 Patrol Chance @@ -377,6 +405,7 @@ Devriye İhtimali Probabilità di pattugliare Šance hlídky + 순찰 확률 Chance for each unit to patrol instead of garrison @@ -390,6 +419,7 @@ Devriye İhtimali Probabilità per ogni unità di pattugliare invece che presidiare. Šance, že bude jednotka hlídkovat (místo tvorby opevnění) + 각 유닛이 주둔 대신 순찰할 확률 Hold Chance @@ -403,6 +433,7 @@ Tutma İhtimali Probabilità di tenuta Šance držení + 위치 사수 확률 Chance for each unit to hold their garrison in combat @@ -416,6 +447,7 @@ Birimlerin çatışma sırasında konumlarını koruma şansı Probabilità per ogni unità di tenere il presidio durante il combattimento. Šance, že bude jednotka držet své opevnění v boji + 각 유닛이 전투 시 주둔지에 위치 사수할 확률 Sync to leader of group to defend a parsed location @@ -429,6 +461,7 @@ Bir grup liderine senkronize ederek taranmış bir konumu savundurun Sincronizza con un capogruppo per difendere una posizione designata. Synchronizovat s velitelem skupiny k obraně dané lokace + 분석된 위치를 방어할 그룹의 리더와 동기화합니다 Patrol @@ -442,6 +475,7 @@ Devriye Pattugliare Hlídka + 순찰 Patrol Center Type @@ -455,6 +489,7 @@ Devriye Merkez Tipi Tipo del centro del pattugliamento Typ centra hlídky + 순찰 위치 유형 Set what kind of object is being passed as the center point @@ -468,6 +503,7 @@ Merkez noktası olarak nasıl bir objenin verildiğini gör Imposta il tipo di oggetto che viene usato come punto centrale. Určit, jaký typ objektu je nastaven jako centrální bod + 중앙 지점으로 통과시킬 개체 종류를 설정합니다 Center Point @@ -481,6 +517,7 @@ Merkez Nokta Punto Centrale Centrální bod + 중앙 지점 Enter an array with brackets or name without quotes @@ -494,6 +531,7 @@ Parantezler olmadan bir liste ya da tırnaklar olmadan bir isim girin Inserire un array in parentesi quadre o nome in doppi apici. Zadejte pole hodnot se závorkami nebo jméno bez závorek + 대괄호가 있는 어레이 또는 따옴표가 없이 이름 입력합니다 Patrol Radius @@ -507,6 +545,7 @@ Devriye Çapı Raggio di Pattugliamento Rádius hlídky + 순찰 반경 The distance to patrol from the center point @@ -520,6 +559,7 @@ Merkez noktadan devriyeye çıkılacak uzaklık La distanza da pattugliare dal punto centrale. Nastavit vzdálenost od centrálního bodu k hlídce + 중앙 지점으로부터 순찰하는 거리입니다 Waypoint Count @@ -533,6 +573,7 @@ Waypoint Sayısı Numero di destinazioni Počet waypointů + 경유지 수 The amount of waypoints to create @@ -546,6 +587,7 @@ Oluşturulacak Waypoint Sayısı Quantità di destinazioni da creare. Kolik waypointů bude vytvořeno + 생성할 경유지의 양 Waypoint Type @@ -559,6 +601,7 @@ Waypoint Tipi Tipo di destinazioni Typ waypointu + 경유지 유형 The type of waypoint to be used @@ -572,6 +615,7 @@ Kullanılacak waypoint tipi Il tipo di destinazione da usare. Typ waypointu, který bude použit + 사용할 경유지의 유형 Move @@ -585,6 +629,7 @@ Hareket Et Muovere Pohyb + 이동 Seek and Destroy @@ -598,6 +643,7 @@ Bul ve Yok Et Cercare e Distruggere Najít a zničit + 수색격멸 Loiter @@ -611,6 +657,7 @@ Bekle Indugiare Postávat + 배회 Code to Execute @@ -624,6 +671,7 @@ Çalıştırılacak Kod Codice da eseguire Kód k vykonání + 실행할 코드 Any code to run at waypoints @@ -637,6 +685,7 @@ Waypoint'lerde çalıştırılacak herhangi kod Codice da eseguire alla destinazione. Jakýkoliv kód, který bude vykonán na waypointech + 경유지에서 실행할 코드 Timeout @@ -650,6 +699,7 @@ Zaman Aşımı Tempo di attesa Přestávka + 대기 [Min, Med, Max] Time to wait at waypoints @@ -663,6 +713,7 @@ [Minimum, Orta, Maksimum] Waypoint'lerde beklenecek zaman [Min, Med, Mass] Tempo di attesa alla destinazione. [Min., Stř., Max.] Čas čekání na waypointech + [최소, 중간, 최대] 경유지에서 대기하는 시간 Sync to leader of group to patrol a parsed location @@ -676,6 +727,7 @@ Bir grup liderine senkronize ederek taranmış bir konumu devriye ettirin Sincronizza con un capogruppo per pattugliare una posizione designata. Synchronizovat s velitelem skupiny k hlídkování v dané lokaci + 분석된 위치를 방어할 그룹의 리더와 동기화합니다 diff --git a/addons/music/stringtable.xml b/addons/music/stringtable.xml index 1311af89a0..45e521d2b0 100644 --- a/addons/music/stringtable.xml +++ b/addons/music/stringtable.xml @@ -14,6 +14,7 @@ Community Base Addons - Müzik Community Base Addons - Musica Community Base Addons - Hudba + 커뮤니티 베이스 애드온 - 음악 diff --git a/addons/network/stringtable.xml b/addons/network/stringtable.xml index 1138990be5..0a977accf9 100644 --- a/addons/network/stringtable.xml +++ b/addons/network/stringtable.xml @@ -14,6 +14,7 @@ CBA Ağ CBA Rete CBA Síť + CBA 네트워크 Network @@ -28,6 +29,7 @@ Ağ Rete Síť + 네트워크 Loadout Validation @@ -37,6 +39,7 @@ 驗證加載 验证加载 Verifica l'equipaggiamento + 로드아웃 검사 Validate loadout of units. Fixes an issue where units appear naked after changing locality. @@ -47,6 +50,7 @@ 验证单位加载。修复单位在更改大厅位置后显示为裸体的问题。 Ověřovat výbavu jednotek. Opravuje problém s nahými jednotkami když mění lokálnost. Verifica l'equipaggiamento delle unità. Corregge un bug che faceva apparire un'unità nuda dopo aver cambiato località. + 유닛의 로드아웃을 확인합니다. 위치를 변경한 후 유닛이 알몸인 상태로 나타나는 문제를 해결합니다. Never @@ -57,6 +61,7 @@ 从不 Nikdy Mai + 없음 Never validate loadouts @@ -67,6 +72,7 @@ 从不验证加载 Nikdy neověřovat výbavu Non validare mai gli equipaggiamenti + 로드아웃 검사하지 않음 Playable units only @@ -77,6 +83,7 @@ 仅可玩单位 Pouze hratelné jednotky Solo unità giocabili + 플레이 가능 유닛만 Validate only loadout of playable units @@ -87,6 +94,7 @@ 仅验证可玩单位的加载 Ověřovat pouze výbavu hratelných jednotek Valida solo le unità giocabili + 플레이 가능 유닛만 로드아웃 검사 All units @@ -97,6 +105,7 @@ 所有单位 Všechny jednotky Tutte le unità + 모든 유닛 Validate loadout of all units @@ -107,6 +116,7 @@ 验证所有单位的加载 Ověřovat výbavu všech jednotek Valida l'equipaggiamento di tutte unità + 모든 유닛의 로드아웃 검사 diff --git a/addons/optics/stringtable.xml b/addons/optics/stringtable.xml index 93e28e1b76..e9cb4e58dd 100644 --- a/addons/optics/stringtable.xml +++ b/addons/optics/stringtable.xml @@ -13,6 +13,7 @@ 社区基础插件—瞄具 Community Base Addons - Optiques Community Base Addons - Оптика + 커뮤니티 베이스 애드온 - 광학장치 Use Picture-in-Picture Optics @@ -26,6 +27,7 @@ 使用画中画（PiP）瞄具 Utiliser les optiques "picture in picture" Использовать оптические прицелы в режиме «картинка в картинке» (PIP) + PIP 광학장치 사용 Toggle Reticle @@ -39,6 +41,7 @@ Commuter le réticule Переключение сетки Przełącz siatke przyrządu + 조준점 전환 Manually switch the reticle of the optic. @@ -52,6 +55,7 @@ Commuter manuellement le réticule de l'optique. Вручную переключать сетку оптического прицела. Ręcznie przełącz siatkę przyrządu optycznego + 광학장치의 조준점을 수동으로 전환합니다. diff --git a/addons/settings/stringtable.xml b/addons/settings/stringtable.xml index cd98c5204f..cdeec5a463 100644 --- a/addons/settings/stringtable.xml +++ b/addons/settings/stringtable.xml @@ -14,6 +14,7 @@ Community Base Addons - Ayarlar Community Base Addons - Impostazioni Community Base Addons - Nastavení + 커뮤니티 베이스 애드온 - 설정 Configure Addons @@ -28,6 +29,7 @@ Eklenti Ayarları Configura gli addon Konfigurovat addony + 애드온 설정 Configure Base @@ -42,6 +44,7 @@ Oyun Ayarları Configura il gioco base Konfigurovat základ + 기본 설정 Addon Options @@ -56,6 +59,7 @@ Eklenti Ayarları Opzioni degli addon Možnosti addonu + 애드온 설정 Adjust addon settings. @@ -69,6 +73,7 @@ 調整插件設定。 调整插件设置。 Отрегулировать настройки дополнений. + 애드온 설정을 조정합니다. Addon Options... @@ -83,6 +88,7 @@ Eklenti Ayarları... Opzioni per gli addon ... Možnosti addonu... + 애드온 설정... Server @@ -97,6 +103,7 @@ Sunucu Server Server + 서버 Look at the server's settings. Log in as admin to change. @@ -111,6 +118,7 @@ Sunucu ayarlarına bak. Değiştirmek için admin olarak giriş yapın. Visualizza le impostazioni del server. Entra come amministratore per cambiarle. Podívejte se na nastavení serveru. Přihlaste se jako admin pro změnu. + 서버의 설정을 확인합니다. 관리자로 로그인해서 변경합니다. Mission @@ -125,6 +133,7 @@ Görev Missione Mise + 임무 Look at the mission's settings. @@ -139,6 +148,7 @@ Görev'in ayarlarına bak. Visualizza le impostazioni della missione. Podívejte se na nastavení mise. + 임무의 설정을 확인합니다. Edit the mission's settings. @@ -153,6 +163,7 @@ Görev'in ayarlarını değiştir. Cambia le impostazioni della missione. Upravit nastavení mise. + 임무의 설정을 편집합니다. Client @@ -167,6 +178,7 @@ Oyuncu Client Klient + 클라이언트 Edit your local settings. @@ -181,6 +193,7 @@ Yerel ayarlarınızı değiştirin. Cambia le tue impostazioni locali. Upravit vaše lokální nastavení. + 당신의 로컬 설정을 편집합니다. Local @@ -195,6 +208,7 @@ Yerel Locale Lokální + 로컬 Save current settings as preset. @@ -209,6 +223,7 @@ Şuanki ayaları şablon olarak kaydet. Salva le impostazioni attuali come predefinite Uložit nynější nastavení jako předvolbu. + 현재 설정을 프리셋으로 저장합니다. Load settings from preset. @@ -223,6 +238,7 @@ Şablondan ayarları yükle. Carica le impostazioni da quelle predefinite Načíst nastavení z předvolby. + 프리셋에서 설정을 가져옵니다. Import @@ -237,6 +253,7 @@ Import Importa Import + 가져오기 Import settings from clipboard. @@ -251,6 +268,7 @@ Ayarları panodan çek. Importa le impostazioni dagli appunti. Importovat nastavení ze schránky. + 클립보드로 설정을 가져옵니다. Export @@ -265,6 +283,7 @@ Export Esporta Export + 내보내기 Export settings to clipboard. @@ -279,6 +298,7 @@ Ayarları panoya kopyala. Esporta le impostazioni negli appunti. Exportovat nastavení do schránky. + 클립보드로 설정을 내보냅니다. Reset to default value. @@ -293,6 +313,7 @@ Varsayılan ayarlara geri dön. Reimposta ai valori originali. Resetovat na původní hodnotu. + 기본값으로 초기화합니다. Overwrite\nClients @@ -307,6 +328,7 @@ Oyunculara\nAyar Zorla Sovrascrive\ni client Přepsat \nClients + 클라이언트로\n덮어쓰기 Overwrite\nMission @@ -321,6 +343,7 @@ Göreve\nAyar Zorla Sovrascrive\nla missione Přepsat \nMission + 미션으로\n덮어쓰기 Overwrite\nServer @@ -335,6 +358,7 @@ Sunucuya\nAyar Zorla Sovrascrive\nil server Přepsat \nServer + 서버로\n덮어쓰기 This setting applies. @@ -348,6 +372,7 @@ 設定已套用。 设置已套用。 Этот параметр применён. + 이 설정을 적용합니다. This setting applies after the next mission restart. @@ -361,6 +386,7 @@ 這個設定將會在任務重置後生效 该设定将在任务重启后生效。 Этот параметр будет применён после рестарта миссии. + 이 설정은 다음 미션 재시작 후에 적용됩니다. This setting is overwritten by the clients. @@ -375,6 +401,7 @@ Oyuncular tarafından bu ayarın üstüne yazılmış. I client sovrascrivono questa impostazione. Toto nastavení je přepsáno klienty. + This setting is overwritten by the mission. @@ -389,6 +416,7 @@ Görev tarafından bu ayarın üstüne yazılmış. La missione sovrascrive questa impostazione. Toto nastavení je přepsáno misí. + This setting is overwritten by the server. @@ -403,6 +431,7 @@ Sunucu tarafından bu ayarın üstüne yazılmış. Il server sovrascrive questa impostazione. Toto nastavení je přepsáno serverem. + 이 설정은 서버에 의해 덮어씌워졌습니다. This setting is overwritten by the clients and only applies to the server. @@ -417,6 +446,7 @@ Oyuncular tarafından bu ayarın üstüne yazılmış, ayar sadece sunucuda geçerli. Questa impostazione è sovrascritta dai client e si applica solo al server. Toto nastavení je přepsáno klienty a platí pouze na serveru. + 이 설정은 클라이언트에 의해 덮어씌워졌고 서버에만 적용됩니다. Overwritten by client with the same value. @@ -428,6 +458,7 @@ 被客户端以相同的值覆盖。 Toto nastavení je přepsáno klienty stejnou hodnotou. Sovrascritto dal client con lo stesso valore. + 동일한 값을 가진 클라이언트에 의해 덮어씌워졌습니다. Overwritten by mission with the same value. @@ -439,6 +470,7 @@ 被任务以相同的值覆盖。 Toto nastavení je přepsáno misí stejnou hodnotou. Sovrascritto dalla missione con lo stesso valore. + 동일한 값을 가진 임무에 의해 덮어씌워졌습니다. Overwritten by server with the same value. @@ -450,6 +482,7 @@ 被服务器以相同的值覆盖。 Toto nastavení je přepsáno serverem stejnou hodnotou. Sovrascritto dal server con lo stesso valore. + 동일한 값을 가진 서버에 의해 덮어씌워졌습니다. Copy to clipboard @@ -463,6 +496,7 @@ Panoya kopyala Copia negli appunti Kopírovat do schránky + 클립보드로 복사 Show default values: @@ -476,6 +510,7 @@ Varsayılan değerleri göster: Mostra i valori originali: Ukázat původní hodnoty: + 기본값 표시: diff --git a/addons/statemachine/stringtable.xml b/addons/statemachine/stringtable.xml index 67d705744d..d381ba02ad 100644 --- a/addons/statemachine/stringtable.xml +++ b/addons/statemachine/stringtable.xml @@ -14,6 +14,7 @@ Community Base Addons - Durum Makinası Community Base Addons - Macchina a stati finiti Community Base Addons - State Machine + 커뮤니티 베이스 애드온 - 상태 머신 diff --git a/addons/strings/stringtable.xml b/addons/strings/stringtable.xml index 5677ad0e1a..8cc78612b7 100644 --- a/addons/strings/stringtable.xml +++ b/addons/strings/stringtable.xml @@ -14,6 +14,7 @@ Community Base Addons - Yazılar Community Base Addons - Stringhe Community Base Addons - Texty + 커뮤니티 베이스 애드온 - 스트링 . @@ -29,6 +30,7 @@ . , , + . , @@ -44,6 +46,7 @@ , . . + , diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index b453fb85db..4e3f4bc923 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -15,6 +15,7 @@ Community Base Addons - Interfaccia utente Community Base Addons - Uživatelské prostředí Community Base Addons - Interfaz de usuario + 커뮤니티 베이스 애드온 - 유저 인터페이스 User Interface @@ -31,6 +32,7 @@ 玩家界面 Interfaz de usuario Kullanıcı Arayüzü + 유저 인터페이스 Progress Bar @@ -45,6 +47,7 @@ Ukazatel průběhu Индикатор выполнения Barra de progreso + 상태 표시줄 Position of the progress bar. @@ -59,6 +62,7 @@ Pozici ukazatele průběhu. Позиция индикатора выполнения. Posición de la barra de progreso. + 상태 표시줄 위치 Store Server Passwords @@ -73,6 +77,7 @@ 存储服务器密码 Запоминать пароли серверов Almacenar contraseñas del servidor + 서버 암호 저장 Setting to store the passwords entered when connecting to a multiplayer server. @@ -87,6 +92,7 @@ 设置是否存储连接服务器时输入的密码。 Параметр запоминания паролей сервера при входе на них. Configuración para almacenar las contraseñas ingresadas al conectarse a un servidor multijugador. + 멀티플레이어 서버에 연결할 때 입력한 암호를 저장하도록 설정합니다. Save passwords @@ -101,6 +107,7 @@ 记住密码 Сохранять пароли Guardar contraseñas + 암호 저장 Passwords are stored when connecting to a multiplayer server. @@ -115,6 +122,7 @@ 连接到服务器时将记住密码 Пароли будут сохраняться при входе на сервера. Las contraseñas se almacenan cuando se conecta a un servidor multijugador + 암호는 멀티플레이어 서버에 연결할 때 저장됩니다. Do not save passwords @@ -129,6 +137,7 @@ 不保存密码 Не сохранять пароли No guarde las contraseñas + 암호 저장하지 않음 Passwords are not stored when connecting to a multiplayer server. Already stored passwords will not be automatically entered. @@ -143,6 +152,7 @@ 当连接到服务器时将不保存密码。已保存的密码将不自动填写。 Пароли не сохраняются при входе на сервера. Уже сохранённые пароли не будут автоматически вставлены. Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas no se ingresarán automáticamente. + 멀티플레이어 서버에 연결할 때 암호가 저장되지 않습니다. 이미 저장된 암호는 자동으로 입력되지 않습니다. Delete passwords @@ -157,6 +167,7 @@ 删除密码 Удалить пароли Eliminar contraseñas + 암호 삭제 Passwords are not stored when connecting to a multiplayer server. Already stored passwords are deleted from the profile. @@ -171,6 +182,7 @@ 当连接到服务器时将不保存密码。已保存的密码将会删除。 Пароли не сохраняются при входе на сервера. Уже сохранённые пароли будут удалены. Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas se eliminan del perfil. + 멀티플레이어 서버에 연결할 때 암호가 저장되지 않습니다. 이미 저장된 암호는 프로필에서 삭제됩니다. Notification @@ -185,6 +197,7 @@ Notification Уведомление Notificación + 알림 Textual feedback to the player. @@ -199,6 +212,7 @@ Notification textuelle au joueur. Текстовая информация для игрока. Comentarios textuales para el jugador + 플레이어에 대한 텍스트 피드백입니다, Show all missions @@ -213,6 +227,7 @@ Afficher toutes les missions Показать все миссии Mostrar todas las misiones + 모든 미션 보이기 Show custom missions @@ -227,6 +242,7 @@ Afficher les missions personnalisées Показать пользовательские миссии Mostrar misiones personalizadas + 커스텀 미션 보이기 Notification Lifetime @@ -241,6 +257,7 @@ Długość żywotności powiadomień Duración de la notificación Durata notifica + 알림 지속시간 Notification display duration in seconds. @@ -255,6 +272,7 @@ Ilość czasu przez który widoczne jest powiadomienie Duración de la visualización de notificaciones en segundos Durata della notifica in secondi. + 알림이 표시되는 시간입니다. (초 단위) Contact the server admin. @@ -269,6 +287,7 @@ Póngase en contacto con el administrador del servidor Kontaktujte správce serveru. Contatta l'amministratore del server. + 서버 관리자에게 문의하십시오. Lobby Manager @@ -280,6 +299,7 @@ 角色大厅管理 Manažer lobby Gestore lobby. + 로비 매니저 Adjusting group order... @@ -291,6 +311,7 @@ 调整小队顺序 Upravuji pořadí skupiny... Riordinando il gruppo... + 그룹 순서 조정 중... Back up mission before using this tool. @@ -302,6 +323,7 @@ 使用此工具之前，请备份任务。 Zálohujte misi před použitím tohoto nástroje. Salva una copia della missione prima di usare questo strumento. + 이 도구를 사용하기 전에 임무를 백업하십시오. diff --git a/addons/vectors/stringtable.xml b/addons/vectors/stringtable.xml index e94b121a06..10f0d76873 100644 --- a/addons/vectors/stringtable.xml +++ b/addons/vectors/stringtable.xml @@ -14,6 +14,7 @@ Community Base Addons - Vektörler Community Base Addons - Vettori Community Base Addons - Vektory + 커뮤니티 베이스 애드온 - 벡터 diff --git a/addons/versioning/stringtable.xml b/addons/versioning/stringtable.xml index 162d26ef23..0dd6623749 100644 --- a/addons/versioning/stringtable.xml +++ b/addons/versioning/stringtable.xml @@ -14,6 +14,7 @@ Community Base Addons - Versiyonlama Community Base Addons - Versionamento Community Base Addons - Verzování + 커뮤니티 베이스 애드온 - 버전 diff --git a/addons/xeh/stringtable.xml b/addons/xeh/stringtable.xml index d929434e07..cef74111a1 100644 --- a/addons/xeh/stringtable.xml +++ b/addons/xeh/stringtable.xml @@ -14,6 +14,7 @@ Community Base Addons - Geliştirmiş Durum İşlenimi Community Base Addons - Gestore di Eventi Esteso Community Base Addons - Rozšířené ovladače událostí + 커뮤니티 베이스 애드온 - 확장된 이벤트 조정기 diff --git a/optionals/legacy_jr/stringtable.xml b/optionals/legacy_jr/stringtable.xml index 774cc834fb..9052698853 100644 --- a/optionals/legacy_jr/stringtable.xml +++ b/optionals/legacy_jr/stringtable.xml @@ -10,6 +10,7 @@ 社区基础插件-传统共用导轨 Community Base Addons - Legacy Joint Rails Community Base Addons - Legacy Joint Rails + 커뮤니티 베이스 애드온 - 레거시 조인트 레일 From 3465010ba7ad58cdbb11ac516e86db3e7b9b72ec Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 20 Feb 2023 16:24:42 -0600 Subject: [PATCH 099/111] Fix end tags and tabs --- addons/accessory/stringtable.xml | 18 ++--- addons/ai/stringtable.xml | 8 +-- addons/arrays/stringtable.xml | 2 +- addons/characters/stringtable.xml | 4 +- addons/common/stringtable.xml | 6 +- addons/diagnostic/stringtable.xml | 24 +++---- addons/disposable/stringtable.xml | 20 +++--- addons/events/stringtable.xml | 18 ++--- addons/hashes/stringtable.xml | 2 +- addons/help/stringtable.xml | 8 +-- addons/jam/stringtable.xml | 2 +- addons/jr/stringtable.xml | 4 +- addons/keybinding/stringtable.xml | 8 +-- addons/main/stringtable.xml | 12 ++-- addons/modules/stringtable.xml | 104 ++++++++++++++-------------- addons/music/stringtable.xml | 2 +- addons/network/stringtable.xml | 20 +++--- addons/optics/stringtable.xml | 8 +-- addons/settings/stringtable.xml | 70 +++++++++---------- addons/statemachine/stringtable.xml | 2 +- addons/strings/stringtable.xml | 6 +- addons/ui/stringtable.xml | 44 ++++++------ addons/vectors/stringtable.xml | 2 +- addons/versioning/stringtable.xml | 2 +- addons/xeh/stringtable.xml | 2 +- optionals/legacy_jr/stringtable.xml | 2 +- 26 files changed, 200 insertions(+), 200 deletions(-) diff --git a/addons/accessory/stringtable.xml b/addons/accessory/stringtable.xml index a4523ccd14..224e9163b0 100644 --- a/addons/accessory/stringtable.xml +++ b/addons/accessory/stringtable.xml @@ -13,7 +13,7 @@ Community Base Addons - Aksesuar Fonksiyonları Community Base Addons - Funzioni per Accessori Community Base Addons - Funkce doplňků - 커뮤니티 베이스 애드온 - 부착물 기능 + 커뮤니티 베이스 애드온 - 부착물 기능 Next rail item state @@ -27,7 +27,7 @@ Sonraki ray aksesuarı Stato successivo dell'oggetto sulla slitta Další režim doplňku na liště - 다음 레일 아이템 상태 + 다음 레일 아이템 상태 Cycles to the next mode available for your rail slot attachment @@ -41,7 +41,7 @@ Ray aksesuarınızı sonraki moda geçirir Passa alla modalità successiva del tuo accessorio sulla slitta Přepíná na další možný režim doplňku na liště - 레일 부착물에 이용 가능한 다음 모드로 전환 + 레일 부착물에 이용 가능한 다음 모드로 전환 Prev rail item state @@ -55,7 +55,7 @@ Önceki ray aksesuarı Stato precedente dell'oggetto sulla slitta Předchozí režim doplňku na liště - 이전 레일 아이템 상태 + 이전 레일 아이템 상태 Cycles to the previous mode available for your rail slot attachment @@ -69,7 +69,7 @@ Ray aksesuarınızı önceki moda geçirir Passa alla modalità precedente del tuo accessorio sulla slitta Přepíná na předchozí možný režim doplňku na liště - 레일 부착물에 이용 가능한 이전 모드로 전환 + 레일 부착물에 이용 가능한 이전 모드로 전환 Next optics state @@ -83,7 +83,7 @@ Sonraki nişangah modu Stato successivo dell'ottica Další režim zaměřovače - 다음 광학장치 상태 + 다음 광학장치 상태 Cycles to the next mode available for your optics slot attachment @@ -97,7 +97,7 @@ Varolan nişangahınızı sonraki moduna geçirir Passa alla modalità successiva della tua ottica Přepíná na další možný režim doplňku slotu pro zaměřovač - 광학장치 부착물에 이용 가능한 다음 모드로 전환 + 광학장치 부착물에 이용 가능한 다음 모드로 전환 Prev optics state @@ -111,7 +111,7 @@ Önceki nişangah modu Stato precedente dell'ottica Předchozí režim zaměřovače - 이전 광학장치 상태 + 이전 광학장치 상태 Cycles to the previous mode available for your optics slot attachment @@ -125,7 +125,7 @@ Varolan nişangahınızı önceki moduna geçirir Passa alla modalità precedente della tua ottica Přepíná na předchozí možný režim doplňku slotu pro zaměřovač - 광학장치 부착물에 이용 가능한 이전 모드로 전환 + 광학장치 부착물에 이용 가능한 이전 모드로 전환 diff --git a/addons/ai/stringtable.xml b/addons/ai/stringtable.xml index ceaec1176a..8b31c9d8b8 100644 --- a/addons/ai/stringtable.xml +++ b/addons/ai/stringtable.xml @@ -13,7 +13,7 @@ Community Base Addons - Yapay Zeka Community Base Addons - Intelligenza Artificiale Community Base Addons - Umělá inteligence - 커뮤니티 베이스 애드온- 인공지능 + 커뮤니티 베이스 애드온- 인공지능 AI Building Position @@ -27,7 +27,7 @@ ИИ Место строительства Pozycja AI w budynku Posizione edificio AI - 인공지능 건물 위치 + 인공지능 건물 위치 Invisible Target Soldier @@ -54,7 +54,7 @@ 隐形目标（车辆） Neviditelný cíl (Vozidlo) Obiettivo invisibile - Veicolo - 보이지 않는 표적 차량 + 보이지 않는 표적 차량 Invisible Target Airplane @@ -65,7 +65,7 @@ 隐形目标（飞机） Neviditelný cíl (Letoun) Obiettivo invisibile - Velivolo - 보이지 않는 표적 항공기 + 보이지 않는 표적 항공기 diff --git a/addons/arrays/stringtable.xml b/addons/arrays/stringtable.xml index 49b37d445e..f3793fd73f 100644 --- a/addons/arrays/stringtable.xml +++ b/addons/arrays/stringtable.xml @@ -13,7 +13,7 @@ Community Base Addons - Diziler Community Base Addons - Array Community Base Addons - Pole - 커뮤니티 베이스 애드온 - 어레이 + 커뮤니티 베이스 애드온 - 어레이 diff --git a/addons/characters/stringtable.xml b/addons/characters/stringtable.xml index 6ab5166fa1..f9ca356010 100755 --- a/addons/characters/stringtable.xml +++ b/addons/characters/stringtable.xml @@ -9,7 +9,7 @@ 社區基礎插件 - 角色 社区基础插件-角色 Community Base Addons - Personaggi - 커뮤니티 베이스 애드온 - 캐릭터 + 커뮤니티 베이스 애드온 - 캐릭터 Men (Malaria-Infected) @@ -19,7 +19,7 @@ 男子(瘧疾感染者) 男子(疟疾感染者) Uomo (Infetto da malaria) - 사람(말라리아 감염) + 사람(말라리아 감염) diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index d8102a1508..a81dca8ea8 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -13,7 +13,7 @@ Community Base Addons - Ortak Bileşenler Community Base Addons - Componenti Comuni Community Base Addons - Společná součást - 커뮤니티 베이스 애드온 - 일반 구성 요소 + 커뮤니티 베이스 애드온 - 일반 구성 요소 You must first start a mission. @@ -27,7 +27,7 @@ 你必須先加載世界或執行一個任務。 你必须先开始一个任务。 Вначале необходимо запустить миссию. - 미션을 먼저 시작해야 합니다. + 미션을 먼저 시작해야 합니다. CBA Weapons @@ -41,7 +41,7 @@ CBA 武器 CBA Armes CBA Оружие - CBA 무기 + CBA 무기 diff --git a/addons/diagnostic/stringtable.xml b/addons/diagnostic/stringtable.xml index 3d7e48ff1d..3f2ab1cae4 100644 --- a/addons/diagnostic/stringtable.xml +++ b/addons/diagnostic/stringtable.xml @@ -14,7 +14,7 @@ Community Base Addons - Diagnostica Community Base Addons - Diagnostika Community Base Addons - Diagnósticos - 커뮤니티 베이스 애드온 - 진단 + 커뮤니티 베이스 애드온 - 진단 Extended Debug Console @@ -29,7 +29,7 @@ Console debug estesa Rozšířená ladící konzole Consola Extendida de Depuración - 확장 디버그 콘솔 + 확장 디버그 콘솔 Previous Statement @@ -44,7 +44,7 @@ Espressione Prec. Předchozí zpráva Expresión Anterior - 이전 명령 + 이전 명령 Next Statement @@ -59,7 +59,7 @@ Espressione Succ. Následující zpráva Expresión Siguiente - 다음 명령 + 다음 명령 Target Exec @@ -74,7 +74,7 @@ Esegui Remoto Cílový exec Ejecutiva de Objetivo - 대상 실행 + 대상 실행 Enable Target Debugging @@ -89,7 +89,7 @@ Attiva il debug remoto Zapnout cílové ladění Activar Depuración de Objetivo - 대상 디버깅 활성화 + 대상 디버깅 활성화 [CBA] Allows remote target debugging. Requires Debug Console. @@ -104,7 +104,7 @@ [CBA] Abilita il debug remoto. Richiede la console di debug. [CBA] Povoluje ladění vzdáleného cíle. Vyžaduje ladící konzoli. [CBA] Permite la depuración de objetivos remotos. Requiere consola de depuración. - [CBA] 원격 대상 디버깅을 허용합니다. 디버그 콘솔 필요 + [CBA] 원격 대상 디버깅을 허용합니다. 디버그 콘솔 필요 Debug Console Indentation @@ -115,7 +115,7 @@ 调试控制台缩进 Odsazení ladící konzole Indentazione console di debug - 디버그 콘솔 들여쓰기 + 디버그 콘솔 들여쓰기 Type of indentation that can be added to expression in the debug console by pressing Tab key or removed by pressing Shift + Tab. @@ -126,21 +126,21 @@ 可以通过按 Tab 键为添加到调试控制台中的表达式缩进或通过按 Shift + Tab 键为其删除缩进。 Typ odsazení, které lze přidat do výrazu v ladicí konzoli stisknutím klávesy Tab nebo odstranit stisknutím Shift + Tab. Il tipo di intentazione che può essere aggiunta all'espressione nella console di debug premendo il tasto Tab o rimossa premendo Shift + Tab - Tab 키를 눌러서 디버그 콘솔의 식에 추가하거나 Shift + Tab을 눌러 제거할 수 있는 들여쓰기 유형입니다. + Tab 키를 눌러서 디버그 콘솔의 식에 추가하거나 Shift + Tab을 눌러 제거할 수 있는 들여쓰기 유형입니다. Refresh rate target watcher field 刷新率 刷新率 Pole cílového sledování obnovovací frekvence - 대상 관찰자 필드 새로 고침 빈도 + 대상 관찰자 필드 새로 고침 빈도 Refresh rate (in seconds) for the CBA target watcher fields to the right of the debug console. 調試控制台右側的 CBA 目標監視器字段的刷新率（以秒為單位）。 调试控制台右侧的 CBA 目标监视器字段的刷新率（以秒为单位）。 Obnovovací frekvence (v sekundách) pro pole sledování cíle CBA napravo od konzole ladění. - 디버그 콘솔 오른쪽에 있는 CBA의 대상 관찰자 필드의 새로 고침 빈도입니다. (초 단위) + 디버그 콘솔 오른쪽에 있는 CBA의 대상 관찰자 필드의 새로 고침 빈도입니다. (초 단위) 4 Spaces @@ -151,7 +151,7 @@ 4 个空格 4 mezery 4 Spazi - 4 공간 + 4 공간 diff --git a/addons/disposable/stringtable.xml b/addons/disposable/stringtable.xml index 8193925c14..106438fa30 100644 --- a/addons/disposable/stringtable.xml +++ b/addons/disposable/stringtable.xml @@ -13,7 +13,7 @@ Community Base Addons - Одноразовое оружие Community Base Addons - Bronie jednorazowe Community Base Addons - Armi monouso - 커뮤니티 베이스 애드온 - 일회용 무기 + 커뮤니티 베이스 애드온 - 일회용 무기 Drop Used Disposable Launcher @@ -27,7 +27,7 @@ Выбрасывать использованный одноразовый гранатомёт Wyrzuć zużyty przedmiot Butta lanciatore usato - 사용한 일회용 발사기 떨어뜨리기 + 사용한 일회용 발사기 떨어뜨리기 Never @@ -41,7 +41,7 @@ Никогда Nigdy Mai - 없음 + 없음 Don't automatically drop the used disposable launcher. @@ -55,7 +55,7 @@ Не выбрасывать автоматически использованный одноразовый гранатомёт. Nie wyrzucaj automatycznie wyrzutni jednorazowej. Non buttare automaticamente il lanciatore usato. - 사용한 일회용 발사기를 자동으로 떨어뜨리지 않습니다. + 사용한 일회용 발사기를 자동으로 떨어뜨리지 않습니다. AI Only @@ -69,7 +69,7 @@ Только ИИ Tylko AI Solo AI - 인공지능만 + 인공지능만 Only AI drops the used disposable launcher. @@ -83,7 +83,7 @@ Только ИИ выбрасывает использованный одноразовый гранатомёт. Tylko AI wyrzuca wyrzutnie jednorazową. Solo le unità AI buttano il lanciatore usato. - 인공지능만이 사용한 일회용 발사기를 떨어뜨립니다. + 인공지능만이 사용한 일회용 발사기를 떨어뜨립니다. Selected Another Weapon @@ -97,7 +97,7 @@ Выбрано другое оружие Wybierz inną Broń Seleziona un'altra arma - 다른 무기 선택 + 다른 무기 선택 Automatically drop the used disposable launcher as soon as another weapon is selected. @@ -111,7 +111,7 @@ Автоматически выбрасывать использованный одноразовый гранатомёт, как только будет выбрано другие оружие. Automatycznie wyrzucaj wyrzutnie jednorazową gdy tylko zostanie wybrana kolejna broń. Butta automaticamente il lanciatore usato non appena un'altra arma viene selezionata - 다른 무기를 선택하는 즉시 사용한 일회용 발사기를 자동으로 떨어뜨립니다. + 다른 무기를 선택하는 즉시 사용한 일회용 발사기를 자동으로 떨어뜨립니다. @@ -126,7 +126,7 @@ Заменять одноразовые гранатомёты Zamien wyrzutnie jednorazową Sostituisci lanciatore monouso - 일회용 발사기 대체 + 일회용 발사기 대체 If enabled, disposable launchers can only be used once. Ammunition for disposable launchers in containers and vehicles will be replaced with loaded disposable launchers. If disabled, disposable launchers can be reloaded after use. @@ -140,7 +140,7 @@ Если включено, одноразовые гранатомёты могут быть использованы лишь один раз. Боеприпасы для них в контейнерах и технике будут заменены на соответствующие им заряженные одноразовые гранатомёты. Если выключено, одноразовые гранатомёты могут быть перезаряжены и использованы повторно. Gdy ta opcja jest włączona wyrzutnie jednorazowe mogą być użyte tylko raz, Amunicja do wyrzutni jednorazowych dostępna w kontenerach i pojazdach zostanie zamieniona w załadowaną wyrzutnie jednorazową. Jeżeli ta opcja jest wyłączona, wtedy wyrzutnie jednorazowe nie zostaną przeładowane po użyciu. Se abilitato, i lanciatori monouso possono essere usati una sola volta. Le munizioni per i lanciatori monouso che si trovano nei contenitori e nei veicoli saranno sostituiti con lanciatori monouso carichi. Se disabilitato, i lanciatori monouso possono essere ricaricati dopo l'uso. - 활성화 시 일회용 발사기는 한번만 사용 가능합니다. 컨테이너와 차량에 담긴 일회용 발사기 탄약은 장전된 일회용 발사기로 대체됩니다. 비활성화 시 사용 후 일회용 발사기를 재장전할 수 있습니다. + 활성화 시 일회용 발사기는 한번만 사용 가능합니다. 컨테이너와 차량에 담긴 일회용 발사기 탄약은 장전된 일회용 발사기로 대체됩니다. 비활성화 시 사용 후 일회용 발사기를 재장전할 수 있습니다. diff --git a/addons/events/stringtable.xml b/addons/events/stringtable.xml index dabbf8b2eb..fc3df9f83e 100644 --- a/addons/events/stringtable.xml +++ b/addons/events/stringtable.xml @@ -13,7 +13,7 @@ Community Base Addons - Durumlar Community Base Addons - Eventi Community Base Addons - Události - 커뮤니티 베이스 애드온 - 이벤트 + 커뮤니티 베이스 애드온 - 이벤트 Weapon Repetition Mode @@ -27,7 +27,7 @@ Mode de réarmement Режим повторной стрельбы Modalità di ricarica dell'arma - 무기 반복 모드 + 무기 반복 모드 Mode of bolting or pumping weapons. @@ -41,7 +41,7 @@ Mode de réarmement des armes à verrou et à pompe. Режим повторной стрельбы помпового оружия или оружия с продольно-скользящим затвором. Modalità di ricarica o riarmo delle armi. - 무기를 볼트나 펌프로 수동장전하는 모드입니다. + 무기를 볼트나 펌프로 수동장전하는 모드입니다. Leave Optics View @@ -55,7 +55,7 @@ Maintenir vue lunette Выход из прицела Esci dalla vista ottica - 조준 화면 벗어나기 + 조준 화면 벗어나기 Bolt or rack weapon by leaving optics view. @@ -69,7 +69,7 @@ Réarme l'arme tout en maintenant la visée dans la lunette. Перезаряжать оружие после выхода из прицела. Ricarica l'arma uscendo dalla vista dell'ottica. - 볼트나 펌프 장전 시 조준 화면을 벗어납니다. + 볼트나 펌프 장전 시 조준 화면을 벗어납니다. Release Trigger @@ -83,7 +83,7 @@ Relâcher la détente Отпускание курка Rilascia il grilletto - 방아쇠 놓기 + 방아쇠 놓기 Bolt or rack weapon by releasing trigger (hold trigger to prevent immediate action). @@ -97,7 +97,7 @@ Réarme l'arme au relâchement de la détente (maintenir la détente enfoncée pour éviter le réarmement immédiat). Перезаряжать оружие после отпускания курка (держите курок чтобы не перезаряжать). Ricarica l'arma rilasciando il grilletto (mantieni premuto il grilletto per prevenire la ricarica immediata). - 발사 키를 놓음으로써 볼트나 펌프 장전을 합니다.(즉각적인 행동을 방지하기 위해 발사 키를 꾹 누르십시오) + 발사 키를 놓음으로써 볼트나 펌프 장전을 합니다.(즉각적인 행동을 방지하기 위해 발사 키를 꾹 누르십시오) Press Trigger @@ -111,7 +111,7 @@ Presser la détente Нажатие курка Premi il grilletto - 방아쇠 누르기 + 방아쇠 누르기 Bolt or rack weapon by pressing the trigger again. @@ -125,7 +125,7 @@ Réarme l'arme en pressant la détente encore une fois. Перезаряжать оружие повторным нажатием на курок. Ricarica l'arma premendo nuovamente il grilletto - 발사 키를 다시 누르면 볼트나 펌프 장전을 합니다. + 발사 키를 다시 누르면 볼트나 펌프 장전을 합니다. diff --git a/addons/hashes/stringtable.xml b/addons/hashes/stringtable.xml index 938ec359a7..95588c8579 100644 --- a/addons/hashes/stringtable.xml +++ b/addons/hashes/stringtable.xml @@ -13,7 +13,7 @@ Community Base Addons - Hashler Community Base Addons - Hash Community Base Addons - Hashe - 커뮤니티 베이스 애드온 - 해쉬 + 커뮤니티 베이스 애드온 - 해쉬 diff --git a/addons/help/stringtable.xml b/addons/help/stringtable.xml index 69fe277922..743c219fff 100644 --- a/addons/help/stringtable.xml +++ b/addons/help/stringtable.xml @@ -14,7 +14,7 @@ Community Base Addons - Yardım Community Base Addons - Aiuto Community Base Addons - Pomoc - 커뮤니티 베이스 애드온 - 도움 + 커뮤니티 베이스 애드온 - 도움 Keybindings @@ -30,7 +30,7 @@ 按鍵綁定 按键绑定 Klavye Tuşları - 키 설정 + 키 설정 Credits @@ -46,7 +46,7 @@ 製作組 制作组 Yapımcılar - 크레딧 + 크레딧 Addons @@ -62,7 +62,7 @@ 模組 模组 Modüller - 애드온 + 애드온 diff --git a/addons/jam/stringtable.xml b/addons/jam/stringtable.xml index ef31f3bb2a..84f2adc341 100644 --- a/addons/jam/stringtable.xml +++ b/addons/jam/stringtable.xml @@ -12,7 +12,7 @@ 社群基礎模組 - 聯合彈匣 社区基础插件—通用弹匣 Community Base Addons - Общие патроны и магазины - 커뮤니티 베이스 애드온 - 탄약 및 탄창 통합 + 커뮤니티 베이스 애드온 - 탄약 및 탄창 통합 Caliber: 7.62x51 mm Tracer - Green<br/>Rounds: 150 diff --git a/addons/jr/stringtable.xml b/addons/jr/stringtable.xml index 4779df8d8b..94bb8e79c2 100644 --- a/addons/jr/stringtable.xml +++ b/addons/jr/stringtable.xml @@ -13,7 +13,7 @@ Community Base Addons - Birleştirilmiş Raylar Community Base Addons - Joint Rails Community Base Addons - Joint Rails - 커뮤니티 베이스 애드온 - 레일 통합 + 커뮤니티 베이스 애드온 - 레일 통합 Sound Suppressor MG @@ -29,7 +29,7 @@ 機槍用消音器 机枪用消音器 Community Base Addons - MG Susturucusu - 소음기(기관총) + 소음기(기관총) diff --git a/addons/keybinding/stringtable.xml b/addons/keybinding/stringtable.xml index 6fc447b828..0dce89c727 100644 --- a/addons/keybinding/stringtable.xml +++ b/addons/keybinding/stringtable.xml @@ -14,7 +14,7 @@ Community Base Addons - Klavye Tuşları Community Base Addons - Configurazione Tasti Community Base Addons - Klávesy - 커뮤니티 베이스 애드온 - 키 설정 + 커뮤니티 베이스 애드온 - 키 설정 Configure Addons @@ -29,7 +29,7 @@ Eklentileri Düzenle Configura gli addon Konfigurovat addony - 애드온 설정 + 애드온 설정 Configure Base @@ -44,7 +44,7 @@ Temeli Düzenle Configura il gioco base Konfigurovat základ - 기본 설정 + 기본 설정 Unknown Key %1 @@ -59,7 +59,7 @@ Bilinmeyen Tuş %1 "%1" è un tasto sconosciuto Neznámá klávesa %1 - %1 키는 미지정입니다 + %1 키는 미지정입니다 diff --git a/addons/main/stringtable.xml b/addons/main/stringtable.xml index 22417187e7..7001279f27 100644 --- a/addons/main/stringtable.xml +++ b/addons/main/stringtable.xml @@ -14,7 +14,7 @@ CBA Takımı Squadra CBA CBA tým - CBA 팀 + CBA 팀 https://www.github.com/CBATeam/CBA_A3 @@ -31,7 +31,7 @@ https://www.github.com/CBATeam/CBA_A3 https://www.github.com/CBATeam/CBA_A3 https://www.github.com/CBATeam/CBA_A3 - https://www.github.com/CBATeam/CBA_A3 + https://www.github.com/CBATeam/CBA_A3 Community Base Addons @@ -46,7 +46,7 @@ Community Base Addons Community Base Addons Community Base Addons - 커뮤니티 베이스 애드온 + 커뮤니티 베이스 애드온 Community Base Addons - Main Component @@ -61,7 +61,7 @@ Community Base Addons - Ana Bileşenler Community Base Addons - Componente Principale Community Base Addons - Hlavní součást - 커뮤니티 베이스 애드온 - 메인 구성 요소 + 커뮤니티 베이스 애드온 - 메인 구성 요소 Community Base Addons - Optional Component @@ -76,7 +76,7 @@ Community Base Addons - Opsiyonel Bileşenler Community Base Addons - Componente Opzionale Community Base Addons - Volitelná součást - 커뮤니티 베이스 애드온 - 선택적 요소 + 커뮤니티 베이스 애드온 - 선택적 요소 ADDON: @@ -90,7 +90,7 @@ EKLENTİ: ADDON: ADDON: - 애드온: + 애드온: diff --git a/addons/modules/stringtable.xml b/addons/modules/stringtable.xml index 6dcae96b81..8f0b544e7e 100644 --- a/addons/modules/stringtable.xml +++ b/addons/modules/stringtable.xml @@ -13,7 +13,7 @@ Community Base Addons - Modüller Community Base Addons - Moduli Community Base Addons - Moduly - 커뮤니티 베이스 애드온 - 모듈 + 커뮤니티 베이스 애드온 - 모듈 CBA Modules @@ -27,7 +27,7 @@ CBA Modülleri CBA - Moduli CBA Moduly - CBA 모듈 + CBA 모듈 Attack @@ -41,7 +41,7 @@ Saldır Attaccare Útok - 공격 + 공격 Attack Location Type @@ -55,7 +55,7 @@ Saldırı Konum Tipi Tipo di posizione per l'attacco Typ lokace útoku - 공격 위치 유형 + 공격 위치 유형 Set what kind of object is being passed as the center point @@ -69,7 +69,7 @@ Merkez noktası olarak nasıl bir objenin verildiğini gör Scegliere quale oggetto passare al punto centrale Určit, jaký typ objektu je nastaven jako centrální bod - 중앙 지점으로 통과시킬 개체 종류를 설정합니다 + 중앙 지점으로 통과시킬 개체 종류를 설정합니다 Module Position @@ -83,7 +83,7 @@ Modül Konumu Posizione del modulo Pozice modulu - 모듈 위치 + 모듈 위치 Object/Location @@ -97,7 +97,7 @@ Obje/Konum Posizione oggetto Objekt/Lokace - 개체/위치 + 개체/위치 Group @@ -111,7 +111,7 @@ Grup Gruppo Skupina - 그룹 + 그룹 Array @@ -125,7 +125,7 @@ Liste Array Pole - 어레이 + 어레이 Marker @@ -139,7 +139,7 @@ İşaret Indicatore Značka - 마커 + 마커 Task @@ -153,7 +153,7 @@ Görev Incarico Úkol - 과업 + 과업 Set Position @@ -167,7 +167,7 @@ Konum Belirle Posiziona Nastavit pozici - 지정 위치 + 지정 위치 Attack Position @@ -181,7 +181,7 @@ Saldırı Konumu Posizione per l'attacco Pozice útoku - 공격 위치 + 공격 위치 Enter an array with brackets or name without quotes @@ -195,7 +195,7 @@ Parantezler olmadan bir liste ya da tırnaklar olmadan bir isim girin Inserire un array in parentesi quadre o nome in doppi apici. Zadejte pole hodnot se závorkami nebo jméno bez závorek - 대괄호가 있는 어레이 또는 따옴표가 없이 이름 입력합니다 + 대괄호가 있는 어레이 또는 따옴표가 없이 이름 입력합니다 Search Radius @@ -209,7 +209,7 @@ Arama Menzili Raggio di ricerca Rádius hledání - 반경 수색 + 반경 수색 Enter a number for size of the radius to search @@ -223,7 +223,7 @@ Aranıcak alanın çapı için bir sayı girin Immettere un numero per la dimensione del raggio in cui cercare Vložte číslo pro velikost rádiu hledání - 수색할 반경의 크기에 대한 숫자를 입력합니다 + 수색할 반경의 크기에 대한 숫자를 입력합니다 Sync to leader of group to attack a parsed location @@ -237,7 +237,7 @@ Bir grup liderine senkronize ederek taranmış bir konuma saldırtın Sincronizza con un capogruppo per attaccare una posizione designata. Synchronizovat s velitelem skupiny k útoku na danou lokaci - 분석된 위치를 공격할 그룹의 리더와 동기화합니다 + 분석된 위치를 공격할 그룹의 리더와 동기화합니다 Allow Override @@ -251,7 +251,7 @@ Üstüne Yazmayı Etkinleştir Permettere Sovrascrittura Povolit přepsání - 덮어쓰기 허용 + 덮어쓰기 허용 Allow the module to remove old waypoints and assign an attack waypoint @@ -265,7 +265,7 @@ Modülün eski waypoint'leri silip saldırı waypoint'i koymasına izin ver Permette al modulo di togliere waypoint precedenti e assegnarne uno di attacco. Povolit modulu odstranit staré waypointy a přiřadit waypoint k útoku - 모듈이 이전 경유지를 제거하고 공격 경유지를 할당하도록 허용합니다 + 모듈이 이전 경유지를 제거하고 공격 경유지를 할당하도록 허용합니다 Defend @@ -279,7 +279,7 @@ Savun Difendere Bránit - 방어 + 방어 Defend Position Type @@ -293,7 +293,7 @@ Savunma Konum Tipi Tipo di posizione per la difesa Typ pozice útoku - 방어 위치 유형 + 방어 위치 유형 Set what kind of object is being passed as the center point @@ -307,7 +307,7 @@ Merkez noktası olarak nasıl bir objenin verildiğini gör Scegliere quale oggetto passare al punto centrale Určit, jaký typ objektu je nastaven jako centrální bod - 중앙 지점으로 통과시킬 개체 종류를 설정합니다 + 중앙 지점으로 통과시킬 개체 종류를 설정합니다 Defend Position @@ -321,7 +321,7 @@ Konumu Savun Difendere Posizione Bránit pozici - 방어 위치 + 방어 위치 Enter an array with brackets or name without quotes @@ -335,7 +335,7 @@ Parantezler olmadan bir liste ya da tırnaklar olmadan bir isim girin Inserire un array in parentesi quadre o nome in doppi apici. Zadejte pole hodnot se závorkami nebo jméno bez závorek - 대괄호가 있는 어레이 또는 따옴표가 없이 이름 입력합니다 + 대괄호가 있는 어레이 또는 따옴표가 없이 이름 입력합니다 Defend Radius @@ -349,7 +349,7 @@ Belli Bir Çapı Savun Raggio di Difesa Rádius obrany - 방어 반경 + 방어 반경 The max distance to defend from the center point @@ -363,7 +363,7 @@ Merkez noktadan savunulacak maksimum uzaklık Distanza massima dal punto centrale entro cui difendere. Maximální vzdálenost obrany od centrálního bodu - 중앙 지점으로부터 방어할 최대 거리 + 중앙 지점으로부터 방어할 최대 거리 Building Size Threshold @@ -377,7 +377,7 @@ Bina Boyutu Limiti Soglia Dimensione Edificio Práh velikosti stavby - 건물 크기 임계값 + 건물 크기 임계값 Smaller the number the more buildings available @@ -391,7 +391,7 @@ Sayı küçüldükçe daha fazla sayıda bina mümkün olur Più piccolo il numero più edifici saranno disponibili Čím menší číslo tím více budov je k dispozici - 숫자가 작을수록 더 많은 건물을 사용할 수 있습니다 + 숫자가 작을수록 더 많은 건물을 사용할 수 있습니다 Patrol Chance @@ -405,7 +405,7 @@ Devriye İhtimali Probabilità di pattugliare Šance hlídky - 순찰 확률 + 순찰 확률 Chance for each unit to patrol instead of garrison @@ -419,7 +419,7 @@ Devriye İhtimali Probabilità per ogni unità di pattugliare invece che presidiare. Šance, že bude jednotka hlídkovat (místo tvorby opevnění) - 각 유닛이 주둔 대신 순찰할 확률 + 각 유닛이 주둔 대신 순찰할 확률 Hold Chance @@ -433,7 +433,7 @@ Tutma İhtimali Probabilità di tenuta Šance držení - 위치 사수 확률 + 위치 사수 확률 Chance for each unit to hold their garrison in combat @@ -447,7 +447,7 @@ Birimlerin çatışma sırasında konumlarını koruma şansı Probabilità per ogni unità di tenere il presidio durante il combattimento. Šance, že bude jednotka držet své opevnění v boji - 각 유닛이 전투 시 주둔지에 위치 사수할 확률 + 각 유닛이 전투 시 주둔지에 위치 사수할 확률 Sync to leader of group to defend a parsed location @@ -461,7 +461,7 @@ Bir grup liderine senkronize ederek taranmış bir konumu savundurun Sincronizza con un capogruppo per difendere una posizione designata. Synchronizovat s velitelem skupiny k obraně dané lokace - 분석된 위치를 방어할 그룹의 리더와 동기화합니다 + 분석된 위치를 방어할 그룹의 리더와 동기화합니다 Patrol @@ -475,7 +475,7 @@ Devriye Pattugliare Hlídka - 순찰 + 순찰 Patrol Center Type @@ -489,7 +489,7 @@ Devriye Merkez Tipi Tipo del centro del pattugliamento Typ centra hlídky - 순찰 위치 유형 + 순찰 위치 유형 Set what kind of object is being passed as the center point @@ -503,7 +503,7 @@ Merkez noktası olarak nasıl bir objenin verildiğini gör Imposta il tipo di oggetto che viene usato come punto centrale. Určit, jaký typ objektu je nastaven jako centrální bod - 중앙 지점으로 통과시킬 개체 종류를 설정합니다 + 중앙 지점으로 통과시킬 개체 종류를 설정합니다 Center Point @@ -517,7 +517,7 @@ Merkez Nokta Punto Centrale Centrální bod - 중앙 지점 + 중앙 지점 Enter an array with brackets or name without quotes @@ -531,7 +531,7 @@ Parantezler olmadan bir liste ya da tırnaklar olmadan bir isim girin Inserire un array in parentesi quadre o nome in doppi apici. Zadejte pole hodnot se závorkami nebo jméno bez závorek - 대괄호가 있는 어레이 또는 따옴표가 없이 이름 입력합니다 + 대괄호가 있는 어레이 또는 따옴표가 없이 이름 입력합니다 Patrol Radius @@ -545,7 +545,7 @@ Devriye Çapı Raggio di Pattugliamento Rádius hlídky - 순찰 반경 + 순찰 반경 The distance to patrol from the center point @@ -559,7 +559,7 @@ Merkez noktadan devriyeye çıkılacak uzaklık La distanza da pattugliare dal punto centrale. Nastavit vzdálenost od centrálního bodu k hlídce - 중앙 지점으로부터 순찰하는 거리입니다 + 중앙 지점으로부터 순찰하는 거리입니다 Waypoint Count @@ -573,7 +573,7 @@ Waypoint Sayısı Numero di destinazioni Počet waypointů - 경유지 수 + 경유지 수 The amount of waypoints to create @@ -587,7 +587,7 @@ Oluşturulacak Waypoint Sayısı Quantità di destinazioni da creare. Kolik waypointů bude vytvořeno - 생성할 경유지의 양 + 생성할 경유지의 양 Waypoint Type @@ -601,7 +601,7 @@ Waypoint Tipi Tipo di destinazioni Typ waypointu - 경유지 유형 + 경유지 유형 The type of waypoint to be used @@ -615,7 +615,7 @@ Kullanılacak waypoint tipi Il tipo di destinazione da usare. Typ waypointu, který bude použit - 사용할 경유지의 유형 + 사용할 경유지의 유형 Move @@ -629,7 +629,7 @@ Hareket Et Muovere Pohyb - 이동 + 이동 Seek and Destroy @@ -643,7 +643,7 @@ Bul ve Yok Et Cercare e Distruggere Najít a zničit - 수색격멸 + 수색격멸 Loiter @@ -657,7 +657,7 @@ Bekle Indugiare Postávat - 배회 + 배회 Code to Execute @@ -671,7 +671,7 @@ Çalıştırılacak Kod Codice da eseguire Kód k vykonání - 실행할 코드 + 실행할 코드 Any code to run at waypoints @@ -685,7 +685,7 @@ Waypoint'lerde çalıştırılacak herhangi kod Codice da eseguire alla destinazione. Jakýkoliv kód, který bude vykonán na waypointech - 경유지에서 실행할 코드 + 경유지에서 실행할 코드 Timeout @@ -699,7 +699,7 @@ Zaman Aşımı Tempo di attesa Přestávka - 대기 + 대기 [Min, Med, Max] Time to wait at waypoints @@ -713,7 +713,7 @@ [Minimum, Orta, Maksimum] Waypoint'lerde beklenecek zaman [Min, Med, Mass] Tempo di attesa alla destinazione. [Min., Stř., Max.] Čas čekání na waypointech - [최소, 중간, 최대] 경유지에서 대기하는 시간 + [최소, 중간, 최대] 경유지에서 대기하는 시간 Sync to leader of group to patrol a parsed location @@ -727,7 +727,7 @@ Bir grup liderine senkronize ederek taranmış bir konumu devriye ettirin Sincronizza con un capogruppo per pattugliare una posizione designata. Synchronizovat s velitelem skupiny k hlídkování v dané lokaci - 분석된 위치를 방어할 그룹의 리더와 동기화합니다 + 분석된 위치를 방어할 그룹의 리더와 동기화합니다 diff --git a/addons/music/stringtable.xml b/addons/music/stringtable.xml index 45e521d2b0..aeff12195c 100644 --- a/addons/music/stringtable.xml +++ b/addons/music/stringtable.xml @@ -14,7 +14,7 @@ Community Base Addons - Müzik Community Base Addons - Musica Community Base Addons - Hudba - 커뮤니티 베이스 애드온 - 음악 + 커뮤니티 베이스 애드온 - 음악 diff --git a/addons/network/stringtable.xml b/addons/network/stringtable.xml index 0a977accf9..67a6c19132 100644 --- a/addons/network/stringtable.xml +++ b/addons/network/stringtable.xml @@ -14,7 +14,7 @@ CBA Ağ CBA Rete CBA Síť - CBA 네트워크 + CBA 네트워크 Network @@ -29,7 +29,7 @@ Ağ Rete Síť - 네트워크 + 네트워크 Loadout Validation @@ -39,7 +39,7 @@ 驗證加載 验证加载 Verifica l'equipaggiamento - 로드아웃 검사 + 로드아웃 검사 Validate loadout of units. Fixes an issue where units appear naked after changing locality. @@ -50,7 +50,7 @@ 验证单位加载。修复单位在更改大厅位置后显示为裸体的问题。 Ověřovat výbavu jednotek. Opravuje problém s nahými jednotkami když mění lokálnost. Verifica l'equipaggiamento delle unità. Corregge un bug che faceva apparire un'unità nuda dopo aver cambiato località. - 유닛의 로드아웃을 확인합니다. 위치를 변경한 후 유닛이 알몸인 상태로 나타나는 문제를 해결합니다. + 유닛의 로드아웃을 확인합니다. 위치를 변경한 후 유닛이 알몸인 상태로 나타나는 문제를 해결합니다. Never @@ -61,7 +61,7 @@ 从不 Nikdy Mai - 없음 + 없음 Never validate loadouts @@ -72,7 +72,7 @@ 从不验证加载 Nikdy neověřovat výbavu Non validare mai gli equipaggiamenti - 로드아웃 검사하지 않음 + 로드아웃 검사하지 않음 Playable units only @@ -83,7 +83,7 @@ 仅可玩单位 Pouze hratelné jednotky Solo unità giocabili - 플레이 가능 유닛만 + 플레이 가능 유닛만 Validate only loadout of playable units @@ -94,7 +94,7 @@ 仅验证可玩单位的加载 Ověřovat pouze výbavu hratelných jednotek Valida solo le unità giocabili - 플레이 가능 유닛만 로드아웃 검사 + 플레이 가능 유닛만 로드아웃 검사 All units @@ -105,7 +105,7 @@ 所有单位 Všechny jednotky Tutte le unità - 모든 유닛 + 모든 유닛 Validate loadout of all units @@ -116,7 +116,7 @@ 验证所有单位的加载 Ověřovat výbavu všech jednotek Valida l'equipaggiamento di tutte unità - 모든 유닛의 로드아웃 검사 + 모든 유닛의 로드아웃 검사 diff --git a/addons/optics/stringtable.xml b/addons/optics/stringtable.xml index e9cb4e58dd..867ff4512a 100644 --- a/addons/optics/stringtable.xml +++ b/addons/optics/stringtable.xml @@ -13,7 +13,7 @@ 社区基础插件—瞄具 Community Base Addons - Optiques Community Base Addons - Оптика - 커뮤니티 베이스 애드온 - 광학장치 + 커뮤니티 베이스 애드온 - 광학장치 Use Picture-in-Picture Optics @@ -27,7 +27,7 @@ 使用画中画（PiP）瞄具 Utiliser les optiques "picture in picture" Использовать оптические прицелы в режиме «картинка в картинке» (PIP) - PIP 광학장치 사용 + PIP 광학장치 사용 Toggle Reticle @@ -41,7 +41,7 @@ Commuter le réticule Переключение сетки Przełącz siatke przyrządu - 조준점 전환 + 조준점 전환 Manually switch the reticle of the optic. @@ -55,7 +55,7 @@ Commuter manuellement le réticule de l'optique. Вручную переключать сетку оптического прицела. Ręcznie przełącz siatkę przyrządu optycznego - 광학장치의 조준점을 수동으로 전환합니다. + 광학장치의 조준점을 수동으로 전환합니다. diff --git a/addons/settings/stringtable.xml b/addons/settings/stringtable.xml index cdeec5a463..3332606701 100644 --- a/addons/settings/stringtable.xml +++ b/addons/settings/stringtable.xml @@ -14,7 +14,7 @@ Community Base Addons - Ayarlar Community Base Addons - Impostazioni Community Base Addons - Nastavení - 커뮤니티 베이스 애드온 - 설정 + 커뮤니티 베이스 애드온 - 설정 Configure Addons @@ -29,7 +29,7 @@ Eklenti Ayarları Configura gli addon Konfigurovat addony - 애드온 설정 + 애드온 설정 Configure Base @@ -44,7 +44,7 @@ Oyun Ayarları Configura il gioco base Konfigurovat základ - 기본 설정 + 기본 설정 Addon Options @@ -59,7 +59,7 @@ Eklenti Ayarları Opzioni degli addon Možnosti addonu - 애드온 설정 + 애드온 설정 Adjust addon settings. @@ -73,7 +73,7 @@ 調整插件設定。 调整插件设置。 Отрегулировать настройки дополнений. - 애드온 설정을 조정합니다. + 애드온 설정을 조정합니다. Addon Options... @@ -88,7 +88,7 @@ Eklenti Ayarları... Opzioni per gli addon ... Možnosti addonu... - 애드온 설정... + 애드온 설정... Server @@ -103,7 +103,7 @@ Sunucu Server Server - 서버 + 서버 Look at the server's settings. Log in as admin to change. @@ -118,7 +118,7 @@ Sunucu ayarlarına bak. Değiştirmek için admin olarak giriş yapın. Visualizza le impostazioni del server. Entra come amministratore per cambiarle. Podívejte se na nastavení serveru. Přihlaste se jako admin pro změnu. - 서버의 설정을 확인합니다. 관리자로 로그인해서 변경합니다. + 서버의 설정을 확인합니다. 관리자로 로그인해서 변경합니다. Mission @@ -133,7 +133,7 @@ Görev Missione Mise - 임무 + 임무 Look at the mission's settings. @@ -148,7 +148,7 @@ Görev'in ayarlarına bak. Visualizza le impostazioni della missione. Podívejte se na nastavení mise. - 임무의 설정을 확인합니다. + 임무의 설정을 확인합니다. Edit the mission's settings. @@ -163,7 +163,7 @@ Görev'in ayarlarını değiştir. Cambia le impostazioni della missione. Upravit nastavení mise. - 임무의 설정을 편집합니다. + 임무의 설정을 편집합니다. Client @@ -178,7 +178,7 @@ Oyuncu Client Klient - 클라이언트 + 클라이언트 Edit your local settings. @@ -193,7 +193,7 @@ Yerel ayarlarınızı değiştirin. Cambia le tue impostazioni locali. Upravit vaše lokální nastavení. - 당신의 로컬 설정을 편집합니다. + 당신의 로컬 설정을 편집합니다. Local @@ -208,7 +208,7 @@ Yerel Locale Lokální - 로컬 + 로컬 Save current settings as preset. @@ -223,7 +223,7 @@ Şuanki ayaları şablon olarak kaydet. Salva le impostazioni attuali come predefinite Uložit nynější nastavení jako předvolbu. - 현재 설정을 프리셋으로 저장합니다. + 현재 설정을 프리셋으로 저장합니다. Load settings from preset. @@ -238,7 +238,7 @@ Şablondan ayarları yükle. Carica le impostazioni da quelle predefinite Načíst nastavení z předvolby. - 프리셋에서 설정을 가져옵니다. + 프리셋에서 설정을 가져옵니다. Import @@ -253,7 +253,7 @@ Import Importa Import - 가져오기 + 가져오기 Import settings from clipboard. @@ -268,7 +268,7 @@ Ayarları panodan çek. Importa le impostazioni dagli appunti. Importovat nastavení ze schránky. - 클립보드로 설정을 가져옵니다. + 클립보드로 설정을 가져옵니다. Export @@ -283,7 +283,7 @@ Export Esporta Export - 내보내기 + 내보내기 Export settings to clipboard. @@ -298,7 +298,7 @@ Ayarları panoya kopyala. Esporta le impostazioni negli appunti. Exportovat nastavení do schránky. - 클립보드로 설정을 내보냅니다. + 클립보드로 설정을 내보냅니다. Reset to default value. @@ -313,7 +313,7 @@ Varsayılan ayarlara geri dön. Reimposta ai valori originali. Resetovat na původní hodnotu. - 기본값으로 초기화합니다. + 기본값으로 초기화합니다. Overwrite\nClients @@ -328,7 +328,7 @@ Oyunculara\nAyar Zorla Sovrascrive\ni client Přepsat \nClients - 클라이언트로\n덮어쓰기 + 클라이언트로\n덮어쓰기 Overwrite\nMission @@ -343,7 +343,7 @@ Göreve\nAyar Zorla Sovrascrive\nla missione Přepsat \nMission - 미션으로\n덮어쓰기 + 미션으로\n덮어쓰기 Overwrite\nServer @@ -358,7 +358,7 @@ Sunucuya\nAyar Zorla Sovrascrive\nil server Přepsat \nServer - 서버로\n덮어쓰기 + 서버로\n덮어쓰기 This setting applies. @@ -372,7 +372,7 @@ 設定已套用。 设置已套用。 Этот параметр применён. - 이 설정을 적용합니다. + 이 설정을 적용합니다. This setting applies after the next mission restart. @@ -386,7 +386,7 @@ 這個設定將會在任務重置後生效 该设定将在任务重启后生效。 Этот параметр будет применён после рестарта миссии. - 이 설정은 다음 미션 재시작 후에 적용됩니다. + 이 설정은 다음 미션 재시작 후에 적용됩니다. This setting is overwritten by the clients. @@ -401,7 +401,7 @@ Oyuncular tarafından bu ayarın üstüne yazılmış. I client sovrascrivono questa impostazione. Toto nastavení je přepsáno klienty. - + This setting is overwritten by the mission. @@ -416,7 +416,7 @@ Görev tarafından bu ayarın üstüne yazılmış. La missione sovrascrive questa impostazione. Toto nastavení je přepsáno misí. - + This setting is overwritten by the server. @@ -431,7 +431,7 @@ Sunucu tarafından bu ayarın üstüne yazılmış. Il server sovrascrive questa impostazione. Toto nastavení je přepsáno serverem. - 이 설정은 서버에 의해 덮어씌워졌습니다. + 이 설정은 서버에 의해 덮어씌워졌습니다. This setting is overwritten by the clients and only applies to the server. @@ -446,7 +446,7 @@ Oyuncular tarafından bu ayarın üstüne yazılmış, ayar sadece sunucuda geçerli. Questa impostazione è sovrascritta dai client e si applica solo al server. Toto nastavení je přepsáno klienty a platí pouze na serveru. - 이 설정은 클라이언트에 의해 덮어씌워졌고 서버에만 적용됩니다. + 이 설정은 클라이언트에 의해 덮어씌워졌고 서버에만 적용됩니다. Overwritten by client with the same value. @@ -458,7 +458,7 @@ 被客户端以相同的值覆盖。 Toto nastavení je přepsáno klienty stejnou hodnotou. Sovrascritto dal client con lo stesso valore. - 동일한 값을 가진 클라이언트에 의해 덮어씌워졌습니다. + 동일한 값을 가진 클라이언트에 의해 덮어씌워졌습니다. Overwritten by mission with the same value. @@ -470,7 +470,7 @@ 被任务以相同的值覆盖。 Toto nastavení je přepsáno misí stejnou hodnotou. Sovrascritto dalla missione con lo stesso valore. - 동일한 값을 가진 임무에 의해 덮어씌워졌습니다. + 동일한 값을 가진 임무에 의해 덮어씌워졌습니다. Overwritten by server with the same value. @@ -482,7 +482,7 @@ 被服务器以相同的值覆盖。 Toto nastavení je přepsáno serverem stejnou hodnotou. Sovrascritto dal server con lo stesso valore. - 동일한 값을 가진 서버에 의해 덮어씌워졌습니다. + 동일한 값을 가진 서버에 의해 덮어씌워졌습니다. Copy to clipboard @@ -496,7 +496,7 @@ Panoya kopyala Copia negli appunti Kopírovat do schránky - 클립보드로 복사 + 클립보드로 복사 Show default values: @@ -510,7 +510,7 @@ Varsayılan değerleri göster: Mostra i valori originali: Ukázat původní hodnoty: - 기본값 표시: + 기본값 표시: diff --git a/addons/statemachine/stringtable.xml b/addons/statemachine/stringtable.xml index d381ba02ad..5cc1f7dbcb 100644 --- a/addons/statemachine/stringtable.xml +++ b/addons/statemachine/stringtable.xml @@ -14,7 +14,7 @@ Community Base Addons - Durum Makinası Community Base Addons - Macchina a stati finiti Community Base Addons - State Machine - 커뮤니티 베이스 애드온 - 상태 머신 + 커뮤니티 베이스 애드온 - 상태 머신 diff --git a/addons/strings/stringtable.xml b/addons/strings/stringtable.xml index 8cc78612b7..be20991e64 100644 --- a/addons/strings/stringtable.xml +++ b/addons/strings/stringtable.xml @@ -14,7 +14,7 @@ Community Base Addons - Yazılar Community Base Addons - Stringhe Community Base Addons - Texty - 커뮤니티 베이스 애드온 - 스트링 + 커뮤니티 베이스 애드온 - 스트링 . @@ -30,7 +30,7 @@ . , , - . + . , @@ -46,7 +46,7 @@ , . . - , + , diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index 4e3f4bc923..9d474c78f1 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -15,7 +15,7 @@ Community Base Addons - Interfaccia utente Community Base Addons - Uživatelské prostředí Community Base Addons - Interfaz de usuario - 커뮤니티 베이스 애드온 - 유저 인터페이스 + 커뮤니티 베이스 애드온 - 유저 인터페이스 User Interface @@ -32,7 +32,7 @@ 玩家界面 Interfaz de usuario Kullanıcı Arayüzü - 유저 인터페이스 + 유저 인터페이스 Progress Bar @@ -47,7 +47,7 @@ Ukazatel průběhu Индикатор выполнения Barra de progreso - 상태 표시줄 + 상태 표시줄 Position of the progress bar. @@ -62,7 +62,7 @@ Pozici ukazatele průběhu. Позиция индикатора выполнения. Posición de la barra de progreso. - 상태 표시줄 위치 + 상태 표시줄 위치 Store Server Passwords @@ -77,7 +77,7 @@ 存储服务器密码 Запоминать пароли серверов Almacenar contraseñas del servidor - 서버 암호 저장 + 서버 암호 저장 Setting to store the passwords entered when connecting to a multiplayer server. @@ -92,7 +92,7 @@ 设置是否存储连接服务器时输入的密码。 Параметр запоминания паролей сервера при входе на них. Configuración para almacenar las contraseñas ingresadas al conectarse a un servidor multijugador. - 멀티플레이어 서버에 연결할 때 입력한 암호를 저장하도록 설정합니다. + 멀티플레이어 서버에 연결할 때 입력한 암호를 저장하도록 설정합니다. Save passwords @@ -107,7 +107,7 @@ 记住密码 Сохранять пароли Guardar contraseñas - 암호 저장 + 암호 저장 Passwords are stored when connecting to a multiplayer server. @@ -122,7 +122,7 @@ 连接到服务器时将记住密码 Пароли будут сохраняться при входе на сервера. Las contraseñas se almacenan cuando se conecta a un servidor multijugador - 암호는 멀티플레이어 서버에 연결할 때 저장됩니다. + 암호는 멀티플레이어 서버에 연결할 때 저장됩니다. Do not save passwords @@ -137,7 +137,7 @@ 不保存密码 Не сохранять пароли No guarde las contraseñas - 암호 저장하지 않음 + 암호 저장하지 않음 Passwords are not stored when connecting to a multiplayer server. Already stored passwords will not be automatically entered. @@ -152,7 +152,7 @@ 当连接到服务器时将不保存密码。已保存的密码将不自动填写。 Пароли не сохраняются при входе на сервера. Уже сохранённые пароли не будут автоматически вставлены. Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas no se ingresarán automáticamente. - 멀티플레이어 서버에 연결할 때 암호가 저장되지 않습니다. 이미 저장된 암호는 자동으로 입력되지 않습니다. + 멀티플레이어 서버에 연결할 때 암호가 저장되지 않습니다. 이미 저장된 암호는 자동으로 입력되지 않습니다. Delete passwords @@ -167,7 +167,7 @@ 删除密码 Удалить пароли Eliminar contraseñas - 암호 삭제 + 암호 삭제 Passwords are not stored when connecting to a multiplayer server. Already stored passwords are deleted from the profile. @@ -182,7 +182,7 @@ 当连接到服务器时将不保存密码。已保存的密码将会删除。 Пароли не сохраняются при входе на сервера. Уже сохранённые пароли будут удалены. Las contraseñas no se almacenan cuando se conecta a un servidor multijugador. Las contraseñas ya almacenadas se eliminan del perfil. - 멀티플레이어 서버에 연결할 때 암호가 저장되지 않습니다. 이미 저장된 암호는 프로필에서 삭제됩니다. + 멀티플레이어 서버에 연결할 때 암호가 저장되지 않습니다. 이미 저장된 암호는 프로필에서 삭제됩니다. Notification @@ -197,7 +197,7 @@ Notification Уведомление Notificación - 알림 + 알림 Textual feedback to the player. @@ -212,7 +212,7 @@ Notification textuelle au joueur. Текстовая информация для игрока. Comentarios textuales para el jugador - 플레이어에 대한 텍스트 피드백입니다, + 플레이어에 대한 텍스트 피드백입니다, Show all missions @@ -227,7 +227,7 @@ Afficher toutes les missions Показать все миссии Mostrar todas las misiones - 모든 미션 보이기 + 모든 미션 보이기 Show custom missions @@ -242,7 +242,7 @@ Afficher les missions personnalisées Показать пользовательские миссии Mostrar misiones personalizadas - 커스텀 미션 보이기 + 커스텀 미션 보이기 Notification Lifetime @@ -257,7 +257,7 @@ Długość żywotności powiadomień Duración de la notificación Durata notifica - 알림 지속시간 + 알림 지속시간 Notification display duration in seconds. @@ -272,7 +272,7 @@ Ilość czasu przez który widoczne jest powiadomienie Duración de la visualización de notificaciones en segundos Durata della notifica in secondi. - 알림이 표시되는 시간입니다. (초 단위) + 알림이 표시되는 시간입니다. (초 단위) Contact the server admin. @@ -287,7 +287,7 @@ Póngase en contacto con el administrador del servidor Kontaktujte správce serveru. Contatta l'amministratore del server. - 서버 관리자에게 문의하십시오. + 서버 관리자에게 문의하십시오. Lobby Manager @@ -299,7 +299,7 @@ 角色大厅管理 Manažer lobby Gestore lobby. - 로비 매니저 + 로비 매니저 Adjusting group order... @@ -311,7 +311,7 @@ 调整小队顺序 Upravuji pořadí skupiny... Riordinando il gruppo... - 그룹 순서 조정 중... + 그룹 순서 조정 중... Back up mission before using this tool. @@ -323,7 +323,7 @@ 使用此工具之前，请备份任务。 Zálohujte misi před použitím tohoto nástroje. Salva una copia della missione prima di usare questo strumento. - 이 도구를 사용하기 전에 임무를 백업하십시오. + 이 도구를 사용하기 전에 임무를 백업하십시오. diff --git a/addons/vectors/stringtable.xml b/addons/vectors/stringtable.xml index 10f0d76873..145e913b94 100644 --- a/addons/vectors/stringtable.xml +++ b/addons/vectors/stringtable.xml @@ -14,7 +14,7 @@ Community Base Addons - Vektörler Community Base Addons - Vettori Community Base Addons - Vektory - 커뮤니티 베이스 애드온 - 벡터 + 커뮤니티 베이스 애드온 - 벡터 diff --git a/addons/versioning/stringtable.xml b/addons/versioning/stringtable.xml index 0dd6623749..a55a08c715 100644 --- a/addons/versioning/stringtable.xml +++ b/addons/versioning/stringtable.xml @@ -14,7 +14,7 @@ Community Base Addons - Versiyonlama Community Base Addons - Versionamento Community Base Addons - Verzování - 커뮤니티 베이스 애드온 - 버전 + 커뮤니티 베이스 애드온 - 버전 diff --git a/addons/xeh/stringtable.xml b/addons/xeh/stringtable.xml index cef74111a1..f4e233f552 100644 --- a/addons/xeh/stringtable.xml +++ b/addons/xeh/stringtable.xml @@ -14,7 +14,7 @@ Community Base Addons - Geliştirmiş Durum İşlenimi Community Base Addons - Gestore di Eventi Esteso Community Base Addons - Rozšířené ovladače událostí - 커뮤니티 베이스 애드온 - 확장된 이벤트 조정기 + 커뮤니티 베이스 애드온 - 확장된 이벤트 조정기 diff --git a/optionals/legacy_jr/stringtable.xml b/optionals/legacy_jr/stringtable.xml index 9052698853..16b8318358 100644 --- a/optionals/legacy_jr/stringtable.xml +++ b/optionals/legacy_jr/stringtable.xml @@ -10,7 +10,7 @@ 社区基础插件-传统共用导轨 Community Base Addons - Legacy Joint Rails Community Base Addons - Legacy Joint Rails - 커뮤니티 베이스 애드온 - 레거시 조인트 레일 + 커뮤니티 베이스 애드온 - 레거시 조인트 레일 From 714d78691a92981d14e7b1fcd1999c2ced091528 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 20 Feb 2023 16:25:48 -0600 Subject: [PATCH 100/111] fix duplicates --- addons/main/stringtable.xml | 1 - addons/ui/stringtable.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/addons/main/stringtable.xml b/addons/main/stringtable.xml index 7001279f27..81503c82e9 100644 --- a/addons/main/stringtable.xml +++ b/addons/main/stringtable.xml @@ -31,7 +31,6 @@ https://www.github.com/CBATeam/CBA_A3 https://www.github.com/CBATeam/CBA_A3 https://www.github.com/CBATeam/CBA_A3 - https://www.github.com/CBATeam/CBA_A3 Community Base Addons diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index 9d474c78f1..28dd855059 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -32,7 +32,6 @@ 玩家界面 Interfaz de usuario Kullanıcı Arayüzü - 유저 인터페이스 Progress Bar From d95fdf4214b6d7f86e57fe784e0c9f6570914b2e Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 20 Feb 2023 16:28:15 -0600 Subject: [PATCH 101/111] Update stringtable.xml --- addons/disposable/stringtable.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/disposable/stringtable.xml b/addons/disposable/stringtable.xml index 106438fa30..ffe0682cae 100644 --- a/addons/disposable/stringtable.xml +++ b/addons/disposable/stringtable.xml @@ -112,7 +112,6 @@ Automatycznie wyrzucaj wyrzutnie jednorazową gdy tylko zostanie wybrana kolejna broń. Butta automaticamente il lanciatore usato non appena un'altra arma viene selezionata 다른 무기를 선택하는 즉시 사용한 일회용 발사기를 자동으로 떨어뜨립니다. - Replace Disposable Launcher From e89f048ad6f7258e6aca85e376955d18945a3774 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 24 Jun 2023 06:49:42 -0500 Subject: [PATCH 102/111] Main - Fix script_macros_mission redefinitions for mikro (#1571) --- addons/main/script_macros_mission.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/main/script_macros_mission.hpp b/addons/main/script_macros_mission.hpp index b836360ebd..1d59bf0226 100644 --- a/addons/main/script_macros_mission.hpp +++ b/addons/main/script_macros_mission.hpp @@ -43,6 +43,9 @@ */ +#undef PATHTO_SYS +#undef PATHTOF_SYS +#undef PATHTOF2_SYS #ifdef CUSTOM_FOLDER #define PATHTO_SYS(var1,var2,var3) ##CUSTOM_FOLDER\##var3.sqf #define PATHTOF_SYS(var1,var2,var3) ##CUSTOM_FOLDER\##var3 From 4809ef883bd22edfd6a6ab468fbdc7af8272e296 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 24 Jun 2023 06:50:28 -0500 Subject: [PATCH 103/111] Optics - Increase width of hidePeripheralVision slightly to prevent gaps (#1568) --- addons/optics/fnc_initDisplayInterrupt.sqf | 2 +- addons/optics/fnc_loadScriptedOptic.sqf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/optics/fnc_initDisplayInterrupt.sqf b/addons/optics/fnc_initDisplayInterrupt.sqf index cda007f215..260923da1f 100644 --- a/addons/optics/fnc_initDisplayInterrupt.sqf +++ b/addons/optics/fnc_initDisplayInterrupt.sqf @@ -46,7 +46,7 @@ private _ctrlBlackRight = _display ctrlCreate ["RscText", IDC_BLACK_RIGHT]; private _width = THIRD_SCREEN_WIDTH; if (GVAR(hidePeripheralVision)) then { - _width = 0.5 - (_bodyPosition select 2)/2 - safezoneXAbs; + _width = 0.5 - (_bodyPosition select 2)/2 - safezoneXAbs + pixelW/2; }; _ctrlBlackLeft ctrlSetBackgroundColor [0,0,0,1]; diff --git a/addons/optics/fnc_loadScriptedOptic.sqf b/addons/optics/fnc_loadScriptedOptic.sqf index d1a982ec54..785d034c1d 100644 --- a/addons/optics/fnc_loadScriptedOptic.sqf +++ b/addons/optics/fnc_loadScriptedOptic.sqf @@ -85,7 +85,7 @@ _ctrlReticleSafezone ctrlCommit 0; private _width = THIRD_SCREEN_WIDTH; if (GVAR(hidePeripheralVision)) then { - _width = 0.5 - (_bodyPosition select 2)/2 - safezoneXAbs; + _width = 0.5 - (_bodyPosition select 2)/2 - safezoneXAbs + pixelW/2; }; _ctrlBlackLeft ctrlSetPositionW _width; From 2029124a88a8ad91d2fee2ed49bbd85315f50c97 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 24 Jun 2023 06:51:07 -0500 Subject: [PATCH 104/111] Common - Fix debug macros in CBA_fnc_switchPlayer (#1566) --- addons/common/fnc_switchPlayer.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/common/fnc_switchPlayer.sqf b/addons/common/fnc_switchPlayer.sqf index 371d7a6e3b..854d1cfbf8 100644 --- a/addons/common/fnc_switchPlayer.sqf +++ b/addons/common/fnc_switchPlayer.sqf @@ -43,13 +43,13 @@ _dummyUnit = (_ar select 4) createUnit [_type, [0, 0, 0], [], 0, "NONE"]; // Joi if (isNull _dummyUnit) exitWith { hint "Sorry, something went wrong, dummyUnit is null" }; [_oldUnit] join _dummyGroup; -LOG(format["1.Dummy created, State saved and put oldUnit in new group: %1", _dummyGroup]); +LOG_1("1.Dummy created, State saved and put oldUnit in new group: %1", _dummyGroup); private _newUnit = _dummyGroup createUnit [_type, _ar select 5, [], 0, "NONE"]; if (isNull _newUnit) exitWith { hint "Sorry, something went wrong, newUnit is null" }; -LOG(format["2.New unit created, local: %1", local _newUnit]); +LOG_1("2.New unit created, local: %1", local _newUnit); sleep 1; addSwitchableUnit _newUnit; @@ -58,7 +58,7 @@ selectPlayer _newUnit; _newUnit setRank (_ar select 2); _newUnit addScore (_ar select 3); -LOG(format["3.State transfered, switched player control to new unit, local: %1", local _newUnit]); +LOG_1("3.State transfered, switched player control to new unit, local: %1", local _newUnit); sleep 1; if (_ar select 7 != "") then { From 191deb8cbea941d2e680230c97105aeba316bdd4 Mon Sep 17 00:00:00 2001 From: artemoz Date: Sat, 24 Jun 2023 14:51:36 +0300 Subject: [PATCH 105/111] Update fnc_mapGridToPos.sqf (#1579) With check-decrement ordering the while loops execute twice, leaving _minus at -2, then _rvOriginX/_rvOriginY get set to 0 + (abs - 2) - 1 = 1 (and get cached at GVAR(rvOriginX)/GVAR(rvOriginY)), then at line 176 said variables get subtracted from previous calculated coordinates --- addons/common/fnc_mapGridToPos.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/common/fnc_mapGridToPos.sqf b/addons/common/fnc_mapGridToPos.sqf index f064d0d52c..a27ed4924c 100644 --- a/addons/common/fnc_mapGridToPos.sqf +++ b/addons/common/fnc_mapGridToPos.sqf @@ -120,15 +120,15 @@ if (IS_STRING(_pos)) then { private _check = _start; private _minus = 0; while {_check == _start} do { - _check = format["%1", mapGridPosition [0, _minus]]; _minus = _minus - 1; + _check = format["%1", mapGridPosition [0, _minus]]; }; _rvOriginY = _rvOriginY+(abs _minus)-1; _minus = 0; _check = _start; while {_check == _start} do { - _check = format["%1", mapGridPosition [_minus, 0]]; _minus = _minus - 1; + _check = format["%1", mapGridPosition [_minus, 0]]; }; _rvOriginX = _rvOriginX+(abs _minus)-1; }; From 9fd18c269dabfea38cd16cac1cd5cf604015a660 Mon Sep 17 00:00:00 2001 From: 10Dozen Date: Sat, 24 Jun 2023 14:52:22 +0300 Subject: [PATCH 106/111] Item Context Menu - Flexible menu width (#1492) * Makes Item Context Menu flexible width * Fix width calculations to use static margins and skip hidden options Changes width calculation to use static margins. Fixes width calculation was checking for hidden options * Fix indentation styling --- addons/ui/fnc_openItemContextMenu.sqf | 12 ++++++++++-- addons/ui/script_component.hpp | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/addons/ui/fnc_openItemContextMenu.sqf b/addons/ui/fnc_openItemContextMenu.sqf index e35df2e725..3d5eabcef1 100644 --- a/addons/ui/fnc_openItemContextMenu.sqf +++ b/addons/ui/fnc_openItemContextMenu.sqf @@ -48,6 +48,10 @@ if (_options isEqualTo []) exitWith {}; // ctrlSetBackgroundColor command does not seem to work for RscListBox. private _list = _display ctrlCreate [QGVAR(ItemContextMenu), -1]; +private _font = getText (configfile >> QGVAR(ItemContextMenu) >> "font"); +private _fontSize = getNumber (configFile >> ctrlClassName _list >> "sizeEx"); +private _longestName = ""; + // --- // Populate context menu with options. { @@ -63,6 +67,10 @@ private _list = _display ctrlCreate [QGVAR(ItemContextMenu), -1]; }; if ((_slot in _slots || {"ALL" in _slots}) && {_args call _conditionShow}) then { + if (count _longestName < count _displayName) then { + _longestName = _displayName; + }; + private _index = _list lbAdd _displayName; _list lbSetTooltip [_index, _tooltip]; // Does not seem to work for RscDisplayInventory controls? Hard coded overwrite? @@ -154,8 +162,8 @@ getMousePosition params ["_left", "_top"]; _left = _left - pixelW; _top = _top - pixelH; -private _width = ctrlPosition _list select 2; -private _height = lbSize _list * getNumber (configFile >> ctrlClassName _list >> "sizeEx"); +private _width = (ctrlPosition _list select 2) max ((_longestName getTextWidth [_font, _fontSize]) + TEXT_MARGINS_WIDTH + RSCLISTBOX_PICTURE_WIDTH); +private _height = lbSize _list * _fontSize; _list ctrlSetPosition [_left, _top, _width, _height]; _list ctrlCommit 0; diff --git a/addons/ui/script_component.hpp b/addons/ui/script_component.hpp index 06e9a446a8..431bfc06a5 100644 --- a/addons/ui/script_component.hpp +++ b/addons/ui/script_component.hpp @@ -36,6 +36,9 @@ #define GRID_3DEN_W (pixelW * pixelGrid * 0.5) #define GRID_3DEN_H (pixelH * pixelGrid * 0.5) +#define TEXT_MARGINS_WIDTH (2 * 0.008) // Hardcoded value, see https://community.bistudio.com/wiki/getTextWidth +#define RSCLISTBOX_PICTURE_WIDTH 0.05 // Empirical value, RSCListBox's left icon picture width + // Lobby Manager #define IDC_LM_SLOTS 50 #define IDC_LM_CALLSIGN 51 From 4ee49d4070c88583d4f1f8182dd4a44f2f145511 Mon Sep 17 00:00:00 2001 From: Drofseh Date: Sat, 24 Jun 2023 04:53:57 -0700 Subject: [PATCH 107/111] Common - Improve CBA_fnc_addItem, Fix CBA_fnc_addMagazine return (#1562) * Attempt to add item to vehicle if unit in vehicle Attempt to add the item to the unit's vehicle instead of always chucking it out the window onto the ground. * fix return for addMagazine and addItem --- addons/common/fnc_addItem.sqf | 21 +++++++++++++-------- addons/common/fnc_addMagazine.sqf | 6 +++--- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/addons/common/fnc_addItem.sqf b/addons/common/fnc_addItem.sqf index 2b2abf75dd..c8fb456e36 100644 --- a/addons/common/fnc_addItem.sqf +++ b/addons/common/fnc_addItem.sqf @@ -11,7 +11,7 @@ Description: Parameters: _unit - the unit _item - name of the weapon to add - _verify - if true, then put item on the ground if it can't be added + _verify - if true, then put item in vehicle or on the ground if it can't be added Returns: true on success, false otherwise @@ -52,16 +52,21 @@ if (_verify) then { _unit addItem _item; _return = true; } else { - _unit switchMove "ainvpknlmstpslaywrfldnon_1"; + private _vehicle = vehicle _unit; + if (_vehicle isEqualTo _unit) then { + _unit switchMove "ainvpknlmstpslaywrfldnon_1"; - private _weaponHolder = nearestObject [_unit, "WeaponHolder"]; + private _weaponHolder = nearestObject [_unit, "WeaponHolder"]; - if (isNull _weaponHolder || {_unit distance _weaponHolder > 2}) then { - _weaponHolder = createVehicle ["GroundWeaponHolder", [0,0,0], [], 0, "NONE"]; - _weaponHolder setPosASL getPosASL _unit; - }; + if (isNull _weaponHolder || {_unit distance _weaponHolder > 2}) then { + _weaponHolder = createVehicle ["GroundWeaponHolder", [0,0,0], [], 0, "NONE"]; + _weaponHolder setPosASL getPosASL _unit; + }; - [_weaponHolder, _item] call CBA_fnc_addItemCargo; + [_weaponHolder, _item, 1, _verify] call CBA_fnc_addItemCargo; + } else { + [_vehicle, _item, 1, _verify] call CBA_fnc_addItemCargo; + }; }; } else { _unit addItem _item; diff --git a/addons/common/fnc_addMagazine.sqf b/addons/common/fnc_addMagazine.sqf index e5771669eb..b7341769b9 100644 --- a/addons/common/fnc_addMagazine.sqf +++ b/addons/common/fnc_addMagazine.sqf @@ -12,7 +12,7 @@ Parameters: _unit - the unit or vehicle _item - name of the magazine to add _ammo - ammo count - _verify - if true, then put item on the ground if it can't be added + _verify - if true, then put item in vehicle or on the ground if it can't be added Returns: true on success, false otherwise @@ -69,9 +69,9 @@ if (_verify) then { _weaponHolder setPosASL getPosASL _unit; }; - _return = [_weaponHolder, _item, 1, _verify, _ammo] call CBA_fnc_addMagazineCargo; + [_weaponHolder, _item, 1, _verify, _ammo] call CBA_fnc_addMagazineCargo; } else { - _return = [_vehicle, _item, 1, _verify, _ammo] call CBA_fnc_addMagazineCargo; + [_vehicle, _item, 1, _verify, _ammo] call CBA_fnc_addMagazineCargo; }; }; } else { From 5c64f10c1689c7c3e80d2dd26417c8d8709479b1 Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Sat, 24 Jun 2023 13:55:26 +0200 Subject: [PATCH 108/111] Common - Updated CBA_fnc_removeBinocularMagazine (#1556) * Update fnc_removeBinocularMagazine.sqf * Update fnc_removeBinocularMagazine.sqf * Update fnc_removeBinocularMagazine.sqf --- addons/common/fnc_removeBinocularMagazine.sqf | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/addons/common/fnc_removeBinocularMagazine.sqf b/addons/common/fnc_removeBinocularMagazine.sqf index c2077c784a..14aad35aa0 100644 --- a/addons/common/fnc_removeBinocularMagazine.sqf +++ b/addons/common/fnc_removeBinocularMagazine.sqf @@ -5,6 +5,8 @@ Function: CBA_fnc_removeBinocularMagazine Description: Removes the magazine of the units rangefinder. + Has to be executed on the machine where the unit is local. + Parameters: _unit - A unit @@ -17,7 +19,7 @@ Examples: (end) Author: - commy2 + commy2, johnb43 ---------------------------------------------------------------------------- */ SCRIPT(removeBinocularMagazine); @@ -25,11 +27,4 @@ params [["_unit", objNull, [objNull]]]; if (!local _unit) exitWith {}; -private _binocular = binocular _unit; -private _selectBinocular = currentWeapon _unit isEqualTo _binocular; - -_unit addWeapon _binocular; - -if (_selectBinocular) then { - _unit selectWeapon _binocular; -}; +_unit removeBinocularItem (_unit call CBA_fnc_binocularMagazine); From 1ec31636620899722334296ffc0b458e5f6615ab Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Sat, 24 Jun 2023 13:55:56 +0200 Subject: [PATCH 109/111] Common - Updated CBA_fnc_binocularMagazine (#1555) * Update fnc_binocularMagazine.sqf * Update fnc_binocularMagazine.sqf --- addons/common/fnc_binocularMagazine.sqf | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/addons/common/fnc_binocularMagazine.sqf b/addons/common/fnc_binocularMagazine.sqf index deb3e35818..97fcc8962f 100644 --- a/addons/common/fnc_binocularMagazine.sqf +++ b/addons/common/fnc_binocularMagazine.sqf @@ -17,20 +17,10 @@ Examples: (end) Author: - commy2 + commy2, johnb43 ---------------------------------------------------------------------------- */ SCRIPT(binocularMagazine); params [["_unit", objNull, [objNull]]]; -private _binocular = binocular _unit; -private _magazine = ""; - -{ - if ((_x select 0) isEqualTo _binocular) exitWith { - // note: if there is no magazine, _x(4,0) will be nil - _magazine = (_x select 4) param [0, ""]; - }; -} forEach weaponsitems _unit; - -_magazine +(binocularMagazine _unit) param [0, ""] From c472830703a5c335bfa990c393a6b095d66d74bc Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 24 Jun 2023 13:56:53 +0200 Subject: [PATCH 110/111] Add CBA_fnc_prettyFormat (#1522) * New function prettyPrint * Use spaces instead of tabs * Fixed spaces, parameters for tab char and indent * Removed trailing whitespace * Use isEqualTo instead of count Co-authored-by: Dystopian * Added space between command and argument Co-authored-by: Dystopian * Avoid count every loop * Correct indentation for empty arrays * Moved variable assignment inside of the if statement * Renamed prettyPrint to prettyFormat * Changed prettyPrint to prettyFormat in files * Assign variable from if statement * Join all elements explicitly at end of script * Added Dystopian and commy2 as authors * Fixed usage of forEach instead of apply * Return [] for empty arrays * Removed unnecessary brackets Co-authored-by: Dystopian * Removed ";" from returned values Co-authored-by: commy2 * Fix linter Co-authored-by: commy2 * Added parameter for line break char * Documentation for line break param * Default indentation 4 spaces * Renamed _tabs to _indents --------- Co-authored-by: 7erra <38866692+7erra@users.noreply.github.com> Co-authored-by: Dystopian --- addons/strings/CfgFunctions.hpp | 1 + addons/strings/fnc_prettyFormat.sqf | 72 ++++++++++++++++++++++++++++ addons/strings/script_component.hpp | 6 +++ addons/strings/test.sqf | 2 +- addons/strings/test_prettyFormat.sqf | 49 +++++++++++++++++++ 5 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 addons/strings/fnc_prettyFormat.sqf create mode 100644 addons/strings/test_prettyFormat.sqf diff --git a/addons/strings/CfgFunctions.hpp b/addons/strings/CfgFunctions.hpp index 5afd84a60b..01a2f6a9af 100644 --- a/addons/strings/CfgFunctions.hpp +++ b/addons/strings/CfgFunctions.hpp @@ -9,6 +9,7 @@ class CfgFunctions { PATHTO_FNC(formatElapsedTime); PATHTO_FNC(formatNumber); PATHTO_FNC(leftTrim); + PATHTO_FNC(prettyFormat); PATHTO_FNC(removeWhitespace); PATHTO_FNC(replace); PATHTO_FNC(rightTrim); diff --git a/addons/strings/fnc_prettyFormat.sqf b/addons/strings/fnc_prettyFormat.sqf new file mode 100644 index 0000000000..bfef377751 --- /dev/null +++ b/addons/strings/fnc_prettyFormat.sqf @@ -0,0 +1,72 @@ +#include "script_component.hpp" +/* ---------------------------------------------------------------------------- +Function: CBA_fnc_prettyFormat + +Description: + Makes an array easy to read. + +Parameters: + _array - Array to format + _indents - Indentation string (optional, default: " ") + _lineBreak - Seperator string (optional, default: endl) + _depth - Initial indentation count (optional, default: 0) + +Returns: + Formatted string + +Examples: + (begin example) + [[0, 1, ["22", 33, []], 4]] call CBA_fnc_prettyFormat; + //[ + // 0, + // 1, + // [ + // "22", + // 33, + // [] + // ], + // 4 + //] + + [[0, 1, ["22", 33, []], 4], ">---"] call CBA_fnc_prettyFormat; + //[ + //>---0, + //>---1, + //>---[ + //>--->---"22", + //>--->---33, + //>--->---[] + //>---], + //>---4 + //] + + [[0, 1, ["22", 33, []], 4], ">---", "\n"] call CBA_fnc_prettyFormat; + //[\n>---0,\n>---1,\n>---[\n>--->---"22",\n>--->---33,\n>--->---[]\n>---],\n>---4\n] + (end) + +Author: + Terra, Dystopian, commy2 + +---------------------------------------------------------------------------- */ +params [ + ["_array", [], [[]]], + ["_indent", " ", [""]], + ["_lineBreak", endl, [""]], + ["_depth", 0, [0]] +]; + +private _indents = STRING_REPEAT(_indent, _depth); + +if (_array isEqualTo []) exitWith { + _indents + "[]" // return +}; + +private _lines = _array apply { + if (_x isEqualType []) then { + [_x, _indent, _lineBreak, _depth + 1] call CBA_fnc_prettyFormat + } else { + _indents + _indent + str _x + }; +}; + +_indents + "[" + _lineBreak + (_lines joinString ("," + _lineBreak)) + _lineBreak + _indents + "]" // return diff --git a/addons/strings/script_component.hpp b/addons/strings/script_component.hpp index 2e913ab891..547f630767 100644 --- a/addons/strings/script_component.hpp +++ b/addons/strings/script_component.hpp @@ -11,6 +11,12 @@ #include "\x\cba\addons\main\script_macros.hpp" +#define STRING_REPEAT(string, repeats) (call {\ + private _return = [];\ + _return resize (repeats);\ + _return apply {string} joinString ""\ +}) + #define UTF8_TABLE [\ ["%20"," "],\ ["%21","!"],\ diff --git a/addons/strings/test.sqf b/addons/strings/test.sqf index b653b42158..fca264cc45 100644 --- a/addons/strings/test.sqf +++ b/addons/strings/test.sqf @@ -5,7 +5,7 @@ #define DEBUG_MODE_FULL #include "script_component.hpp" -#define TESTS ["strings"] +#define TESTS ["strings", "prettyFormat"] SCRIPT(test-strings); diff --git a/addons/strings/test_prettyFormat.sqf b/addons/strings/test_prettyFormat.sqf new file mode 100644 index 0000000000..de1439dafe --- /dev/null +++ b/addons/strings/test_prettyFormat.sqf @@ -0,0 +1,49 @@ +// ---------------------------------------------------------------------------- +#define DEBUG_MODE_FULL +#include "script_component.hpp" + +SCRIPT(test_prettyFormat); + +// ---------------------------------------------------------------------------- + +LOG("Testing CBA_fnc_prettyFormat"); + +private _fn = "CBA_fnc_prettyFormat"; +TEST_DEFINED("CBA_fnc_prettyFormat",""); + +private _val = [] call CBA_fnc_prettyFormat; +private _exp = "[]"; +TEST_OP(_val,isEqualTo,_exp,_fn); + +_val = [[], "xY", nil, 2] call CBA_fnc_prettyFormat; +_exp = "xYxY[]"; +TEST_OP(_val,isEqualTo,_exp,_fn); + +_val = [[0, 1, ["22", 33, []], 4]] call CBA_fnc_prettyFormat; +_exp = [ + "[", + " 0,", + " 1,", + " [", + " ""22"",", + " 33,", + " []", + " ],", + " 4", + "]" +] joinString endl; +TEST_OP(_val,isEqualTo,_exp,_fn); + +_val = [[0, 1, ["22", 33, []], 4], ">---", "\n"] call CBA_fnc_prettyFormat; +_exp = "[\n>---0,\n>---1,\n>---[\n>--->---""22"",\n>--->---33,\n>--->---[]\n>---],\n>---4\n]"; +TEST_OP(_val,isEqualTo,_exp,_fn); + +_val = [[[[]]], """", endl, 1] call CBA_fnc_prettyFormat; +_exp = [ + """[", + """""[", + """""""[]", + """""]", + """]" +] joinString endl; +TEST_OP(_val,isEqualTo,_exp,_fn); From 263286f95453697bfb296937cb1a896c7885e682 Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Thu, 13 Jul 2023 13:44:59 +0200 Subject: [PATCH 111/111] Common - Added CBA_fnc_execAfterNFrames from ZEN (#1584) * Added n frame delay * Revert "Added n frame delay" This reverts commit 50df691493ff87b89d5971ff74619d71f68ccd83. * Added function from ZEN * Update addons/common/fnc_execAfterNFrames.sqf Co-authored-by: PabstMirror * Update fnc_execNextFrame.sqf --------- Co-authored-by: PabstMirror --- addons/common/CfgFunctions.hpp | 1 + addons/common/fnc_execAfterNFrames.sqf | 35 ++++++++++++++++++++++++++ addons/common/fnc_execNextFrame.sqf | 4 +-- 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 addons/common/fnc_execAfterNFrames.sqf diff --git a/addons/common/CfgFunctions.hpp b/addons/common/CfgFunctions.hpp index 17478a7557..9366f9803d 100644 --- a/addons/common/CfgFunctions.hpp +++ b/addons/common/CfgFunctions.hpp @@ -131,6 +131,7 @@ class CfgFunctions { PATHTO_FNC(directCall); PATHTO_FNC(objectRandom); PATHTO_FNC(execNextFrame); + PATHTO_FNC(execAfterNFrames); PATHTO_FNC(waitAndExecute); PATHTO_FNC(waitUntilAndExecute); PATHTO_FNC(compileFinal); diff --git a/addons/common/fnc_execAfterNFrames.sqf b/addons/common/fnc_execAfterNFrames.sqf new file mode 100644 index 0000000000..3c141e72ca --- /dev/null +++ b/addons/common/fnc_execAfterNFrames.sqf @@ -0,0 +1,35 @@ +#include "script_component.hpp" +/* ---------------------------------------------------------------------------- +Function: CBA_fnc_execAfterNFrames + +Description: + Executes the given code after the specified number of frames. + +Parameters: + _function - The function to run. + _args - Parameters passed to the function executing. This will be the same array every execution. (optional, default: []) + _frames - The amount of frames the execution of the function should be delayed by. (optional, default: 0) + +Returns: + Nothing Useful + +Examples: + (begin example) + [{hint "Done!"}, [], 5] call cba_fnc_execAfterNFrames; + (end) + +Author: + mharis001, donated from ZEN +---------------------------------------------------------------------------- */ + +if (canSuspend) exitWith { + [CBA_fnc_execAfterNFrames, _this] call CBA_fnc_directCall; +}; + +params [["_function", {}, [{}]], ["_args", []], ["_frames", 0, [0]]]; + +if (_frames > 0) exitWith { + [CBA_fnc_execAfterNFrames, [_function, _args, _frames - 1]] call CBA_fnc_execNextFrame; +}; + +_args call _function; diff --git a/addons/common/fnc_execNextFrame.sqf b/addons/common/fnc_execNextFrame.sqf index c81cc92b9f..e0b2b00eef 100644 --- a/addons/common/fnc_execNextFrame.sqf +++ b/addons/common/fnc_execNextFrame.sqf @@ -7,10 +7,10 @@ Description: Parameters: _function - The function to run. - _args - Parameters passed to the function executing. This will be the same array every execution. [optional] + _args - Parameters passed to the function executing. This will be the same array every execution. (optional, default: []) Returns: - Nothing + Nothing Useful Examples: (begin example)