Merge branch 'master' into release-3.13.4

This commit is contained in:
PabstMirror 2020-08-28 10:34:20 -05:00
commit 5a16aa1e8b
28 changed files with 127 additions and 49 deletions

View File

@ -238,7 +238,7 @@
<Polish>Odbezpieczony</Polish>
<German>Scharf gemacht</German>
<Korean>뇌관 작동</Korean>
<French>Amorcer</French>
<French>amorcée</French>
<Italian>Armato</Italian>
<Chinese>引信開始燃燒</Chinese>
<Chinesesimp>引信开始燃烧</Chinesesimp>
@ -269,7 +269,7 @@
<Polish>(Kółko m.) zmień tryb</Polish>
<German>(Scrollen) Modus wechseln</German>
<Korean>(마우스 휠) 모드 변경</Korean>
<French>(Molette souris) Changer de mode</French>
<French>(Défilement) Changer de mode</French>
<Italian>(Scorrere) Cambio Modalità</Italian>
<Chinese>(滾輪) 變更模式</Chinese>
<Chinesesimp>(滚轮) 变更模式</Chinesesimp>
@ -285,7 +285,7 @@
<Polish>(Kółko m.) przedłuż</Polish>
<German>(Scrollen) Erweitern</German>
<Korean>(마우스 휠) 연장</Korean>
<French>(Molette souris) Étendre</French>
<French>(Défilement) Étendre</French>
<Italian>(Scorrere) Estendere</Italian>
<Chinese>(滾輪) 延長</Chinese>
<Chinesesimp>(滚轮) 延长</Chinesesimp>

View File

@ -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));
};

View File

@ -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

View File

@ -38,7 +38,10 @@ private _sortListLeftPanel = [
[], // GPS 11
[], // Radio 12
[], // Compass 13
[] // Watch 14
[], // Watch 14
[], // Face 15
[], // Voice 16
[] // Insignia 17
];
private _sortListRightPanel = [

View File

@ -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"));

View File

@ -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)
};
}

View File

@ -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 [

View File

@ -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
];
};

View File

@ -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;

View File

@ -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 : {

View File

@ -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"];
@ -102,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 {
@ -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;
@ -122,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]];
};
};
};
@ -134,7 +142,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 +152,9 @@ if (_right) then {
if (_cursel >= 0) then {
if (_data == _selected) then {_panel lbSetCurSel _i};
};
_panel lbSetText [_i, getText (configFile >> _cfgClass >> _data >> "displayName")];
private _name = getText (_cfgClass >> _data >> "displayName");
if !(_name isEqualTo "") then {
_panel lbSetText [_i, _name];
};
};
};

View File

@ -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)

View File

