Merge branch 'master' into pr/10659

acemod · Jan 14, 2025 · 9c29b87 · 9c29b87
2 parents 7e78956 + ba50f7a
commit 9c29b87
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 1 deletion.
diff --git a/addons/arsenal/stringtable.xml b/addons/arsenal/stringtable.xml
@@ -1097,6 +1097,7 @@
             <English>Missing items:\n%1</English>
             <Korean>누락 아이템:\n%1</Korean>
             <Japanese>存在しないアイテム:\n%1</Japanese>
+            <Chinesesimp>缺失物品:\n%1</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_Arsenal_modIconsSetting">
             <English>Enable mod icons</English>
@@ -1776,16 +1777,19 @@
             <English>Unavailable items:\n%1</English>
             <Korean>사용 불가 아이템:\n%1</Korean>
             <Japanese>利用できないアイテム:\n%1</Japanese>
+            <Chinesesimp>不可用物品:\n%1</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_Arsenal_unavailableItemsSetting">
             <English>Show missing / unavailable items</English>
             <Korean>누락/사용 불가 아이템 표시</Korean>
             <Japanese>存在しない/利用できないアイテムを表示</Japanese>
+            <Chinesesimp>显示缺失/不可用物品</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_Arsenal_unavailableItemsTooltip">
             <English>Show missing / unavailable items when hovering over a loadout</English>
             <Korean>로드아웃 위에 마우스 커서를 올리면 누락되거나 사용할 수 없는 아이템을 표시합니다.</Korean>
             <Japanese>装備にカーソルを重ねた時に存在しない/利用できないアイテムを表示します</Japanese>
+            <Chinesesimp>鼠标悬停在负载上时显示缺失/不可用物品</Chinesesimp>
         </Key>
     </Package>
 </Project>
diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml
@@ -412,6 +412,8 @@
         <Key ID="STR_ACE_Common_checkExtensions_DisplayName">
             <English>Check Extensions</English>
             <Japanese>拡張(DLL)を検査</Japanese>
+            <Chinesesimp>检查DLL扩展文件</Chinesesimp>
+            <Korean>확장 프로그램 검사</Korean>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBO_Whitelist_Description">
             <English>What addons are allowed regardless?</English>
@@ -456,7 +458,7 @@
             <Portuguese>Ação de Checar PBO</Portuguese>
             <Russian>Действие при проверке PBO</Russian>
             <German>PBO Überprüfung</German>
-            <Korean>PBO 검사</Korean>
+            <Korean>PBO 검사 행동</Korean>
             <Japanese>PBO検査の挙動</Japanese>
             <Chinese>檢查PBO動作</Chinese>
             <Chinesesimp>检查 PBO 动作</Chinesesimp>

diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml
@@ -10,6 +10,7 @@
             <German>Standardzünder</German>
             <Korean>격발기 활성</Korean>
             <Japanese>選択中の点火装置</Japanese>
+            <Chinesesimp>当前引爆装置</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_Explosives_AttachAction">
             <English>Attach</English>
@@ -104,6 +105,7 @@
             <German>Standardzünder wechseln</German>
             <Korean>격발기 활성 전환</Korean>
             <Japanese>点火装置を切り替え</Japanese>
+            <Chinesesimp>切换引爆装置</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_Explosives_DeadManSwitch_description">
             <English>Used to remotely trigger explosives when released.</English>
@@ -248,6 +250,7 @@
             <German>Alle auf Standardzünder zünden</German>
             <Korean>활성화된 격발기의 모든 것을 폭파</Korean>
             <Japanese>選択した点火装置を全て起爆</Japanese>
+            <Chinesesimp>引爆当前引爆装置的全部</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_Explosives_DetonateCode">
             <English>Explosive code: %1</English>
@@ -914,6 +917,7 @@
             <German>Als Standardzünder wählen</German>
             <Korean>격발기 활성 설정</Korean>
             <Japanese>この点火装置を選択</Japanese>
+            <Chinesesimp>设置为当前引爆装置</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_Explosives_SetTime">
             <English>Set Time</English>
@@ -1094,6 +1098,8 @@
         <Key ID="STR_ACE_Explosives_apersToePopper">
             <English>APERS Mine (Toe-Popper)</English>
             <Japanese>対人地雷 (トウポッパー)</Japanese>
+            <Chinesesimp>反人员地雷 (脚尖毁灭者)</Chinesesimp>
+            <Korean>대인지뢰 (발목지뢰형)</Korean>
         </Key>
         <Key ID="STR_ACE_Explosives_cellphone_description">
             <English>Used to remotely trigger explosives</English>

diff --git a/addons/markinglaser/stringtable.xml b/addons/markinglaser/stringtable.xml
@@ -5,36 +5,50 @@
             <English>IR marking laser</English>
             <German>IR Markierungslaser</German>
             <Japanese>IR マーキング レーザー</Japanese>
+            <Chinesesimp>红外标记激光</Chinesesimp>
+            <Korean>적외선 마크 레이저</Korean>
         </Key>
         <Key ID="STR_ACE_Markinglaser_Flashing">
             <English>Blinking</English>
             <German>Blinken</German>
             <Japanese>点滅</Japanese>
+            <Chinesesimp>闪烁</Chinesesimp>
+            <Korean>깜빡이기</Korean>
         </Key>
         <Key ID="STR_ACE_Markinglaser_ToggleLaser">
             <English>Toggle IR marking laser</English>
             <German>IR Markierungslaser umschalten</German>
             <Japanese>IR マーキング レーザーを切り替え</Japanese>
