From 572e61d1cfa7fb6e049daab3df342b9e5b18fb67 Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 27 Aug 2020 09:35:55 -0600 Subject: [PATCH 1/6] Arsenal - Fix fire rate sort caused by flashlight (#7878) * fix firerate sort caused by flashlight * Update fnc_sortStatement_rateOfFire.sqf * Update addons/arsenal/functions/fnc_sortStatement_rateOfFire.sqf Co-authored-by: jonpas Co-authored-by: jonpas --- addons/arsenal/functions/fnc_sortStatement_rateOfFire.sqf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/arsenal/functions/fnc_sortStatement_rateOfFire.sqf b/addons/arsenal/functions/fnc_sortStatement_rateOfFire.sqf index 2c1d3a90f2..3afbb52bdf 100644 --- a/addons/arsenal/functions/fnc_sortStatement_rateOfFire.sqf +++ b/addons/arsenal/functions/fnc_sortStatement_rateOfFire.sqf @@ -22,5 +22,7 @@ private _fireRate = []; } foreach _fireModes; _fireRate sort true; +_fireRate = _fireRate param [0, 0]; -round (60 / (_fireRate param [0, 0])) +if (_fireRate == 0) exitWith {0}; +round (60 / _fireRate) From 241f1aefbdb76ed951c4925437c6cfbced6f1cbc Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 27 Aug 2020 09:37:20 -0600 Subject: [PATCH 2/6] fix face, voice, insignia in arsenal (#7879) --- addons/arsenal/ACE_Arsenal_Sorts.hpp | 4 ++-- addons/arsenal/defines.hpp | 2 +- addons/arsenal/functions/fnc_compileSorts.sqf | 5 ++++- .../arsenal/functions/fnc_fillLeftPanel.sqf | 2 +- addons/arsenal/functions/fnc_fillSort.sqf | 8 ++++---- addons/arsenal/functions/fnc_handleStats.sqf | 2 +- .../arsenal/functions/fnc_onArsenalOpen.sqf | 4 ++-- .../functions/fnc_onSelChangedLeft.sqf | 2 +- addons/arsenal/functions/fnc_showItem.sqf | 2 +- addons/arsenal/functions/fnc_sortPanel.sqf | 20 ++++++++++++------- addons/arsenal/ui/RscAttributes.hpp | 4 ++-- 11 files changed, 32 insertions(+), 23 deletions(-) diff --git a/addons/arsenal/ACE_Arsenal_Sorts.hpp b/addons/arsenal/ACE_Arsenal_Sorts.hpp index 2ed1aa92ee..aa397e9f80 100644 --- a/addons/arsenal/ACE_Arsenal_Sorts.hpp +++ b/addons/arsenal/ACE_Arsenal_Sorts.hpp @@ -9,14 +9,14 @@ class GVAR(sorts) { class ACE_alphabetically: sortBase { scope = 2; displayName = "$STR_a3_rscdisplayarsenal_sort_alphabet"; - tabs[] = {{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14}, {0,1,2,3,4,5,6,7}}; + tabs[] = {{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17}, {0,1,2,3,4,5,6,7}}; statement = QUOTE({}); }; class ACE_mod: sortBase { scope = 2; displayName = "$STR_a3_rscdisplayarsenal_sort_mod"; - tabs[] = {{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14}, {0,1,2,3,4,5,6,7}}; + tabs[] = {{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17}, {0,1,2,3,4,5,6,7}}; statement = QUOTE(_this call FUNC(sortStatement_mod)); }; diff --git a/addons/arsenal/defines.hpp b/addons/arsenal/defines.hpp index 7e38023b5c..fd71c5eaee 100644 --- a/addons/arsenal/defines.hpp +++ b/addons/arsenal/defines.hpp @@ -79,7 +79,7 @@ #define IDC_iconBackgroundVoice 2034 #define IDC_buttonVoice 2035 #define IDC_iconBackgroundInsigna 2036 -#define IDC_buttonInsigna 2037 +#define IDC_buttonInsignia 2037 #define IDC_iconBackgroundOptic 21 #define IDC_buttonOptic 22 #define IDC_iconBackgroundItemAcc 23 diff --git a/addons/arsenal/functions/fnc_compileSorts.sqf b/addons/arsenal/functions/fnc_compileSorts.sqf index 762ff14a3d..423bec30b3 100644 --- a/addons/arsenal/functions/fnc_compileSorts.sqf +++ b/addons/arsenal/functions/fnc_compileSorts.sqf @@ -38,7 +38,10 @@ private _sortListLeftPanel = [ [], // GPS 11 [], // Radio 12 [], // Compass 13 - [] // Watch 14 + [], // Watch 14 + [], // Face 15 + [], // Voice 16 + [] // Insignia 17 ]; private _sortListRightPanel = [ diff --git a/addons/arsenal/functions/fnc_fillLeftPanel.sqf b/addons/arsenal/functions/fnc_fillLeftPanel.sqf index c8d3f97734..1dca06b065 100644 --- a/addons/arsenal/functions/fnc_fillLeftPanel.sqf +++ b/addons/arsenal/functions/fnc_fillLeftPanel.sqf @@ -162,7 +162,7 @@ switch true do { ["CfgVoice", configName _x, _ctrlPanel, "icon"] call FUNC(addListBoxItem); } foreach _voices; }; - case IDC_buttonInsigna : { + case IDC_buttonInsignia : { { ["CfgUnitInsignia", configName _x, _ctrlPanel, "texture"] call FUNC(addListBoxItem); } foreach ("true" configClasses (configFile >> "CfgUnitInsignia")); diff --git a/addons/arsenal/functions/fnc_fillSort.sqf b/addons/arsenal/functions/fnc_fillSort.sqf index 065296ebbd..a6e93a0508 100644 --- a/addons/arsenal/functions/fnc_fillSort.sqf +++ b/addons/arsenal/functions/fnc_fillSort.sqf @@ -60,9 +60,6 @@ private _sorts = if (_rightSort && {GVAR(currentLeftPanel) in [IDC_buttonUniform } ) }; - case ([IDC_buttonFace, IDC_buttonVoice, IDC_buttonInsigna] find _idc > -1): { - [] - }; default { GVAR(sortListLeftPanel) select ([ IDC_buttonPrimaryWeapon, @@ -79,7 +76,10 @@ private _sorts = if (_rightSort && {GVAR(currentLeftPanel) in [IDC_buttonUniform IDC_buttonGPS, IDC_buttonRadio, IDC_buttonCompass, - IDC_buttonWatch + IDC_buttonWatch, + IDC_buttonFace, + IDC_buttonVoice, + IDC_buttonInsignia ] find _idc) }; } diff --git a/addons/arsenal/functions/fnc_handleStats.sqf b/addons/arsenal/functions/fnc_handleStats.sqf index 26597716ea..0d071740b7 100644 --- a/addons/arsenal/functions/fnc_handleStats.sqf +++ b/addons/arsenal/functions/fnc_handleStats.sqf @@ -152,7 +152,7 @@ if (!isNil "_itemCfg") then { if (ctrlIDC _control == IDC_leftTabContent) then { - if ([IDC_buttonFace, IDC_buttonVoice, IDC_buttonInsigna] find GVAR(currentLeftPanel) > -1) then { + if ([IDC_buttonFace, IDC_buttonVoice, IDC_buttonInsignia] find GVAR(currentLeftPanel) > -1) then { [[1, 2, 3, 4, 5]] call _hideUnusedFnc; _statsBoxCtrl ctrlSetPosition [ diff --git a/addons/arsenal/functions/fnc_onArsenalOpen.sqf b/addons/arsenal/functions/fnc_onArsenalOpen.sqf index 9af448fd09..b59d1b28a9 100644 --- a/addons/arsenal/functions/fnc_onArsenalOpen.sqf +++ b/addons/arsenal/functions/fnc_onArsenalOpen.sqf @@ -288,7 +288,7 @@ if (is3DEN) then { } forEach [ IDC_buttonFace, IDC_buttonVoice, - IDC_buttonInsigna + IDC_buttonInsignia ]; _buttonCloseCtrl = _display displayCtrl IDC_menuBarClose; @@ -308,7 +308,7 @@ if (is3DEN) then { } forEach [ IDC_buttonFace, IDC_buttonVoice, - IDC_buttonInsigna + IDC_buttonInsignia ]; }; diff --git a/addons/arsenal/functions/fnc_onSelChangedLeft.sqf b/addons/arsenal/functions/fnc_onSelChangedLeft.sqf index 375406930c..1e6c851f0f 100644 --- a/addons/arsenal/functions/fnc_onSelChangedLeft.sqf +++ b/addons/arsenal/functions/fnc_onSelChangedLeft.sqf @@ -418,7 +418,7 @@ switch (GVAR(currentLeftPanel)) do { [_display, _control, _curSel, (configFile >> "CfgVoice" >> _item)] call FUNC(itemInfo); }; - case IDC_buttonInsigna : { + case IDC_buttonInsignia : { [GVAR(center), _item] call bis_fnc_setUnitInsignia; GVAR(currentInsignia) = _item; diff --git a/addons/arsenal/functions/fnc_showItem.sqf b/addons/arsenal/functions/fnc_showItem.sqf index d9bf74f061..58142d5a3f 100644 --- a/addons/arsenal/functions/fnc_showItem.sqf +++ b/addons/arsenal/functions/fnc_showItem.sqf @@ -43,7 +43,7 @@ private _nextAction = switch (GVAR(currentLeftPanel)) do { case IDC_buttonBinoculars : { ["Civil", "Binoculars"] select (GVAR(currentItems) select 9 != "") }; - case IDC_buttonInsigna : { + case IDC_buttonInsignia : { "Salute" }; case IDC_buttonVoice : { diff --git a/addons/arsenal/functions/fnc_sortPanel.sqf b/addons/arsenal/functions/fnc_sortPanel.sqf index 8169cf7889..48dd72c54e 100644 --- a/addons/arsenal/functions/fnc_sortPanel.sqf +++ b/addons/arsenal/functions/fnc_sortPanel.sqf @@ -56,9 +56,12 @@ if (_rightSort) then { [ _display displayCtrl IDC_leftTabContent, switch (GVAR(currentLeftPanel)) do { - case IDC_buttonBackpack: { "CfgVehicles" }; - case IDC_buttonGoggles: { "CfgGlasses" }; - default { "CfgWeapons" }; + case IDC_buttonBackpack: { configFile >> "CfgVehicles" }; + case IDC_buttonGoggles: { configFile >> "CfgGlasses" }; + case IDC_buttonFace: { configFile >> "CfgFaces" >> "Man_A3" }; + case IDC_buttonVoice: { configFile >> "CfgVoice" }; + case IDC_buttonInsignia: { configFile >> "CfgUnitInsignia" }; + default { configFile >> "CfgWeapons" }; }, (GVAR(sortListLeftPanel) select ([ IDC_buttonPrimaryWeapon, @@ -75,7 +78,10 @@ if (_rightSort) then { IDC_buttonGPS, IDC_buttonRadio, IDC_buttonCompass, - IDC_buttonWatch + IDC_buttonWatch, + IDC_buttonFace, + IDC_buttonVoice, + IDC_buttonInsignia ] find GVAR(currentLeftPanel))) ] } params ["_panel", "_cfgClass", "_sorts"]; @@ -111,7 +117,7 @@ _for do { } else { _panel lbData _i }; - private _itemCfg = configFile >> _cfgClass >> _item; + private _itemCfg = _cfgClass >> _item; private _value = _itemCfg call _statement; if (_value isEqualType 0) then { _value = [_value, 8] call CBA_fnc_formatNumber; @@ -134,7 +140,7 @@ if (_right) then { if (_cursel >= 0) then { if (_data == _selected) then {_panel lnbSetCurSelRow _i}; }; - _panel lnbSetText [[_i, 1], getText (configFile >> _cfgClass >> _data >> "displayName")]; + _panel lnbSetText [[_i, 1], getText (_cfgClass >> _data >> "displayName")]; }; } else { lbSort [_panel, "ASC"]; @@ -144,6 +150,6 @@ if (_right) then { if (_cursel >= 0) then { if (_data == _selected) then {_panel lbSetCurSel _i}; }; - _panel lbSetText [_i, getText (configFile >> _cfgClass >> _data >> "displayName")]; + _panel lbSetText [_i, getText (_cfgClass >> _data >> "displayName")]; }; }; diff --git a/addons/arsenal/ui/RscAttributes.hpp b/addons/arsenal/ui/RscAttributes.hpp index 036e5d9f3d..c2fe9713ba 100644 --- a/addons/arsenal/ui/RscAttributes.hpp +++ b/addons/arsenal/ui/RscAttributes.hpp @@ -753,7 +753,7 @@ class GVAR(display) { y = QUOTE(170 * GRID_H); }; class buttonInsigna: buttonPrimaryWeapon { - idc = IDC_buttonInsigna; + idc = IDC_buttonInsignia; tooltip="$STR_A3_RscDisplayArsenal_tab_Insignia"; text="\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Insignia_ca.paa"; y = QUOTE(170 * GRID_H); @@ -881,7 +881,7 @@ class GVAR(display) { tooltip="$STR_A3_RscDisplayArsenal_tab_CargoMisc"; y = QUOTE(safezoneY + 88 * GRID_H); }; - + class buttonRemoveAll: ctrlButtonPicture { idc = IDC_buttonRemoveAll; text = QPATHTOF(data\iconClearContainer.paa); From b51cf3575cd3657922ca84718df7d7cca49debfd Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 27 Aug 2020 09:44:18 -0600 Subject: [PATCH 3/6] Arsenal - Fix sorting when using search (#7877) * fix sorting when using search * remove unused line Co-authored-by: PabstMirror --- addons/arsenal/functions/fnc_sortPanel.sqf | 11 ++++++++--- tools/build.py | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/addons/arsenal/functions/fnc_sortPanel.sqf b/addons/arsenal/functions/fnc_sortPanel.sqf index 48dd72c54e..27e79b05a8 100644 --- a/addons/arsenal/functions/fnc_sortPanel.sqf +++ b/addons/arsenal/functions/fnc_sortPanel.sqf @@ -108,7 +108,7 @@ missionNamespace setVariable [ private _for = if (_right) then { for '_i' from 0 to ((lnbSize _panel select 0) - 1) } else { - for '_i' from 1 to (lbSize _panel - 1) + for '_i' from 0 to (lbSize _panel - 1) }; _for do { @@ -128,7 +128,9 @@ _for do { if (_right) then { _panel lnbSetText [[_i, 1], format ["%1%2", _value, _panel lnbText [_i, 1]]]; } else { - _panel lbSetText [_i, format ["%1%2", _value, _panel lbText _i]]; + if !(_item isEqualTo "") then { + _panel lbSetText [_i, format ["%1%2", _value, _panel lbText _i]]; + }; }; }; @@ -150,6 +152,9 @@ if (_right) then { if (_cursel >= 0) then { if (_data == _selected) then {_panel lbSetCurSel _i}; }; - _panel lbSetText [_i, getText (_cfgClass >> _data >> "displayName")]; + private _name = getText (_cfgClass >> _data >> "displayName"); + if !(_name isEqualTo "") then { + _panel lbSetText [_i, _name]; + }; }; }; diff --git a/tools/build.py b/tools/build.py index 716d4fb3a7..9151daa095 100644 --- a/tools/build.py +++ b/tools/build.py @@ -46,15 +46,15 @@ def main(): failed = 0 skipped = 0 removed = 0 - + for file in os.listdir(addonspath): if os.path.isfile(file): if check_for_obsolete_pbos(addonspath, file): removed += 1 print(" Removing obsolete file => " + file) os.remove(file) - print("") - + print("") + for p in os.listdir(addonspath): path = os.path.join(addonspath, p) if not os.path.isdir(path): From 5ee3424d4bdbb469b2e4a0de483bb57c09a4fb1a Mon Sep 17 00:00:00 2001 From: Elgin675 Date: Thu, 27 Aug 2020 17:45:39 +0200 Subject: [PATCH 4/6] Translations - Update / Fix French Translations (Grenades and Advanced Throwing) (#7871) * Translation - add/fix french grenades keys * Translation - fix french convertExplosives and Convert_Fuse keys * Translations - fix some french keys in Advanced Throwing module --- addons/advanced_throwing/stringtable.xml | 6 +++--- addons/grenades/stringtable.xml | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/addons/advanced_throwing/stringtable.xml b/addons/advanced_throwing/stringtable.xml index faa9451cc4..b10fae3f52 100644 --- a/addons/advanced_throwing/stringtable.xml +++ b/addons/advanced_throwing/stringtable.xml @@ -238,7 +238,7 @@ Odbezpieczony Scharf gemacht 뇌관 작동 - Amorcer + amorcée Armato 引信開始燃燒 引信开始燃烧 @@ -269,7 +269,7 @@ (Kółko m.) zmień tryb (Scrollen) Modus wechseln (마우스 휠) 모드 변경 - (Molette souris) Changer de mode + (Défilement) Changer de mode (Scorrere) Cambio Modalità (滾輪) 變更模式 (滚轮) 变更模式 @@ -285,7 +285,7 @@ (Kółko m.) przedłuż (Scrollen) Erweitern (마우스 휠) 연장 - (Molette souris) Étendre + (Défilement) Étendre (Scorrere) Estendere (滾輪) 延長 (滚轮) 延长 diff --git a/addons/grenades/stringtable.xml b/addons/grenades/stringtable.xml index 9f623ec832..dc2b184862 100644 --- a/addons/grenades/stringtable.xml +++ b/addons/grenades/stringtable.xml @@ -530,11 +530,11 @@ Convert to short fuse - Mèche lente (7 secondes) + Appliquer une mèche Remove short fuse - Retirer la mèche lente + Retirer la mèche ACE Grenades @@ -554,9 +554,11 @@ Allow Explosive Conversion + Autoriser les mèches (charges lançables) Allow converting explosives to throwables + Cette option permet de rendre les charges explosives lançables, à la manière des grenades.\nPour celà, ouvrir l'inventaire et double-cliquer sur les charges, afin de leur appliquer une mèche.\nLa mèche peut se retirer en suivant la même procédure. From dd41f3e799e4bc200efb8156a5ee22b3ce56bb5c Mon Sep 17 00:00:00 2001 From: Joko Date: Thu, 27 Aug 2020 17:51:49 +0200 Subject: [PATCH 5/6] Map Gestures - reduce the size of the procedural texture and don't generate mipmaps (#7876) * change procedural texture to static texture existing in a3 Assets * use a smaller and no mimaps in the procedural texture --- addons/map_gestures/functions/fnc_drawMapGestures.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/map_gestures/functions/fnc_drawMapGestures.sqf b/addons/map_gestures/functions/fnc_drawMapGestures.sqf index 5afd9406b4..ed1c91f16b 100644 --- a/addons/map_gestures/functions/fnc_drawMapGestures.sqf +++ b/addons/map_gestures/functions/fnc_drawMapGestures.sqf @@ -48,7 +48,7 @@ private _players = [_positions, FUNC(getProximityPlayers), missionNamespace, QGV // Render icon and player name _mapHandle drawIcon ["\a3\ui_f\data\gui\cfg\Hints\icon_text\group_1_ca.paa", _color, _pos, ICON_RENDER_SIZE, ICON_RENDER_SIZE, ICON_ANGLE, "", ICON_SHADOW, TEXT_SIZE, TEXT_FONT, ICON_TEXT_ALIGN]; - _mapHandle drawIcon ["#(argb,8,8,3)color(0,0,0,0)", GVAR(nameTextColor), _pos, TEXT_ICON_RENDER_SIZE, TEXT_ICON_RENDER_SIZE, ICON_ANGLE, name _x, TEXT_SHADOW, TEXT_SIZE, TEXT_FONT, ICON_TEXT_ALIGN]; + _mapHandle drawIcon ["#(argb,1,1,1)color(0,0,0,0)", GVAR(nameTextColor), _pos, TEXT_ICON_RENDER_SIZE, TEXT_ICON_RENDER_SIZE, ICON_ANGLE, name _x, TEXT_SHADOW, TEXT_SIZE, TEXT_FONT, ICON_TEXT_ALIGN]; }; } forEach _players; From 49c84e2ce16da238348de8c75f4d74206945ee4f Mon Sep 17 00:00:00 2001 From: classic Date: Sat, 29 Aug 2020 00:30:32 +0900 Subject: [PATCH 6/6] Update Japanese translation (#7880) --- addons/arsenal/stringtable.xml | 9 ++++++++- addons/csw/stringtable.xml | 1 + addons/dragging/stringtable.xml | 5 +++-- addons/gforces/stringtable.xml | 3 +++ addons/grenades/stringtable.xml | 9 +++++++++ addons/gunbag/stringtable.xml | 5 ++++- addons/map_gestures/stringtable.xml | 16 ++++++++++++++++ addons/medical/stringtable.xml | 1 + addons/medical_gui/stringtable.xml | 1 + addons/medical_treatment/stringtable.xml | 2 ++ addons/realisticnames/stringtable.xml | 22 ++++++++++++---------- addons/smallarms/stringtable.xml | 5 +++++ addons/trenches/stringtable.xml | 9 +++++++++ 13 files changed, 74 insertions(+), 14 deletions(-) diff --git a/addons/arsenal/stringtable.xml b/addons/arsenal/stringtable.xml index 8f00efef10..df0b919e52 100644 --- a/addons/arsenal/stringtable.xml +++ b/addons/arsenal/stringtable.xml @@ -384,26 +384,31 @@ Sort by load Nach Tragelast sortieren Trier par capacité de chargement + 容量で並び替え Sort by accuracy Nach Genauigkeit sortieren Trier par précision + 精度で並び替え Sort by rate of fire Nach Schussrate sortieren Trier par cadence de tir + 連射速度で並び替え Sort by magnification Nach Vergrößerung sortieren Trier par grossissement + 倍率で並び替え Sort by ammo count Nach Munitionszahl sortieren Trier par nombre de munitions + 装弾数で並び替え Share or stop sharing the selected loadout @@ -866,7 +871,7 @@ Cambiar el tamaño de fuente para el texto de los paneles izquierdo y derecho Change la taille de police des panneaux latéraux. Zmień wysokość czcionki dla tekstu lewego i prawego panelu - 右か左パネルにあるフォントの高さを変更します。 + パネルにあるフォントの高さを変更します。 Cambia l'altezza del font per il testo sul pannello sinistro / destro 왼쪽 / 오른쪽 패널 텍스트의 글꼴 높이 변경 Ändert die Schriftgröße für die linke/rechte Leiste @@ -1349,6 +1354,7 @@ Retard avant détonation Задержка детонации Opoźnienie zapalnika + 信管設定時間 Detonates on impact @@ -1356,6 +1362,7 @@ Détonation à l'impact Детонация от удара Detonuj przy uderzeniu + 着発信管 diff --git a/addons/csw/stringtable.xml b/addons/csw/stringtable.xml index 6f40988395..c2dad69be7 100644 --- a/addons/csw/stringtable.xml +++ b/addons/csw/stringtable.xml @@ -408,6 +408,7 @@ [CSW] Mitrailleuse statique M2 ac. bouclier [CSW] Statyczny karabin maszynowy M2 z tarczą [CSW] Станковый M2 со щитом + [CSW] 設置型 防盾付き M2 [CSW] Static XM312 Gun (Autonomous) diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml index a427f5d83c..a573420f88 100644 --- a/addons/dragging/stringtable.xml +++ b/addons/dragging/stringtable.xml @@ -29,7 +29,7 @@ Soltar Lascia Elengedés - はなす + 離す 놓기 放開 放开 @@ -46,7 +46,7 @@ Arrastar/Soltar Objeto Trascina/Lascia Oggetto Húzás/Elengedés Objektum - オブジェクトを引きずる/はなす + オブジェクトを引きずる/離す 물건 끌기/놓기 拖拉/放開物品 拖拉/放开物品 @@ -57,6 +57,7 @@ Porter/Lâcher un objet Нести/Отпустить Объект Nieś/Puść objekt + オブジェクトを運ぶ/離す Item too heavy diff --git a/addons/gforces/stringtable.xml b/addons/gforces/stringtable.xml index 610e41c09b..9a9c804811 100644 --- a/addons/gforces/stringtable.xml +++ b/addons/gforces/stringtable.xml @@ -6,6 +6,7 @@ ACE Przeciążenia ACE Force gravitationnelle ACE Перегрузки + ACE G フォース Gforces Effects @@ -58,12 +59,14 @@ Współczynnk przeciążenia Coefficient de force gravitationnelle Коэффициент перегрузки + G 効果係数 Controls strength of G-Force affecting players. Wpływa na siłe przeciążeń oddziałujących na graczy Coefficient permettant d'ajuster le niveau de force gravitationnelle affectant les joueurs. Определяет силу перегрузок, влияющих на игроков. + G 効果がプレイヤーに与える影響量を設定できます。 diff --git a/addons/grenades/stringtable.xml b/addons/grenades/stringtable.xml index dc2b184862..8180ec7a4d 100644 --- a/addons/grenades/stringtable.xml +++ b/addons/grenades/stringtable.xml @@ -511,30 +511,37 @@ Explosive Satchel (Throwable) Charge en sacoche (lançable) + 梱包爆薬 (投てき仕様) Type: Charge<br />Rounds: 1<br />Used on: Things that need to die Type : Charge<br />Munitions : 1<br />Application : à balancer sur des trucs qui doivent mourir + 種類: 爆薬<br />弾数: 1<br />次で使用: 破壊すべき物に An explosive satchel that is throwable. 7 second fixed fuse Charge explosive lançable. Détonation après 7 secondes. + 投げられる梱包爆薬。起爆までの時間は 7 秒間 Explosive Charge (Throwable) Charge explosive (lançable) + 爆薬ブロック (投てき仕様) An explosive charge that is throwable. 7 second fixed fuse Bloc explosif lançable. Détonation après 7 secondes. + 投げられる爆薬ブロック。起爆までの時間は 7 秒間 Convert to short fuse Appliquer une mèche + 短信管へ変更 Remove short fuse Retirer la mèche + 短信管を削除 ACE Grenades @@ -555,10 +562,12 @@ Allow Explosive Conversion Autoriser les mèches (charges lançables) + 爆薬変更を許可 Allow converting explosives to throwables Cette option permet de rendre les charges explosives lançables, à la manière des grenades.\nPour celà, ouvrir l'inventaire et double-cliquer sur les charges, afin de leur appliquer une mèche.\nLa mèche peut se retirer en suivant la même procédure. + 爆発物を投てき仕様へ交換できるようにします。 diff --git a/addons/gunbag/stringtable.xml b/addons/gunbag/stringtable.xml index bfacfa39dd..68d44ed4ba 100644 --- a/addons/gunbag/stringtable.xml +++ b/addons/gunbag/stringtable.xml @@ -70,18 +70,21 @@ Wymień broń w torbie Заменить оружие в чехле Échanger les armes + ガンバッグ内の武器を交換 Enable Weapon Swap Aktywuj wymianę broni Включить обмен оружием Activer l'échange d'arme + 武器交換を有効化 Allows interaction to directly swap the primary weapon and stored weapon. Pozwala na interakcje do wymiany broni głównej na bron schowaną. Разрешает действие прямого обмена основного оружия и спрятанного в чехле. Active le menu d'interaction personnelle permettant d'échanger directement l'arme primaire et l'arme rangée dans la housse. + 持っている武器とガンバッグ内の武器を交換できるようにします。 Get weapon out of gunbag @@ -121,7 +124,7 @@ Housse d'arme vide Чехол пуст Prázdné pouzdro na zbraň - ガンバッグは空 + ガンバッグは空です Torba jest pusta 총가방 비어있음 Borsa per armi vuota diff --git a/addons/map_gestures/stringtable.xml b/addons/map_gestures/stringtable.xml index c76f583adf..c3627d84a0 100644 --- a/addons/map_gestures/stringtable.xml +++ b/addons/map_gestures/stringtable.xml @@ -270,47 +270,58 @@ Показывать только союзные жесты Pokazuj jedynie sojusznicze gesty Afficher uniquement le pointage des alliés + 友軍ジェスチャーのみ表示 Shows only Gestures from Units that are from the same side or a Friendly side. Показывать жесты только от игроков союзной стороны. Affiche uniquement les pointages effectués par des unités qui sont du même camp, ou d'un camp allié. + 友軍ユニットのみからジェスチャーを表示します。 Max range Camera Portée de la caméra + カメラ最大範囲 Max range between a Camera and players to show the map gesture indicator Définit le rayon au-delà duquel une caméra ne verra plus l'indicateur de pointage des autres joueurs. + プレイヤーが行うマップ ジェスチャーをカメラから確認できる最大範囲を設定します。 Allow Spectator Autoriser les spectateurs + スペクテイターに許可 Allows Spectator to See Map Gestures Permet aux spectateurs de voir le pointage des autres joueurs. + スペクテイターからマップ ジェスチャーを表示できるようにします。 Allow Curator Autoriser les curateurs + キュレーターに許可 Allows Curator to See Map Gestures Permet aux curateurs de voir le pointage des autres joueurs. + キュレーターからマップ ジェスチャーを表示できるようにします。 Briefing Mode Visibilité lors du briefing + ブリーフィング モード What player can see what Définit quels pointages les joueurs peuvent voir lors du briefing. + プレイヤーが見ることができる対象を決定します。 Disabled Pointage désactivé + 無効化 Group @@ -322,6 +333,7 @@ Grupo Группа Grupo + グループ Side @@ -333,10 +345,12 @@ Lado Сторона Bando + 陣営 Proximity Proximité + 付近のみ All @@ -348,6 +362,7 @@ Tudo Все Todas + 全て Map Gestures - Group Settings @@ -390,6 +405,7 @@ Cores Цвета Colores + 色 diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index e0c072903c..1e178cec5f 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -186,6 +186,7 @@ Splints Heal, but Cannot Jog Les attelles guérissent les fractures, mais empêchent de courir + 添え木で治癒可能、駆け足できないように Fracture Chance diff --git a/addons/medical_gui/stringtable.xml b/addons/medical_gui/stringtable.xml index ac4408df3a..cb15ba27a4 100644 --- a/addons/medical_gui/stringtable.xml +++ b/addons/medical_gui/stringtable.xml @@ -1087,6 +1087,7 @@ Informations patient Информация о пациенте 伤员信息 + 患者情報 diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml index 71ea8f890a..4c5dc0cb85 100644 --- a/addons/medical_treatment/stringtable.xml +++ b/addons/medical_treatment/stringtable.xml @@ -115,6 +115,7 @@ Koeficient opětovného otevření rány Коэффициент повторного открытия раны Współczynnik ponownego otwierania ran + 再開放係数 Coefficient for controlling the wound reopening chance. The final reopening chance is determined by multiplying this value with the specific reopening chance for the wound type and bandage used. @@ -123,6 +124,7 @@ Koeficient pro řízení šance na opětovné otevření rány. Konečná šance na opětovné otevření se stanoví vynásobením této hodnoty specifickou šancí na opětovné otevření pro použitý typ rány a obvaz. Коэффициент контроля вероятности повторного открытия раны. Окончательный шанс повторного открытия определяется путем умножения этого значения на определенный шанс повторного открытия для используемого типа раны и повязки. Współczynnik kontroluje szanse na ponowne otworzenie rany. Końcowa szansa na otworzenie jest ustalana przez pomnożenie tej wartości z wartością szansy na otworzenie rany dla typu rany oraz typu bandaża. + 傷が再開放する確率の係数を設定できます。再開放は、この数値と傷の種類、そして使用した包帯に応じて左右されます。 Clear Trauma After Bandage diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml index 27ef7ddd99..ada3b3bd31 100644 --- a/addons/realisticnames/stringtable.xml +++ b/addons/realisticnames/stringtable.xml @@ -1326,6 +1326,7 @@ M183 Demolition Charge (Throwable) M183 Charge de démolition (lançable) + M183 梱包爆薬 (投てき仕様) M112 Demolition Block @@ -1347,6 +1348,7 @@ M112 Demolition Charge (Throwable) M112 Bloc de démolition (lançable) + M112 爆薬ブロック (投てき仕様) M67 Fragmentation Grenade @@ -2505,7 +2507,7 @@ SIG 556 (Khaki) SIG 556 (Khaki) SIG 556 (Caqui) - SIG 556 (土埃) + SIG 556 (カーキ) SIG 556 (카키) SIG 556精準步槍 (卡其色) SIG 556精准步枪 (卡其色) @@ -2522,7 +2524,7 @@ SIG 556 (Sabbia) SIG 556 (Homok) SIG 556 (Deserto) - SIG 556 (砂地) + SIG 556 (サンド) SIG 556 (모래) SIG 556精準步槍 (沙色) SIG 556精准步枪 (沙色) @@ -2573,7 +2575,7 @@ ASP-1 Kir ASP-1 Kir ASP-1 Kir - ASP-1 Kir + ASP-1 キール ASP-1 キール ASP-1"基爾"消音狙擊步槍 ASP-1"基尔"消音狙击步枪 @@ -2607,7 +2609,7 @@ ASP-1 Kir (Tan) ASP-1 Kir (Cserszín) ASP-1 Kir (Deserto) - ASP-1 キール (黄褐) + ASP-1 キール (タン) ASP-1 Kir (황갈) ASP-1"基爾"消音狙擊步槍 (黃褐色) ASP-1"基尔"消音狙击步枪 (黄褐色) @@ -2760,7 +2762,7 @@ HK121 (Hex) HK121 (Hex) HK121 (Hex) - HK 121 (蜂巣) + HK 121 (ヘックス) HK121 (육각) HK121中型機槍 (數位蜂巢迷彩) HK121中型机枪 (数位蜂巢迷彩) @@ -2777,7 +2779,7 @@ HK121 (Tan) HK121 (Cserszín) HK121 (Deserto) - HK 121 (黄褐) + HK 121 (タン) HK121 (황갈) HK121機槍 (黃褐色) HK121机枪 (黄褐色) @@ -2845,7 +2847,7 @@ LWMMG (Sabbia) LWMMG (Homok) LWMMG (Deserto) - LWMMG (砂地) + LWMMG (サンド) LWMMG (모래) 輕量化中型機槍 (沙色) 轻量化中型机枪 (沙色) @@ -3060,7 +3062,7 @@ QBZ-95-1 LSW (Nero) QBZ-95-1 LSW (Fekete) QBZ-95-1 LSW (Preto) - QBZ-95-1 LSW (黒) + QBZ-95-1 LSW (ブラック) QBZ-95-1 LSW (검정) QBZ-95-1式輕機槍 (黑色) QBZ-95-1式轻机枪 (黑色) @@ -3332,7 +3334,7 @@ HK416A5 14.5" (Nero) HK416A5 14.5" (Fekete) HK416A5 14.5" (Preto) - HK416A5 14.5" (黒) + HK416A5 14.5" (ブラック) HK416A5 14.5" (검정) HK416A5 14.5"突擊步槍 (黑色) HK416A5 14.5"突击步枪 (黑色) @@ -4916,7 +4918,7 @@ MSBS Grot MR (Preto) MSBS Grot MR (검정) MSBS Grot MR(黑色) - MSBS Grot MR(ブラック) + MSBS Grot MR (ブラック) MSBS Grot MR (Siyah) MSBS Grot MR (Fekete) diff --git a/addons/smallarms/stringtable.xml b/addons/smallarms/stringtable.xml index f6f78fe6cb..4e38e38c17 100644 --- a/addons/smallarms/stringtable.xml +++ b/addons/smallarms/stringtable.xml @@ -25,6 +25,7 @@ 25-Schuss-.45-ACP-Magazin .45 ACP, 25ks zásobník .45 ACP 25 Merm. Şarjör + .45 ACP 25Rnd マガジン .45 ACP 25Rnd Tracers (Green) Mag @@ -34,6 +35,7 @@ 25-Schuss-.45-ACP-Vermin-Magazin (Leuchtspur Grün) .45 ACP, 25ks zásobník stopovky (zelené) .45 ACP 25 Merm. İzli (Yeşil) Şarjör + .45 ACP 25Rnd 曳光弾 (緑) マガジン .45 ACP 25Rnd Tracers (Red) Mag @@ -43,6 +45,7 @@ 25-Schuss-.45-ACP-Vermin-Magazin (Leuchtspur Rot) .45 ACP, 25ks zásobník stopovky (červené) .45 ACP 25 Merm. İzli (Kırmızı) Şarjör + .45 ACP 25Rnd 曳光弾 (赤) マガジン .45 ACP 25Rnd Tracers (Yellow) Mag @@ -52,6 +55,7 @@ 25-Schuss-.45-ACP-Vermin-Magazin (Nachlade-Leuchtspur Gelb) .45 ACP, 25ks zásobník stopovky (žluté) .45 ACP 25 Merm. İzli (Sarı) Şarjör + .45 ACP 25Rnd 曳光弾 (黄) マガジン .45 ACP 8Rnd Mag @@ -61,6 +65,7 @@ 8-Schuss-.45-ACP-Magazin .45 ACP, 8ks zásobník .45 ACP 8 Merm. Şarjör + .45 ACP 8Rnd マガジン diff --git a/addons/trenches/stringtable.xml b/addons/trenches/stringtable.xml index e72e5ef784..6f76eb4afe 100644 --- a/addons/trenches/stringtable.xml +++ b/addons/trenches/stringtable.xml @@ -242,38 +242,47 @@ ACE Trenches ACE Tranchées + ACE 塹壕 Small Trench Dig Duration Petites tranchées - durée d'excavation + 小型塹壕の完成時間 Time, in seconds, required to dig a small trench. Définit le temps nécessaire au déploiement des petites tranchées (en secondes). + 小型塹壕が完成するまでの時間 (秒) を設定できます。 Small Trench Remove Duration Petites tranchées - durée de retrait + 小型塹壕の削除時間 Time, in seconds, required to remove a small trench. Définit le temps nécessaire pour le retrait des petites tranchées (en secondes). + 小型塹壕が削除されるまでの時間 (秒) を設定できます。 Big Trench Dig Duration Grandes tranchées - durée d'excavation + 大型塹壕の完成時間 Time, in seconds, required to dig a big trench. Définit le temps nécessaire au déploiement des grandes tranchées (en secondes). + 大型塹壕が完成するまでの時間 (秒) を設定できます。 Big Trench Remove Duration Grandes tranchées - durée de retrait + 大型塹壕の削除時間 Time, in seconds, required to remove a big trench. Définit le temps nécessaire pour le retrait des grandes tranchées (en secondes). + 大型塹壕が削除されるまでの時間 (秒) を設定できます。