@ -384,26 +384,31 @@
<English>Sort by load</English>
<German>Nach Tragelast sortieren</German>
<French>Trier par capacité de chargement</French>
<Japanese>容量で並び替え</Japanese>
</Key>
<Key ID="STR_ACE_Arsenal_sortByAccuracyText">
<English>Sort by accuracy</English>
<German>Nach Genauigkeit sortieren</German>
<French>Trier par précision</French>
<Japanese>精度で並び替え</Japanese>
</Key>
<Key ID="STR_ACE_Arsenal_sortByRateOfFireText">
<English>Sort by rate of fire</English>
<German>Nach Schussrate sortieren</German>
<French>Trier par cadence de tir</French>
<Japanese>連射速度で並び替え</Japanese>
</Key>
<Key ID="STR_ACE_Arsenal_sortByMagnificationText">
<English>Sort by magnification</English>
<German>Nach Vergrößerung sortieren</German>
<French>Trier par grossissement</French>
<Japanese>倍率で並び替え</Japanese>
</Key>
<Key ID="STR_ACE_Arsenal_sortByMagCountText">
<English>Sort by ammo count</English>
<German>Nach Munitionszahl sortieren</German>
<French>Trier par nombre de munitions</French>
<Japanese>装弾数で並び替え</Japanese>
</Key>
<Key ID="STR_ACE_Arsenal_buttonShareTooltip">
<English>Share or stop sharing the selected loadout</English>
@ -866,7 +871,7 @@
<Spanish>Cambiar el tamaño de fuente para el texto de los paneles izquierdo y derecho</Spanish>
<French>Change la taille de police des panneaux latéraux.</French>
<Polish>Zmień wysokość czcionki dla tekstu lewego i prawego panelu</Polish>
<Japanese>右か左パネルにあるフォントの高さを変更します。</Japanese>
<Japanese>パネルにあるフォントの高さを変更します。</Japanese>
<Italian>Cambia l'altezza del font per il testo sul pannello sinistro / destro</Italian>
<Korean>왼쪽 / 오른쪽 패널 텍스트의 글꼴 높이 변경</Korean>
<German>Ändert die Schriftgröße für die linke/rechte Leiste</German>
@ -1349,6 +1354,7 @@
<French>Retard avant détonation</French>
<Russian>Задержка детонации</Russian>
<Polish>Opoźnienie zapalnika</Polish>
<Japanese>信管設定時間</Japanese>
</Key>
<Key ID="STR_ACE_Arsenal_DetonatesOnImpact">
<English>Detonates on impact</English>
@ -1356,6 +1362,7 @@
<French>Détonation à l'impact</French>
<Russian>Детонация от удара</Russian>
<Polish>Detonuj przy uderzeniu</Polish>
<Japanese>着発信管</Japanese>
</Key>
</Package>
</Project>

View File

@ -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);

View File

@ -408,6 +408,7 @@
<French>[CSW] Mitrailleuse statique M2 ac. bouclier</French>
<Polish>[CSW] Statyczny karabin maszynowy M2 z tarczą</Polish>
<Russian>[CSW] Станковый M2 со щитом</Russian>
<Japanese>[CSW] 設置型 防盾付き M2</Japanese>
</Key>
<Key ID="STR_ACE_CSW_StaticAutoHMGBag_displayName">
<English>[CSW] Static XM312 Gun (Autonomous)</English>

View File

@ -29,7 +29,7 @@
<Portuguese>Soltar</Portuguese>
<Italian>Lascia</Italian>
<Hungarian>Elengedés</Hungarian>
<Japanese>はな</Japanese>
<Japanese></Japanese>
<Korean>놓기</Korean>
<Chinese>放開</Chinese>
<Chinesesimp>放开</Chinesesimp>
@ -46,7 +46,7 @@
<Portuguese>Arrastar/Soltar Objeto</Portuguese>
<Italian>Trascina/Lascia Oggetto</Italian>
<Hungarian>Húzás/Elengedés Objektum</Hungarian>
<Japanese>オブジェクトを引きずる/はな</Japanese>
<Japanese>オブジェクトを引きずる/</Japanese>
<Korean>물건 끌기/놓기</Korean>
<Chinese>拖拉/放開物品</Chinese>
<Chinesesimp>拖拉/放开物品</Chinesesimp>
@ -57,6 +57,7 @@
<French>Porter/Lâcher un objet</French>
<Russian>Нести/Отпустить Объект</Russian>
<Polish>Nieś/Puść objekt</Polish>
<Japanese>オブジェクトを運ぶ/離す</Japanese>
</Key>
<Key ID="STR_ACE_Dragging_UnableToDrag">
<English>Item too heavy</English>

View File

