Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions addons/advanced_throwing/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
</Key>
<Key ID="STR_ACE_Advanced_Throwing_ChangePower">
<English>(Scroll) Change Power</English>
<Spanish>(Scroll) Ajustar Potencia</Spanish>
<Russian>(Прокрутка) Изменение мощности</Russian>
<Japanese>(スクロール) 投擲力の調整</Japanese>
<Spanish>(Scroll) Ajustar Potencia</Spanish>
</Key>
<Key ID="STR_ACE_Advanced_Throwing_Cook">
<English>(Click) Cook</English>
Expand Down Expand Up @@ -328,9 +328,9 @@
</Key>
<Key ID="STR_ACE_Advanced_Throwing_SnapPower">
<English>(Scroll) Snap Power</English>
<Spanish>(Scroll) Cambiar Potencia por Niveles</Spanish>
<Russian>(Прокрутка) Мгновенная мощность</Russian>
<Japanese>(スクロール) 投擲力の切替</Japanese>
<Spanish>(Scroll) Cambiar Potencia por Niveles</Spanish>
</Key>
<Key ID="STR_ACE_Advanced_Throwing_Throw">
<English>Throw</English>
Expand Down Expand Up @@ -367,15 +367,15 @@
</Key>
<Key ID="STR_ACE_Advanced_Throwing_throwStepSetting_Description">
<English>Adjust the granularity of different throwing modes by using the mouse wheel</English>
<Spanish>Ajusta la granularidad de los distintos modos de lanzamiento usando la rueda del ratón</Spanish>
<Russian>Отрегулируйте степень детализации различных режимов метания с помощью колесика мыши</Russian>
<Japanese>マウスホイールでの投擲力の調整の細かさを変更します。</Japanese>
<Spanish>Ajusta la granularidad de los distintos modos de lanzamiento usando la rueda del ratón</Spanish>
</Key>
<Key ID="STR_ACE_Advanced_Throwing_throwStepSetting_DisplayName">
<English>Granular Throw Steps</English>
<Spanish>Pasos de ajuste del lanzamiento</Spanish>
<Russian>Этапы гранулирвоанного броска</Russian>
<Japanese>投擲力のステップ数</Japanese>
<Spanish>Pasos de ajuste del lanzamiento</Spanish>
</Key>
</Package>
</Project>
4 changes: 2 additions & 2 deletions addons/compat_cup_weapons/CfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1128,11 +1128,11 @@ class CfgWeapons {
ace_barrelLength = 349;
ace_barrelTwist = 305;
};
class CUP_lmg_m249_pip3 :CUP_lmg_minimi_railed {
class CUP_lmg_m249_pip3: CUP_lmg_minimi_railed {
ace_barrelLength = 349;
ace_barrelTwist = 305;
};
class CUP_lmg_m249_pip4 :CUP_lmg_minimi_railed {
class CUP_lmg_m249_pip4: CUP_lmg_minimi_railed {
ace_barrelLength = 465;
ace_barrelTwist = 305;
};
Expand Down
4 changes: 2 additions & 2 deletions addons/compat_cwr3_baf/CfgAmmo.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class CfgAmmo {
class MissileBase;

class cwr3_m_javelin_aa : MissileBase {
class cwr3_m_javelin_aa: MissileBase {
effectsMissile = "missile2"; // Remove vanilla tracking flare, missileguidance adds it's own.
thrust = 275; // Give a more realistic thrust and thrustTime
thrustTime = 3; // Since we don't need it longer for the vanilla flare.
Expand All @@ -17,7 +17,7 @@ class CfgAmmo {
};
};

class cwr3_m_blowpipe_aa : cwr3_m_javelin_aa {
class cwr3_m_blowpipe_aa: cwr3_m_javelin_aa {
thrust = 240;
thrustTime = 3;
class ace_missileguidance: ace_missileguidance_type_Blowpipe {
Expand Down
12 changes: 6 additions & 6 deletions addons/compat_cwr3_baf/ace_wardrobe_headgear.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ HELMET_SCRIM(cwr3_b_uk_headgear_mk5_helmet_dpm_net,cwr3_b_uk_headgear_mk5_helmet
class cwr3_b_uk_headgear_mk5_helmet_scrim_burlap: ace_wardrobe_base {
class modifiableTo {
class cwr3_b_uk_headgear_mk5_helmet_scrim_burlap_camo {
displayName = ECSTRING(main,add_foliage);
displayName = ACEWARDROBE_CSTRING(foliageAdd);
};
};
};
class cwr3_b_uk_headgear_mk5_helmet_scrim_burlap_camo: ace_wardrobe_base {
class modifiableTo {
class cwr3_b_uk_headgear_mk5_helmet_scrim_burlap {
displayName = ECSTRING(main,remove_foliage);
displayName = ACEWARDROBE_CSTRING(foliageRemove);
};
};
};
Expand All @@ -23,24 +23,24 @@ class cwr3_b_uk_headgear_mk5_helmet_scrim_burlap_camo: ace_wardrobe_base {
class cwr3_b_uk_headgear_mk5_helmet_net: ace_wardrobe_base {
class modifiableTo {
class cwr3_b_uk_headgear_mk5_helmet_scrim {
displayName = ECSTRING(main,add_scrim);
displayName = ACEWARDROBE_CSTRING(foliageAdd);
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Drofseh
we don't seem to have separate strings for this, just a combo, so I'm just going to use that unless we want to split it out?

        <Key ID="STR_ACE_Wardrobe_foliageAdd">
            <English>Add scrim/foliage</English>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Go for it!

};
};
};
class cwr3_b_uk_headgear_mk5_helmet_scrim: ace_wardrobe_base {
class modifiableTo {
class cwr3_b_uk_headgear_mk5_helmet_scrim_camo {
displayName = ECSTRING(main,add_foliage);
displayName = ACEWARDROBE_CSTRING(foliageAdd);
};
class cwr3_b_uk_headgear_mk5_helmet_net {
displayName = ECSTRING(main,remove_scrim);
displayName = ACEWARDROBE_CSTRING(foliageRemove);
};
};
};
class cwr3_b_uk_headgear_mk5_helmet_scrim_camo: ace_wardrobe_base {
class modifiableTo {
class cwr3_b_uk_headgear_mk5_helmet_scrim {
displayName = ECSTRING(main,remove_foliage);
displayName = ACEWARDROBE_CSTRING(foliageRemove);
};
};
};
6 changes: 3 additions & 3 deletions addons/csw/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,9 @@
</Key>
<Key ID="STR_ACE_CSW_StaticM2BareBag_displayName">
<English>[CSW] Static M2 w/o Attachments</English>
<Spanish>[CSW] M2 Estática sin Accesorios</Spanish>
<Italian>[CSW] M2 Statico senza Accessori</Italian>
<German>[CSW] Statisches M2 ohne Schild</German>
<Spanish>[CSW] M2 Estática sin Accesorios</Spanish>
</Key>
<Key ID="STR_ACE_CSW_StaticM2ShieldBag_displayName">
<English>[CSW] Static M2 w/ Shield</English>
Expand All @@ -430,15 +430,15 @@
</Key>
<Key ID="STR_ACE_CSW_StaticM2ShieldSightBag_displayName">
<English>[CSW] Static M2 w/ Shield and Sight</English>
<Spanish>[CSW] M2 Estática con Escudo y Visor</Spanish>
<Italian>[CSW] M2 Statico con Scudo e Ottica</Italian>
<German>[CSW] Statisches M2 mit Schild und Optik</German>
<Spanish>[CSW] M2 Estática con Escudo y Visor</Spanish>
</Key>
<Key ID="STR_ACE_CSW_StaticM2SightBag_displayName">
<English>[CSW] Static M2 w/ Sight</English>
<Spanish>[CSW] M2 Estática con Visor</Spanish>
<Italian>[CSW] M2 Statico con ottica</Italian>
<German>[CSW] Statisches M2 mit Optik</German>
<Spanish>[CSW] M2 Estática con Visor</Spanish>
</Key>
<Key ID="STR_ACE_CSW_actionLink">
<English>Link %1</English>
Expand Down
6 changes: 3 additions & 3 deletions addons/markers/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -526,21 +526,21 @@
</Key>
<Key ID="STR_ACE_Markers_quickNumberMarks">
<English>Quick Number Marks</English>
<Spanish>Marcas Rápidas Numéricas</Spanish>
<Russian>Быстрые числовые метки</Russian>
<Japanese>クイック番号マーク</Japanese>
<Spanish>Marcas Rápidas Numéricas</Spanish>
</Key>
<Key ID="STR_ACE_Markers_quickNumberMarksDescription">
<English>Allows easy placement of numbered markers by holding ALT when placing a marker</English>
<Spanish>Permite colocar fácilmente marcadores numerados manteniendo pulsado ALT al colocar un marcador</Spanish>
<Russian>Позволяет легко размещать пронумерованные маркеры, удерживая клавишу ALT при размещении маркера</Russian>
<Japanese>ALTキーを押しながらマーカーを配置することで、 番号付きマーカーを簡単に配置出来るようにします。</Japanese>
<Spanish>Permite colocar fácilmente marcadores numerados manteniendo pulsado ALT al colocar un marcador</Spanish>
</Key>
<Key ID="STR_ACE_Markers_quickNumberMarksSideSync">
<English>Side-Synchronized</English>
<Spanish>Sincronizado en Bando</Spanish>
<Russian>Синхронизация по бокам</Russian>
<Japanese>陣営内で同期</Japanese>
<Spanish>Sincronizado en Bando</Spanish>
</Key>
</Package>
</Project>
24 changes: 12 additions & 12 deletions addons/missileguidance/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@
<Japanese>PP</Japanese>
<Ukrainian>PP</Ukrainian>
</Key>
<Key ID="STR_ACE_MissileGuidance_GPS_ui_pp_tooltip">
<English>Ordnance will guide to the provided 10 digit grid coordinates</English>
<Spanish>La munición será guiada a las coordenadas de cuadrícula de 10 dígitos proporcionadas.</Spanish>
<Russian>Боеприпас будет ориентироваться на предоставленные 10-значные координаты в сетке</Russian>
<Japanese>兵装は指定された10桁のグリッド座標に誘導されます</Japanese>
</Key>
<Key ID="STR_ACE_MissileGuidance_GPS_ui_too">
<English>TARGET OF OPPORTUNITY</English>
<French>CIBLE D'OPPORTUNITÉ</French>
Expand All @@ -145,6 +151,12 @@
<Japanese>臨機目標 (TOO)</Japanese>
<Ukrainian>ЦІЛЬ ЩО ПІДВЕРНУЛАСЯ</Ukrainian>
</Key>
<Key ID="STR_ACE_MissileGuidance_GPS_ui_too_tooltip">
<English>Ordnance will guide to the location the targeting camera is looking at</English>
<Spanish>La munición será guiada hacia la ubicación a la que apunta la cámara de apuntado</Spanish>
<Russian>Боеприпас будет направлен в то место, на которое смотрит камера наведения</Russian>
<Japanese>兵装はターゲティングカメラで見ている場所へ誘導されます</Japanese>
</Key>
<Key ID="STR_ACE_MissileGuidance_Hellfire_AGM114K">
<English>Hellfire II AGM-114K Missile</English>
<Czech>Hellfire II AGM-114K</Czech>
Expand Down Expand Up @@ -467,17 +479,5 @@
<Japanese>ミサイル - 上</Japanese>
<Ukrainian>Ракета - Вгору</Ukrainian>
</Key>
<Key ID="STR_ACE_MissileGuidance_GPS_ui_too_tooltip">
<English>Ordnance will be guided to the location the targeting camera is pointing at</English>
<Japanese>兵装はターゲティングカメラで見ている場所へ誘導されます</Japanese>
<Russian>Боеприпас будет направлен в то место, на которое смотрит камера наведения</Russian>
<Spanish>La munición será guiada hacia la ubicación a la que apunta la cámara de apuntado</Spanish>
</Key>
<Key ID="STR_ACE_MissileGuidance_GPS_ui_pp_tooltip">
<English>Ordnance will be guided to the provided 10-digit grid coordinates</English>
<Japanese>兵装は指定された10桁のグリッド座標に誘導されます</Japanese>
<Russian>Боеприпас будет ориентироваться на предоставленные 10-значные координаты в сетке</Russian>
<Spanish>La munición será guiada a las coordenadas de cuadrícula de 10 dígitos proporcionadas.</Spanish>
</Key>
</Package>
</Project>
4 changes: 2 additions & 2 deletions addons/rangecard/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<Key ID="STR_ACE_RangeCard_DeleteRangeCardCopy">
<English>Delete Range Card Copy</English>
<French>Supprimer la copie de la table de tir</French>
<Spanish>Borrar copia de Tarjeta de Distancias</Spanish>
<Russian>Удалить копию таблицы поправок</Russian>
<German>Entferne Kopie der Entfernungsspinne</German>
<Japanese>レンジカードの複製を削除</Japanese>
<Russian>Удалить копию таблицы поправок</Russian>
<Spanish>Borrar copia de Tarjeta de Distancias</Spanish>
</Key>
<Key ID="STR_ACE_RangeCard_Description">
<English>50 METER increments -- MRAD/MRAD (reticle/turrets)</English>
Expand Down
20 changes: 10 additions & 10 deletions addons/realisticnames/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1889,12 +1889,6 @@
<Turkish>JAS 39 Gripen</Turkish>
<Ukrainian>JAS 39 Gripen</Ukrainian>
</Key>
<Key ID="STR_ACE_RealisticNames_UAV_05_Name">
<English>XQ-47B</English>
<Japanese>XQ-47B</Japanese>
<Russian>XQ-47B</Russian>
<Spanish>XQ-47B</Spanish>
</Key>
<Key ID="STR_ACE_RealisticNames_SLAM_Name">
<English>M4A1 SLAM</English>
<Czech>M4A1 SLAM</Czech>
Expand Down Expand Up @@ -2570,6 +2564,12 @@
<Hungarian>YABHON-R3</Hungarian>
<Ukrainian>YABHON-R3</Ukrainian>
</Key>
<Key ID="STR_ACE_RealisticNames_UAV_05_Name">
<English>XQ-47B</English>
<Spanish>XQ-47B</Spanish>
<Russian>XQ-47B</Russian>
<Japanese>XQ-47B</Japanese>
</Key>
<Key ID="STR_ACE_RealisticNames_afv_wheeled_01">
<English>Rooikat 120</English>
<Czech>Rooikat 120</Czech>
Expand Down Expand Up @@ -3092,9 +3092,9 @@
</Key>
<Key ID="STR_ACE_RealisticNames_arifle_MSBS65_GL_muzzleGPBO40">
<English>GPBO-40</English>
<Japanese>GPBO-40</Japanese>
<Russian>GPBO-40</Russian>
<Spanish>GPBO-40</Spanish>
<Russian>GPBO-40</Russian>
<Japanese>GPBO-40</Japanese>
</Key>
<Key ID="STR_ACE_RealisticNames_arifle_MSBS65_GL_sand">
<English>MSBS Grot GL (Sand)</English>
Expand Down Expand Up @@ -3242,9 +3242,9 @@
</Key>
<Key ID="STR_ACE_RealisticNames_arifle_MSBS65_UBS_muzzleSix12">
<English>SIX-12</English>
<Japanese>SIX-12</Japanese>
<Russian>SIX-12</Russian>
<Spanish>SIX-12</Spanish>
<Russian>SIX-12</Russian>
<Japanese>SIX-12</Japanese>
</Key>
<Key ID="STR_ACE_RealisticNames_arifle_MSBS65_UBS_sand">
<English>MSBS Grot SG (Sand)</English>
Expand Down
28 changes: 14 additions & 14 deletions addons/tagging/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,45 +3,45 @@
<Package name="Tagging">
<Key ID="STR_ACE_Tagging_ChalkBlack">
<English>Chalk (Black)</English>
<German>Kreide (Schwarz)</German>
<Spanish>Tiza (Negra)</Spanish>
<Russian>Мел (Черный)</Russian>
<German>Kreide (Schwarz)</German>
<Japanese>チョーク (黒)</Japanese>
<Spanish>Tiza (Negra)</Spanish>
</Key>
<Key ID="STR_ACE_Tagging_ChalkBlue">
<English>Chalk (Blue)</English>
<German>Kreide (Blau)</German>
<Spanish>Tiza (Azul)</Spanish>
<Russian>Мел (Синий)</Russian>
<German>Kreide (Blau)</German>
<Japanese>チョーク (青)</Japanese>
<Spanish>Tiza (Azul)</Spanish>
</Key>
<Key ID="STR_ACE_Tagging_ChalkGreen">
<English>Chalk (Green)</English>
<German>Kreide (Grün)</German>
<Spanish>Tiza (Verde)</Spanish>
<Russian>Мел (Зеленый)</Russian>
<German>Kreide (Grün)</German>
<Japanese>チョーク (緑)</Japanese>
<Spanish>Tiza (Verde)</Spanish>
</Key>
<Key ID="STR_ACE_Tagging_ChalkRed">
<English>Chalk (Red)</English>
<German>Kreide (Rot)</German>
<Spanish>Tiza (Roja)</Spanish>
<Russian>Мел (Красный)</Russian>
<German>Kreide (Rot)</German>
<Japanese>チョーク (赤)</Japanese>
<Spanish>Tiza (Roja)</Spanish>
</Key>
<Key ID="STR_ACE_Tagging_ChalkWhite">
<English>Chalk (White)</English>
<German>Kreide (Weiß)</German>
<Spanish>Tiza (Blanca)</Spanish>
<Russian>Мел (Белый)</Russian>
<German>Kreide (Weiß)</German>
<Japanese>チョーク (白)</Japanese>
<Spanish>Tiza (Blanca)</Spanish>
</Key>
<Key ID="STR_ACE_Tagging_ChalkYellow">
<English>Chalk (Yellow)</English>
<German>Kreide (Gelb)</German>
<Spanish>Tiza (Amarilla)</Spanish>
<Russian>Мел (Желтый)</Russian>
<German>Kreide (Gelb)</German>
<Japanese>チョーク (黄)</Japanese>
<Spanish>Tiza (Amarilla)</Spanish>
</Key>
<Key ID="STR_ACE_Tagging_LastUsed">
<English>Last Used</English>
Expand Down Expand Up @@ -359,10 +359,10 @@
</Key>
<Key ID="STR_ACE_Tagging_descChalk">
<English>A chalk marker for tagging walls.</English>
<German>Ein Kreidestift um Wände zu markieren.</German>
<Spanish>Tiza para marcar paredes.</Spanish>
<Russian>Меловой маркер для разметки стен.</Russian>
<German>Ein Kreidestift um Wände zu markieren.</German>
<Japanese>壁に目印を描くためのチョークマーカー。</Japanese>
<Spanish>Tiza para marcar paredes.</Spanish>
</Key>
<Key ID="STR_ACE_Tagging_descSpraypaint">
<English>A can of spray paint for tagging walls.</English>
Expand Down
Loading
Loading