Skip to content

Commit 7863712

Browse files
PabstMirrorPabstMirror
committed
Merge branch 'master' into release-3.18.2
2 parents fe8ba46 + d819312 commit 7863712

22 files changed

+199
-153
lines changed

‎addons/arrays/fnc_getArrayElements.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ while {_countA > 0} do {
2828
private _var = _array select 0;
2929
_array = _array - [_var];
3030
private _countB = count _array;
31-
_return = _return + [_var, _countA - _countB];
31+
_return append [_var, _countA - _countB];
3232
_countA = _countB;
3333
};
3434

‎addons/bitwise/stringtable.xml

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
<Package name="bitwise">
44
<Key ID="STR_CBA_bitwise_Component">
55
<English>Community Base Addons - Bitwise</English>
6+
<French>Community Base Addons - Bit par bit</French>
7+
<German>Community Base Addons - Bitweise</German>
8+
<Korean>커뮤니티 베이스 애드온 - 비트 연산</Korean>
9+
<Japanese>Community Base Addons - ビット演算</Japanese>
610
</Key>
711
</Package>
812
</Project>

‎addons/diagnostic/CfgEventHandlers.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ class Extended_PreInit_EventHandlers {
1212

1313
class Extended_DisplayLoad_EventHandlers {
1414
class RscDisplayDebugPublic {
15-
GVAR(extendedDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
15+
GVAR(extendedDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
1616
// remove scripted cancel button.
1717
GVAR(removeCancelButton) = "((_this select 0) displayCtrl 2) ctrlEnable false; ((_this select 0) displayCtrl 2) ctrlShow false;";
1818
};
1919
class RscDisplayInterrupt {
20-
GVAR(extendedDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
21-
GVAR(targetDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initTargetDebugConsole)'));
20+
GVAR(extendedDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
21+
GVAR(targetDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initTargetDebugConsole)'));
2222
};
2323
class RscDisplayMPInterrupt {
24-
GVAR(extendedDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
25-
GVAR(targetDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initTargetDebugConsole)'));
24+
GVAR(extendedDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
25+
GVAR(targetDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initTargetDebugConsole)'));
2626
};
2727
};

‎addons/diagnostic/stringtable.xml

+5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<Spanish>4 Espacios</Spanish>
2424
<Italian>4 Spazi</Italian>
2525
<Polish>4 Spacje</Polish>
26+
<German>4 Leerzeichen</German>
2627
<Korean>네 공간</Korean>
2728
<Japanese>スペース4個</Japanese>
2829
<Chinese>4 個空格</Chinese>
@@ -35,6 +36,7 @@
3536
<Spanish>Espaciado de la Consola de Depuración</Spanish>
3637
<Italian>Indentazione console di debug</Italian>
3738
<Polish>Indentacja w konsoli debugowania</Polish>
39+
<German>Einrückungen in der Debug-Konsole</German>
3840
<Korean>디버그 콘솔 들여쓰기</Korean>
3941
<Japanese>デバッグコンソールのインデント</Japanese>
4042
<Chinese>調試控制台縮進</Chinese>
@@ -47,6 +49,7 @@
4749
<Spanish>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</Spanish>
4850
<Italian>Il tipo di intentazione che può essere aggiunta all'espressione nella console di debug premendo il tasto Tab o rimossa premendo Shift + Tab</Italian>
4951
<Polish>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.</Polish>
52+
<German>Art der Einrückung, die dem Ausdruck in der Debug-Konsole durch Drücken von Tab hinzugefügt oder durch Drücken von Shift + Tab entfernt werden kann.</German>
5053
<Korean>Tab 키를 눌러서 디버그 콘솔의 식에 추가하거나 Shift + Tab을 눌러 제거할 수 있는 들여쓰기 유형입니다.</Korean>
5154
<Japanese>デバッグコンソールでのインデントのタイプ。 インデントはTabキーを押して追加、Shift + Tabキーを押して削除できる。</Japanese>
5255
<Chinese>可以通過按 Tab 鍵為添加到調試控制台中的表達式縮進或通過按 Shift + Tab 鍵為其刪除縮進。</Chinese>
@@ -146,6 +149,7 @@
146149
<English>Refresh rate target watcher field</English>
147150
<Czech>Pole cílového sledování obnovovací frekvence</Czech>
148151
<French>Taux de rafraîchissement champ de l'observateur cible</French>
152+
<German>Aktualisierungsrate für Zielüberwachungfelder</German>
149153
<Korean>대상 관찰자 필드 새로 고침 빈도</Korean>
150154
<Japanese>目標監視フィールドのリフレッシュレート</Japanese>
151155
<Chinese>刷新率</Chinese>
@@ -155,6 +159,7 @@
155159
<English>Refresh rate (in seconds) for the CBA target watcher fields to the right of the debug console.</English>
156160
<Czech>Obnovovací frekvence (v sekundách) pro pole sledování cíle CBA napravo od konzole ladění.</Czech>
157161
<French>Taux de rafraîchissement (en secondes) des champs d'observation de la cible CBA à droite de la console de débogage.</French>
162+
<German>Aktualisierungsrate (in Sekunden) für die CBA-Zielüberwachungsfelder auf der rechten Seite der Debug-Konsole.</German>
158163
<Korean>디버그 콘솔 오른쪽에 있는 CBA의 대상 관찰자 필드의 새로 고침 빈도입니다. (초 단위)</Korean>
159164
<Japanese>デバッグコンソールの右側にあるCBA目標監視フィールドのリフレッシュレート(秒単位)。</Japanese>
160165
<Chinese>調試控制台右側的 CBA 目標監視器字段的刷新率（以秒為單位）。</Chinese>

‎addons/disposable/CfgEventHandlers.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ class Extended_PreInit_EventHandlers {
1212

1313
class Extended_DisplayLoad_EventHandlers {
1414
class RscDisplayInventory {
15-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInventory)'));
15+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInventory)'));
1616
};
1717
};

‎addons/events/CfgEventHandlers.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ class Extended_PostInit_EventHandlers {
1818

1919
class Extended_DisplayLoad_EventHandlers {
2020
class RscDisplayMission {
21-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayMission)'));
21+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayMission)'));
2222
};
2323
class RscDiary {
2424
ADDON = QUOTE(if (ctrlIDD (_this select 0) == 12) then {_this call (uiNamespace getVariable 'FUNC(initDisplayMainMap)')};);
2525
};
2626
class RscDisplayCurator {
27-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayCurator)'));
27+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayCurator)'));
2828
};
2929
};

‎addons/keybinding/CfgEventHandlers.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ class Extended_PreInit_EventHandlers {
1212

1313
class Extended_DisplayLoad_EventHandlers {
1414
class RscDisplayConfigure {
15-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayConfigure)'));
15+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayConfigure)'));
1616
};
1717
};

‎addons/keybinding/gui.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class GVAR(key): RscControlsGroupNoScrollbars {
1717
class controls {
1818
class EditButton: RscButton {
1919
idc = IDC_KEY_EDIT;
20-
onButtonClick = QUOTE(_this call (uiNamespace getVariable 'FUNC(gui_editKey)'));
20+
onButtonClick = QUOTE(call (uiNamespace getVariable 'FUNC(gui_editKey)'));
2121
onMouseEnter = "(_this select 0) ctrlSetTextColor [0,0,0,1]";
2222
onMouseExit = "(_this select 0) ctrlSetTextColor [1,1,1,1]";
2323
style = ST_LEFT;
@@ -87,7 +87,7 @@ class GVAR(subCat): RscControlsGroupNoScrollbars {
8787
class RscDisplayConfigure {
8888
class controls {
8989
class CBA_ButtonConfigureAddons: RscButtonMenu {
90-
onButtonClick = QUOTE(_this call (uiNamespace getVariable 'FUNC(gui_configure)'));
90+
onButtonClick = QUOTE(call (uiNamespace getVariable 'FUNC(gui_configure)'));
9191
idc = IDC_BTN_CONFIGURE_ADDONS;
9292
text = CSTRING(configureAddons);
9393
x = QUOTE(POS_X(20.15));

‎addons/main/script_macros_common.hpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,7 @@ Macros: TRACE_n()
464464
Author:
465465
Spooner
466466
------------------------------------------- */
467-
#define PFORMAT_1(MESSAGE,A) \
468-
format ['%1: A=%2', MESSAGE, RETNIL(A)]
467+
#define PFORMAT_1(MESSAGE,A) format ['%1: A=%2', MESSAGE, RETNIL(A)]
469468

470469
#define PFORMAT_2(MESSAGE,A,B) \
471470
format ['%1: A=%2, B=%3', MESSAGE, RETNIL(A), RETNIL(B)]

‎addons/optics/CfgEventHandlers.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ class Extended_PreInit_EventHandlers {
1212

1313
class Extended_DisplayLoad_EventHandlers {
1414
class RscDisplayInterrupt {
15-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
15+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
1616
};
1717
class RscDisplayMPInterrupt {
18-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
18+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
1919
};
2020
};

‎addons/quicktime/fnc_generateQTESequence.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if (_length <= 0) exitWith {[]};
2424

2525
private _code = [];
2626

27-
for "_i" from 0 to _length do {
27+
for "_i" from 1 to _length do {
2828
_code pushBack (selectRandom ["↑", "↓", "→", "←"]);
2929
};
3030

‎addons/quicktime/stringtable.xml

+36
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,66 @@
33
<Package name="Quicktime">
44
<Key ID="STR_cba_quicktime_Component">
55
<English>Community Base Addons - Quick-Time Events</English>
6+
<French>Community Base Addons - Quick-Time-Events</French>
7+
<German>Community Base Addons - Quick-Time-Events</German>
8+
<Korean>커뮤니티 베이스 애드온 - 퀵 타임 이벤트 (QTE)</Korean>
9+
<Japanese>Community Base Addons - QTE(クイック タイム イベント)</Japanese>
610
</Key>
711
<Key ID="STR_cba_quicktime_QTEAccessabilitySingleKey">
812
<English>Single Key press</English>
13+
<French>Appui d'une seule touche</French>
14+
<German>Einmaliger Tastendruck</German>
15+
<Korean>한 번만 누르기</Korean>
16+
<Japanese>キー押下を1回に</Japanese>
917
</Key>
1018
<Key ID="STR_cba_quicktime_QTEAccessabilitySingleKeyTooltip">
1119
<English>When enabled, all Quick-Time Events will be shortened to a single key press.</English>
20+
<French>Lorsqu'ils sont activés, tous les événements Quick Time ne nécessitent qu'une seule pression de touche.</French>
21+
<German>Wenn aktiviert, benötigen alle Quick-Time-Events nur einen einzigen Tastendruck.</German>
22+
<Korean>활성화 시 모든 QTE가 한 번의 키 입력으로 단축됩니다.</Korean>
23+
<Japanese>有効にすると、すべてのQTEを1回のキー押下へと短縮します。</Japanese>
1224
</Key>
1325
<Key ID="STR_cba_quicktime_QTEKeybindDownTooltip">
1426
<English>Down key used in Quick-Time Events.</English>
27+
<French>Touche du bas utilisée dans les Quick-Time Events.</French>
28+
<German>Taste in Quick-Time-Events für unten.</German>
29+
<Korean>QTE에 사용되는 아래쪽 키입니다.</Korean>
30+
<Japanese>QTEで使用される下キー。</Japanese>
1531
</Key>
1632
<Key ID="STR_cba_quicktime_QTEKeybindGroup">
1733
<English>CBA Quick-Time Events</English>
34+
<French>Événements CBA Quick-Time</French>
35+
<German>CBA Quick-Time-Events</German>
36+
<Korean>CBA 퀵 타임 이벤트 (QTE)</Korean>
37+
<Japanese>CBA QTE</Japanese>
1838
</Key>
1939
<Key ID="STR_cba_quicktime_QTEKeybindLeftTooltip">
2040
<English>Left key used in Quick-Time Events.</English>
41+
<French>Touche de gauche utilisée dans les Quick-Time Events.</French>
42+
<German>Taste in Quick-Time-Events für links.</German>
43+
<Korean>QTE에 사용되는 왼쪽 키입니다.</Korean>
44+
<Japanese>QTEで使用される左キー。</Japanese>
2145
</Key>
2246
<Key ID="STR_cba_quicktime_QTEKeybindRightTooltip">
2347
<English>Right key used in Quick-Time Events.</English>
48+
<French>Touche de droite utilisée dans les Quick-Time Events.</French>
49+
<German>Taste in Quick-Time-Events für rechts.</German>
50+
<Korean>QTE에 사용되는 오른쪽 키입니다.</Korean>
51+
<Japanese>QTEで使用される右キー。</Japanese>
2452
</Key>
2553
<Key ID="STR_cba_quicktime_QTEKeybindUpTooltip">
2654
<English>Up key used in Quick-Time Events.</English>
55+
<French>Touche du haut utilisée dans les événements Quick-Time.</French>
56+
<German>Taste in Quick-Time-Events für oben.</German>
57+
<Korean>QTE에 사용되는 위쪽 키입니다.</Korean>
58+
<Japanese>Qで使用される上キー。</Japanese>
2759
</Key>
2860
<Key ID="STR_cba_quicktime_QTETitle">
2961
<English>Quick-Time Events</English>
62+
<French>Quick-Time-Events</French>
63+
<German>Quick-Time-Events</German>
64+
<Korean>퀵 타임 이벤트 (QTE)</Korean>
65+
<Japanese>QTE</Japanese>
3066
</Key>
3167
</Package>
3268
</Project>

‎addons/settings/CfgEventHandlers.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ class Extended_PostInit_EventHandlers {
1818

1919
class Extended_DisplayLoad_EventHandlers {
2020
class RscDisplayMain {
21-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayMain)'));
21+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayMain)'));
2222
};
2323
class RscDisplayGameOptions {
24-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayGameOptions)'));
24+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayGameOptions)'));
2525
};
2626
class Display3DEN {
27-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplay3DEN)'));
27+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplay3DEN)'));
2828
};
2929
};

‎addons/settings/stringtable.xml

+2
Original file line numberDiff line numberDiff line change
@@ -519,13 +519,15 @@
519519
<English>Changes will not persist after server restart</English>
520520
<French>Les modifications ne persistent pas après le redémarrage du serveur</French>
521521
<Polish>Zmiany nie zostaną zachowane po restarcie serwera</Polish>
522+
<German>Änderungen bleiben nach einem Serverneustart nicht erhalten</German>
522523
<Korean>서버를 재시작한 후 변경 사항 유지 안함</Korean>
523524
<Japanese>サーバーの再起動後、変更は保持されません</Japanese>
524525
</Key>
525526
<Key ID="STR_cba_settings_volatile_tooltip">
526527
<English>The server is configured to not persist changes to settings between server restarts.\nChanges will persist between mission restarts.</English>
527528
<French>Le serveur est configuré pour ne pas conserver les modifications apportées aux paramètres entre les redémarrages du serveur.\nLes modifications seront conservées entre les redémarrages de la mission.</French>
528529
<Polish>Serwer jest skonfigurowany tak, aby odrzucać wszystkie zmiany w ustawieniach gdy zostanie zrestartowany.\nZmiany zostaną zachowane między restartami misji.</Polish>
530+
<German>Der Server ist so konfiguriert, dass Änderungen an den Einstellungen zwischen Serverneustarts nicht erhalten bleiben.\nDie Änderungen zwischen Missionsneustarts bleiben erhalten.</German>
529531
<Korean>서버가 다시 시작될 때까지 설정 변경 사항이 유지되지 않도록 서버가 구성어 있습니다.\n임무가 다시 시작될 때까지 변경 사항이 유지됩니다.</Korean>
530532
<Japanese>このサーバーは、サーバーの再起動後に設定への変更が保持されないように構成されています。\n再起動無くミッションを再スタートする場合では変更は保持されます。</Japanese>
531533
</Key>

‎addons/ui/CfgEventHandlers.hpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,36 @@ class Extended_PreInit_EventHandlers {
1212

1313
class Extended_DisplayLoad_EventHandlers {
1414
class RscDisplayInterrupt {
15-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
15+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
1616
};
1717
class RscDisplayMPInterrupt {
18-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
18+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
1919
};
2020
class RscDisplayMultiplayerSetup {
21-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayMultiplayerSetup)'));
21+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayMultiplayerSetup)'));
2222
};
2323
class RscDisplayOptionsLayout {
24-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayOptionsLayout)'));
24+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayOptionsLayout)'));
2525
};
2626
class RscDisplayPassword {
27-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayPassword)'));
27+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayPassword)'));
2828
};
2929
class RscDisplayRemoteMissions {
30-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayRemoteMissions)'));
30+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayRemoteMissions)'));
3131
};
3232
class RscDiary {
33-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayDiary)'));
33+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayDiary)'));
3434
};
3535
class Display3DEN {
36-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplay3DEN)'));
36+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplay3DEN)'));
3737
};
3838
class RscDisplayCurator {
39-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayCurator)'));
39+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayCurator)'));
4040
};
4141
class RscMsgBox {
42-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayMessageBox)'));
42+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayMessageBox)'));
4343
};
4444
class RscDisplayInventory {
45-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInventory)'));
45+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInventory)'));
4646
};
4747
};

0 commit comments

Comments
 (0)