@ -6,6 +6,7 @@
<Polish>ACE Przeciążenia</Polish>
<French>ACE Force gravitationnelle</French>
<Russian>ACE Перегрузки</Russian>
<Japanese>ACE G フォース</Japanese>
</Key>
<Key ID="STR_ACE_GForces_enabledFor_displayName">
<English>Gforces Effects</English>
@ -58,12 +59,14 @@
<Polish>Współczynnk przeciążenia</Polish>
<French>Coefficient de force gravitationnelle</French>
<Russian>Коэффициент перегрузки</Russian>
<Japanese>G 効果係数</Japanese>
</Key>
<Key ID="STR_ACE_GForces_Coefficient_Description">
<English>Controls strength of G-Force affecting players.</English>
<Polish>Wpływa na siłe przeciążeń oddziałujących na graczy</Polish>
<French>Coefficient permettant d'ajuster le niveau de force gravitationnelle affectant les joueurs.</French>
<Russian>Определяет силу перегрузок, влияющих на игроков.</Russian>
<Japanese>G 効果がプレイヤーに与える影響量を設定できます。</Japanese>
</Key>
</Package>
</Project>

View File

@ -511,30 +511,37 @@
<Key ID="STR_ACE_Grenades_SatchelCharge_Remote_Mag_Throwable">
<English>Explosive Satchel (Throwable)</English>
<French>Charge en sacoche (lançable)</French>
<Japanese>梱包爆薬 (投てき仕様)</Japanese>
</Key>
<Key ID="STR_ACE_Grenades_SatchelCharge_Description">
<English>Type: Charge&lt;br /&gt;Rounds: 1&lt;br /&gt;Used on: Things that need to die</English>
<French>Type : Charge&lt;br /&gt;Munitions : 1&lt;br /&gt;Application : à balancer sur des trucs qui doivent mourir</French>
<Japanese>種類: 爆薬&lt;br /&gt;弾数: 1&lt;br /&gt;次で使用: 破壊すべき物に</Japanese>
</Key>
<Key ID="STR_ACE_Grenades_SatchelCharge_LibText">
<English>An explosive satchel that is throwable. 7 second fixed fuse</English>
<French>Charge explosive lançable. Détonation après 7 secondes.</French>
<Japanese>投げられる梱包爆薬。起爆までの時間は 7 秒間</Japanese>
</Key>
<Key ID="STR_ACE_Grenades_DemoCharge_Remote_Mag_Throwable">
<English>Explosive Charge (Throwable)</English>
<French>Charge explosive (lançable)</French>
<Japanese>爆薬ブロック (投てき仕様)</Japanese>
</Key>
<Key ID="STR_ACE_Grenades_DemoCharge_LibText">
<English>An explosive charge that is throwable. 7 second fixed fuse</English>
<French>Bloc explosif lançable. Détonation après 7 secondes.</French>
<Japanese>投げられる爆薬ブロック。起爆までの時間は 7 秒間</Japanese>
</Key>
<Key ID="STR_ACE_Grenades_Convert_Fuse">
<English>Convert to short fuse</English>
<French>Mèche lente (7 secondes)</French>
<French>Appliquer une mèche</French>
<Japanese>短信管へ変更</Japanese>
</Key>
<Key ID="STR_ACE_Grenades_Remove_Fuse">
<English>Remove short fuse</English>
<French>Retirer la mèche lente</French>
<French>Retirer la mèche</French>
<Japanese>短信管を削除</Japanese>
</Key>
<Key ID="STR_ACE_Grenades_Settings_DisplayName">
<English>ACE Grenades</English>
@ -554,9 +561,13 @@
</Key>
<Key ID="STR_ACE_Grenades_convertExplosives_DisplayName">
<English>Allow Explosive Conversion</English>
<French>Autoriser les mèches (charges lançables)</French>
<Japanese>爆薬変更を許可</Japanese>
</Key>
<Key ID="STR_ACE_Grenades_convertExplosives_Description">
<English>Allow converting explosives to throwables</English>
<French>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.</French>
<Japanese>爆発物を投てき仕様へ交換できるようにします。</Japanese>
</Key>
</Package>
</Project>

View File