+            <Chinesesimp>切换红外标记激光</Chinesesimp>
+            <Korean>적외선 마크 레이저 전환</Korean>
         </Key>
         <Key ID="STR_ACE_Markinglaser_Attribute_Enabled_DisplayName">
             <English>Equip with IR marking laser</English>
             <German>Mit IR Markierungslaser ausstatten</German>
             <Japanese>IR マーキング レーザーを装備</Japanese>
+            <Chinesesimp>装备红外标记激光</Chinesesimp>
+            <Korean>적외선 마크 레이저 장착</Korean>
         </Key>
         <Key ID="STR_ACE_Markinglaser_Attribute_Enabled_Tooltip">
             <English>Equips the aircraft's main turret or pilot camera with an IR marking laser.</English>
             <German>Rüstet das Hauptgeschütz oder die Pilotenkamera des Luftfahrzeugs mit einem IR Markierungslaser aus.</German>
             <Japanese>航空機のメイン タレットまたはパイロット カメラに IR マーキング レーザーを装備させます。</Japanese>
+            <Chinesesimp>为飞行器的主炮塔或飞行员摄像头装备红外标记激光</Chinesesimp>
+            <Korean>항공기의 주포탑이나 조종사 카메라에 적외선 마크 레이저를 장착합니다.</Korean>
         </Key>
         <Key ID="STR_ACE_Markinglaser_Setting_Enabled_DisplayName">
             <English>Enable IR marking lasers for aircraft</English>
             <German>IR Markierungslaser für Luftfahrzeuge aktivieren</German>
             <Japanese>航空機用 IR マーキング レーザーを有効化</Japanese>
+            <Chinesesimp>启用飞行器的红外标记激光</Chinesesimp>
+            <Korean>항공기에 적외선 마크 레이저 활성화</Korean>
         </Key>
         <Key ID="STR_ACE_Markinglaser_Setting_Enabled_Description">
             <English>Enables the usage of IR marking lasers for aircraft.</English>
             <German>Ermöglicht die Nutzung von IR Markierungslasern für Luftfahrzeuge.</German>
             <Japanese>航空機用 IR マーキング レーザーの使用を有効化します。</Japanese>
+            <Chinesesimp>允许使用飞行器的红外标记激光</Chinesesimp>
+            <Korean>항공기에 적외선 마크 레이저 사용을 활성화합니다.</Korean>
         </Key>
     </Package>
 </Project>
diff --git a/addons/medical_gui/stringtable.xml b/addons/medical_gui/stringtable.xml
@@ -1594,6 +1594,8 @@
         <Key ID="STR_ACE_Medical_GUI_needToHolster">
             <English>You must holster your weapon first!</English>
             <Japanese>先に武器をしまう必要があります!</Japanese>
+            <Chinesesimp>你必须先收起武器!</Chinesesimp>
+            <Polish>무기를 먼저 집어넣어야 합니다!</Polish>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_showBleeding_Description">
             <English>Display if the patient is bleeding, optionally with rate</English>

diff --git a/addons/missile_clgp/stringtable.xml b/addons/missile_clgp/stringtable.xml
@@ -3,14 +3,20 @@
     <Package name="MISSILE_CLGP">
         <Key ID="STR_ACE_MISSILE_CLGP_pike_magazine_descriptionShort">
             <English>Semi-Active Laser Guided 40mm Grenade</English>
+            <Korean>반능동 레이저 유도 40mm 유탄</Korean>
+            <Chinesesimp>半主动激光制导40mm榴弹</Chinesesimp>
             <Japanese>セミアクティブレーザー誘導40mmグレネード</Japanese>
         </Key>
         <Key ID="STR_ACE_MISSILE_CLGP_pike_magazine_displayName">
             <English>40mm Pike</English>
+            <Korean>40mm 파이크</Korean>
+            <Chinesesimp>40mm Pike</Chinesesimp>
             <Japanese>40mm パイク</Japanese>
         </Key>
         <Key ID="STR_ACE_MISSILE_CLGP_pike_magazine_displayNameShort">
             <English>Pike SALH</English>
+            <Korean>파이크 반능동 레이저 유도 유탄</Korean>
+            <Chinesesimp>Pike SALH</Chinesesimp>
             <Japanese>パイク SALH</Japanese>
         </Key>
     </Package>

diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml
@@ -191,6 +191,8 @@
         <Key ID="STR_ACE_RealisticNames_APERSMine_ToePopper_Name">
             <English>VS-50 Anti-Personnel Mine (Toe-Popper)</English>
             <Japanese>VS-50 対人地雷 (トウポッパー)</Japanese>
+            <Chinesesimp>VS-50 反人员地雷 (脚尖毁灭者)</Chinesesimp>
+            <Korean>VS-50 대인지뢰 (발목지뢰형)</Korean>
         </Key>
         <Key ID="STR_ACE_RealisticNames_APERSTripwireMine_Name">
             <English>PMR-3 Anti-Personnel Tripwire Mine</English>
@@ -5030,6 +5032,7 @@
             <German>EOTech MRDS</German>
             <Korean>이오텍 MRDS</Korean>
             <Japanese>EOTech MRDS</Japanese>
+            <Chinesesimp>EOTech MRDS</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_RealisticNames_optic_mrd_black_Name">
             <English>EOTech MRDS (Black)</English>
@@ -5053,6 +5056,7 @@
             <German>CZ 581</German>
             <Korean>CZ 581</Korean>
             <Japanese>CZ 581</Japanese>
+            <Chinesesimp>CZ 581</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_RealisticNames_sgun_huntershotgun_sawedoff_01_Name">
             <English>CZ 581 (Sawed-Off)</English>