@ -70,18 +70,21 @@
<Polish>Wymień broń w torbie</Polish>
<Russian>Заменить оружие в чехле</Russian>
<French>Échanger les armes</French>
<Japanese>ガンバッグ内の武器を交換</Japanese>
</Key>
<Key ID="STR_ACE_Gunbag_SwapGunbagEnabled_DisplayName">
<English>Enable Weapon Swap</English>
<Polish>Aktywuj wymianę broni</Polish>
<Russian>Включить обмен оружием</Russian>
<French>Activer l'échange d'arme</French>
<Japanese>武器交換を有効化</Japanese>
</Key>
<Key ID="STR_ACE_Gunbag_SwapGunbagEnabled_Description">
<English>Allows interaction to directly swap the primary weapon and stored weapon.</English>
<Polish>Pozwala na interakcje do wymiany broni głównej na bron schowaną.</Polish>
<Russian>Разрешает действие прямого обмена основного оружия и спрятанного в чехле.</Russian>
<French>Active le menu d'interaction personnelle permettant d'échanger directement l'arme primaire et l'arme rangée dans la housse.</French>
<Japanese>持っている武器とガンバッグ内の武器を交換できるようにします。</Japanese>
</Key>
<Key ID="STR_ACE_Gunbag_OffGunbag">
<English>Get weapon out of gunbag</English>
@ -121,7 +124,7 @@
<French>Housse d'arme vide</French>
<Russian>Чехол пуст</Russian>
<Czech>Prázdné pouzdro na zbraň</Czech>
<Japanese>ガンバッグは空</Japanese>
<Japanese>ガンバッグは空です</Japanese>
<Polish>Torba jest pusta</Polish>
<Korean>총가방 비어있음</Korean>
<Italian>Borsa per armi vuota</Italian>

View File

@ -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;

View File

@ -270,47 +270,58 @@
<Russian>Показывать только союзные жесты</Russian>
<Polish>Pokazuj jedynie sojusznicze gesty</Polish>
<French>Afficher uniquement le pointage des alliés</French>
<Japanese>友軍ジェスチャーのみ表示</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_onlyShowFriendlys_description">
<English>Shows only Gestures from Units that are from the same side or a Friendly side.</English>
<Russian>Показывать жесты только от игроков союзной стороны.</Russian>
<French>Affiche uniquement les pointages effectués par des unités qui sont du même camp, ou d'un camp allié.</French>
<Japanese>友軍ユニットのみからジェスチャーを表示します。</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_maxRangeCamera_displayName">
<English>Max range Camera</English>
<French>Portée de la caméra</French>
<Japanese>カメラ最大範囲</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_maxRangeCamera_description">
<English>Max range between a Camera and players to show the map gesture indicator</English>
<French>Définit le rayon au-delà duquel une caméra ne verra plus l'indicateur de pointage des autres joueurs.</French>
<Japanese>プレイヤーが行うマップ ジェスチャーをカメラから確認できる最大範囲を設定します。</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_allowSpectator_displayName">
<English>Allow Spectator</English>
<French>Autoriser les spectateurs</French>
<Japanese>スペクテイターに許可</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_allowSpectator_description">
<English>Allows Spectator to See Map Gestures</English>
<French>Permet aux spectateurs de voir le pointage des autres joueurs.</French>
<Japanese>スペクテイターからマップ ジェスチャーを表示できるようにします。</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_allowCurator_displayName">
<English>Allow Curator</English>
<French>Autoriser les curateurs</French>
<Japanese>キュレーターに許可</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_allowCurator_description">
<English>Allows Curator to See Map Gestures</English>
<French>Permet aux curateurs de voir le pointage des autres joueurs.</French>
<Japanese>キュレーターからマップ ジェスチャーを表示できるようにします。</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_briefingMode_displayName">
<English>Briefing Mode</English>
<French>Visibilité lors du briefing</French>
<Japanese>ブリーフィング モード</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_briefingMode_description">
<English>What player can see what</English>
<French>Définit quels pointages les joueurs peuvent voir lors du briefing.</French>
<Japanese>プレイヤーが見ることができる対象を決定します。</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_briefingMode_Disabled">
<English>Disabled</English>
<French>Pointage désactivé</French>
<Japanese>無効化</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_briefingMode_Group">
<English>Group</English>
@ -322,6 +333,7 @@
<Portuguese>Grupo</Portuguese>
<Russian>Группа</Russian>
<Spanish>Grupo</Spanish>
<Japanese>グループ</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_briefingMode_Side">
<English>Side</English>
@ -333,10 +345,12 @@
<Portuguese>Lado</Portuguese>
<Russian>Сторона</Russian>
<Spanish>Bando</Spanish>
<Japanese>陣営</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_briefingMode_Proximity">
<English>Proximity</English>
<French>Proximité</French>
<Japanese>付近のみ</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_briefingMode_All">
<English>All</English>
@ -348,6 +362,7 @@
<Portuguese>Tudo</Portuguese>
<Russian>Все</Russian>
<Spanish>Todas</Spanish>
<Japanese>全て</Japanese>
</Key>
<Key ID="STR_ACE_Map_Gestures_moduleGroupSettings_displayName">
<English>Map Gestures - Group Settings</English>
@ -390,6 +405,7 @@
<Portuguese>Cores</Portuguese>
<Russian>Цвета</Russian>
<Spanish>Colores</Spanish>
<Japanese></Japanese>
</Key>
</Package>
</Project>

View File

@ -186,6 +186,7 @@
<Key ID="STR_ACE_Medical_Fractures_SplintHealsNoJog">
<English>Splints Heal, but Cannot Jog</English>
<French>Les attelles guérissent les fractures, mais empêchent de courir</French>
<Japanese>添え木で治癒可能、駆け足できないように</Japanese>
</Key>
<Key ID="STR_ACE_Medical_FractureChance_DisplayName">
<English>Fracture Chance</English>

View File

@ -1087,6 +1087,7 @@
<French>Informations patient</French>
<Russian>Информация о пациенте</Russian>
<Chinesesimp>伤员信息</Chinesesimp>
<Japanese>患者情報</Japanese>
</Key>
</Package>
</Project>

View File

@ -115,6 +115,7 @@
<Czech>Koeficient opětovného otevření rány</Czech>
<Russian>Коэффициент повторного открытия раны</Russian>
<Polish>Współczynnik ponownego otwierania ran</Polish>
<Japanese>再開放係数</Japanese>
</Key>
<Key ID="STR_ACE_Medical_Treatment_WoundReopenChance_Description">
<English>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.</English>
@ -123,6 +124,7 @@
<Czech>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.</Czech>
<Russian>Коэффициент контроля вероятности повторного открытия раны. Окончательный шанс повторного открытия определяется путем умножения этого значения на определенный шанс повторного открытия для используемого типа раны и повязки.</Russian>
<Polish>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.</Polish>
<Japanese>傷が再開放する確率の係数を設定できます。再開放は、この数値と傷の種類、そして使用した包帯に応じて左右されます。</Japanese>
</Key>
<Key ID="STR_ACE_Medical_Treatment_ClearTraumaAfterBandage_DisplayName">
<English>Clear Trauma After Bandage</English>

View File

@ -1326,6 +1326,7 @@
<Key ID="STR_ACE_RealisticNames_SatchelChargeThrowable_Name">
<English>M183 Demolition Charge (Throwable)</English>
<French>M183 Charge de démolition (lançable)</French>
<Japanese>M183 梱包爆薬 (投てき仕様)</Japanese>
</Key>
<Key ID="STR_ACE_RealisticNames_DemoCharge_Name">
<English>M112 Demolition Block</English>
@ -1347,6 +1348,7 @@
<Key ID="STR_ACE_RealisticNames_DemoChargeThrowable_Name">
<English>M112 Demolition Charge (Throwable)</English>
<French>M112 Bloc de démolition (lançable)</French>
<Japanese>M112 爆薬ブロック (投てき仕様)</Japanese>
</Key>
<Key ID="STR_ACE_RealisticNames_HandGrenade_Name">
<English>M67 Fragmentation Grenade</English>
@ -2505,7 +2507,7 @@
<Italian>SIG 556 (Khaki)</Italian>
<Hungarian>SIG 556 (Khaki)</Hungarian>
<Portuguese>SIG 556 (Caqui)</Portuguese>
<Japanese>SIG 556 (土埃)</Japanese>
<Japanese>SIG 556 (カーキ)</Japanese>
<Korean>SIG 556 (카키)</Korean>
<Chinese>SIG 556精準步槍 (卡其色)</Chinese>
<Chinesesimp>SIG 556精准步枪 (卡其色)</Chinesesimp>
@ -2522,7 +2524,7 @@
<Italian>SIG 556 (Sabbia)</Italian>
<Hungarian>SIG 556 (Homok)</Hungarian>
<Portuguese>SIG 556 (Deserto)</Portuguese>
<Japanese>SIG 556 (砂地)</Japanese>
<Japanese>SIG 556 (サンド)</Japanese>
<Korean>SIG 556 (모래)</Korean>
<Chinese>SIG 556精準步槍 (沙色)</Chinese>
<Chinesesimp>SIG 556精准步枪 (沙色)</Chinesesimp>
@ -2573,7 +2575,7 @@
<Polish>ASP-1 Kir</Polish>
<Hungarian>ASP-1 Kir</Hungarian>
<Portuguese>ASP-1 Kir</Portuguese>
<Japanese>ASP-1 Kir</Japanese>
<Japanese>ASP-1 キール</Japanese>
<Korean>ASP-1 キール</Korean>
<Chinese>ASP-1"基爾"消音狙擊步槍</Chinese>
<Chinesesimp>ASP-1"基尔"消音狙击步枪</Chinesesimp>
@ -2607,7 +2609,7 @@
<Italian>ASP-1 Kir (Tan)</Italian>
<Hungarian>ASP-1 Kir (Cserszín)</Hungarian>
<Portuguese>ASP-1 Kir (Deserto)</Portuguese>
<Japanese>ASP-1 キール (黄褐)</Japanese>
<Japanese>ASP-1 キール (タン)</Japanese>
<Korean>ASP-1 Kir (황갈)</Korean>
<Chinese>ASP-1"基爾"消音狙擊步槍 (黃褐色)</Chinese>
<Chinesesimp>ASP-1"基尔"消音狙击步枪 (黄褐色)</Chinesesimp>
@ -2760,7 +2762,7 @@
<Italian>HK121 (Hex)</Italian>
<Hungarian>HK121 (Hex)</Hungarian>
<Portuguese>HK121 (Hex)</Portuguese>
<Japanese>HK 121 (蜂巣)</Japanese>
<Japanese>HK 121 (ヘックス)</Japanese>
<Korean>HK121 (육각)</Korean>
<Chinese>HK121中型機槍 (數位蜂巢迷彩)</Chinese>
<Chinesesimp>HK121中型机枪 (数位蜂巢迷彩)</Chinesesimp>
@ -2777,7 +2779,7 @@
<Italian>HK121 (Tan)</Italian>
<Hungarian>HK121 (Cserszín)</Hungarian>
<Portuguese>HK121 (Deserto)</Portuguese>
<Japanese>HK 121 (黄褐)</Japanese>
<Japanese>HK 121 (タン)</Japanese>
<Korean>HK121 (황갈)</Korean>
<Chinese>HK121機槍 (黃褐色)</Chinese>
<Chinesesimp>HK121机枪 (黄褐色)</Chinesesimp>
@ -2845,7 +2847,7 @@
<Italian>LWMMG (Sabbia)</Italian>
<Hungarian>LWMMG (Homok)</Hungarian>
<Portuguese>LWMMG (Deserto)</Portuguese>
<Japanese>LWMMG (砂地)</Japanese>
<Japanese>LWMMG (サンド)</Japanese>
<Korean>LWMMG (모래)</Korean>
<Chinese>輕量化中型機槍 (沙色)</Chinese>
<Chinesesimp>轻量化中型机枪 (沙色)</Chinesesimp>
@ -3060,7 +3062,7 @@
<Italian>QBZ-95-1 LSW (Nero)</Italian>
<Hungarian>QBZ-95-1 LSW (Fekete)</Hungarian>
<Portuguese>QBZ-95-1 LSW (Preto)</Portuguese>
<Japanese>QBZ-95-1 LSW ()</Japanese>
<Japanese>QBZ-95-1 LSW (ブラック)</Japanese>
<Korean>QBZ-95-1 LSW (검정)</Korean>
<Chinese>QBZ-95-1式輕機槍 (黑色)</Chinese>
<Chinesesimp>QBZ-95-1式轻机枪 (黑色)</Chinesesimp>
@ -3332,7 +3334,7 @@
<Italian>HK416A5 14.5" (Nero)</Italian>
<Hungarian>HK416A5 14.5" (Fekete)</Hungarian>
<Portuguese>HK416A5 14.5" (Preto)</Portuguese>
<Japanese>HK416A5 14.5" ()</Japanese>
<Japanese>HK416A5 14.5" (ブラック)</Japanese>
<Korean>HK416A5 14.5" (검정)</Korean>
<Chinese>HK416A5 14.5"突擊步槍 (黑色)</Chinese>
<Chinesesimp>HK416A5 14.5"突击步枪 (黑色)</Chinesesimp>
@ -4916,7 +4918,7 @@
<Portuguese>MSBS Grot MR (Preto)</Portuguese>
<Korean>MSBS Grot MR (검정)</Korean>
<Chinesesimp>MSBS Grot MR(黑色)</Chinesesimp>
<Japanese>MSBS Grot MR(ブラック)</Japanese>
<Japanese>MSBS Grot MR (ブラック)</Japanese>
<Turkish>MSBS Grot MR (Siyah)</Turkish>
<Hungarian>MSBS Grot MR (Fekete)</Hungarian>
</Key>

View File

@ -25,6 +25,7 @@
<German>25-Schuss-.45-ACP-Magazin</German>
<Czech>.45 ACP, 25ks zásobník</Czech>
<Turkish>.45 ACP 25 Merm. Şarjör</Turkish>
<Japanese>.45 ACP 25Rnd マガジン</Japanese>
</Key>
<Key ID="STR_ACE_SmallArms_25Rnd_45_Tracer_Green_Name">
<English>.45 ACP 25Rnd Tracers (Green) Mag</English>
@ -34,6 +35,7 @@
<German>25-Schuss-.45-ACP-Vermin-Magazin (Leuchtspur Grün)</German>
<Czech>.45 ACP, 25ks zásobník stopovky (zelené)</Czech>
<Turkish>.45 ACP 25 Merm. İzli (Yeşil) Şarjör</Turkish>
<Japanese>.45 ACP 25Rnd 曳光弾 (緑) マガジン</Japanese>
</Key>
<Key ID="STR_ACE_SmallArms_25Rnd_45_Tracer_Red_Name">
<English>.45 ACP 25Rnd Tracers (Red) Mag</English>
@ -43,6 +45,7 @@
<German>25-Schuss-.45-ACP-Vermin-Magazin (Leuchtspur Rot)</German>
<Czech>.45 ACP, 25ks zásobník stopovky (červené)</Czech>
<Turkish>.45 ACP 25 Merm. İzli (Kırmızı) Şarjör</Turkish>
<Japanese>.45 ACP 25Rnd 曳光弾 (赤) マガジン</Japanese>
</Key>
<Key ID="STR_ACE_SmallArms_25Rnd_45_Tracer_Yellow_Name">
<English>.45 ACP 25Rnd Tracers (Yellow) Mag</English>
@ -52,6 +55,7 @@
<German>25-Schuss-.45-ACP-Vermin-Magazin (Nachlade-Leuchtspur Gelb)</German>
<Czech>.45 ACP, 25ks zásobník stopovky (žluté)</Czech>
<Turkish>.45 ACP 25 Merm. İzli (Sarı) Şarjör</Turkish>
<Japanese>.45 ACP 25Rnd 曳光弾 (黄) マガジン</Japanese>
</Key>
<Key ID="STR_ACE_SmallArms_8Rnd_45_Name">
<English>.45 ACP 8Rnd Mag</English>
@ -61,6 +65,7 @@
<German>8-Schuss-.45-ACP-Magazin</German>
<Czech>.45 ACP, 8ks zásobník</Czech>
<Turkish>.45 ACP 8 Merm. Şarjör</Turkish>
<Japanese>.45 ACP 8Rnd マガジン</Japanese>
</Key>
</Package>
</Project>

View File

@ -242,38 +242,47 @@
<Key ID="STR_ACE_Trenches_Category">
<English>ACE Trenches</English>
<French>ACE Tranchées</French>
<Japanese>ACE 塹壕</Japanese>
</Key>
<Key ID="STR_ACE_Trenches_SmallEnvelopeDigDuration_DisplayName">
<English>Small Trench Dig Duration</English>
<French>Petites tranchées - durée d'excavation</French>
<Japanese>小型塹壕の完成時間</Japanese>
</Key>
<Key ID="STR_ACE_Trenches_SmallEnvelopeDigDuration_Description">
<English>Time, in seconds, required to dig a small trench.</English>
<French>Définit le temps nécessaire au déploiement des petites tranchées (en secondes).</French>
<Japanese>小型塹壕が完成するまでの時間 (秒) を設定できます。</Japanese>
</Key>
<Key ID="STR_ACE_Trenches_SmallEnvelopeRemoveDuration_DisplayName">
<English>Small Trench Remove Duration</English>
<French>Petites tranchées - durée de retrait</French>
<Japanese>小型塹壕の削除時間</Japanese>
</Key>
<Key ID="STR_ACE_Trenches_SmallEnvelopeRemoveDuration_Description">
<English>Time, in seconds, required to remove a small trench.</English>
<French>Définit le temps nécessaire pour le retrait des petites tranchées (en secondes).</French>
<Japanese>小型塹壕が削除されるまでの時間 (秒) を設定できます。</Japanese>
</Key>
<Key ID="STR_ACE_Trenches_BigEnvelopeDigDuration_DisplayName">
<English>Big Trench Dig Duration</English>
<French>Grandes tranchées - durée d'excavation</French>
<Japanese>大型塹壕の完成時間</Japanese>
</Key>
<Key ID="STR_ACE_Trenches_BigEnvelopeDigDuration_Description">
<English>Time, in seconds, required to dig a big trench.</English>
<French>Définit le temps nécessaire au déploiement des grandes tranchées (en secondes).</French>
<Japanese>大型塹壕が完成するまでの時間 (秒) を設定できます。</Japanese>
</Key>
<Key ID="STR_ACE_Trenches_BigEnvelopeRemoveDuration_DisplayName">
<English>Big Trench Remove Duration</English>
<French>Grandes tranchées - durée de retrait</French>
<Japanese>大型塹壕の削除時間</Japanese>
</Key>
<Key ID="STR_ACE_Trenches_BigEnvelopeRemoveDuration_Description">
<English>Time, in seconds, required to remove a big trench.</English>
<French>Définit le temps nécessaire pour le retrait des grandes tranchées (en secondes).</French>
<Japanese>大型塹壕が削除されるまでの時間 (秒) を設定できます。</Japanese>
</Key>
</Package>
</Project>