Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into release-3.18.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@LinkIsGrim
LinkIsGrim committed Dec 28, 2024
2 parents ddacfe9 + 590bfcd commit 8565bd6
Show file tree
Hide file tree
Showing 53 changed files with 462 additions and 66 deletions.
2 changes: 2 additions & 0 deletions addons/advanced_throwing/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
<German>Zeige während des werfens Windinformationen an, um Rauchgranaten effektiver zu platzieren.</German>
<Korean>연막탄을 효과적으로 배치하는 데 도움이 되도록 투척하는 동안 일시적으로 바람 정보를 표시합니다.</Korean>
<Japanese>投擲行動中に風向きの情報を一時的に表示し、発煙手榴弾の煙幕を効果的に展開しやすくします。</Japanese>
<Chinesesimp>准备投掷时显示风速风向信息, 来帮助烟雾弹投掷</Chinesesimp>
</Key>
<Key ID="STR_ACE_Advanced_Throwing_EnableTempWindInfo_DisplayName">
<English>Show Temporary Wind Info</English>
Expand All @@ -143,6 +144,7 @@
<German>Zeige temporäre Windinformationen</German>
<Korean>바람 정보 임시로 표시</Korean>
<Japanese>一時的に風の情報を表示</Japanese>
<Chinesesimp>临时显示风场信息</Chinesesimp>
</Key>
<Key ID="STR_ACE_Advanced_Throwing_Enable_Description">
<English>Enables advanced throwing system.</English>
Expand Down
2 changes: 2 additions & 0 deletions addons/ai/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<German>Rüstet NVG nachts aus dem Inventar aus und entfernt es tagsüber.\nFügt keine NVGs zum Inventar hinzu!</German>
<Korean>야간에는 야투경을 소지품에 장착하고 주간에는 장착을 해제합니다.\n주의! 소지품에 야투경을 추가하는 것이 아닙니다!</Korean>
<Japanese>インベントリ内の暗視装置を夜間に装備し、日中は解除し収納します。\nこれはNVGをインベントリに追加しません。</Japanese>
<Chinesesimp>在夜晚自动佩戴夜视仪, 在白天自动摘下来\n不会将夜视仪添加进物品栏中!</Chinesesimp>
</Key>
<Key ID="STR_ACE_AI_AssignNVG_DisplayName">
<English>Auto-Equip NVGs</English>
Expand All @@ -24,6 +25,7 @@
<German>Automatisch NVGs ausrüsten</German>
<Korean>야투경 자동 창착</Korean>
<Japanese>暗視装置の自動装備</Japanese>
<Chinesesimp>自动佩戴夜视仪</Chinesesimp>
</Key>
<Key ID="STR_ACE_AI_DisplayName">
<English>AI</English>
Expand Down
2 changes: 2 additions & 0 deletions addons/aircraft/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<German>Folge-Entfernung</German>
<Korean>따라가는 거리</Korean>
<Japanese>追跡距離</Japanese>
<Chinesesimp>跟随距离</Chinesesimp>
</Key>
<Key ID="STR_ACE_Aircraft_DroneFollowHint">
<English>Following unit within %1m</English>
Expand All @@ -37,6 +38,7 @@
<German>Folgt Einheit bis zu %1m</German>
<Korean>%1m 이내로 유닛을 따라갑니다</Korean>
<Japanese>%1m 間隔で 目標を追跡します</Japanese>
<Chinesesimp>在%1m内跟随单位</Chinesesimp>
</Key>
<Key ID="STR_ACE_Aircraft_GatlingDescriptionAP">
<English>30mm DU Armor Piercing</English>
Expand Down
15 changes: 15 additions & 0 deletions addons/arsenal/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,7 @@
<German>Wechseln Sie zwischen der Anzeige aller Elemente oder Ihrer Favoriten.\nDoppelklicken Sie bei gedrückter Umschalttaste, um ein Element hinzuzufügen oder zu entfernen.</German>
<Korean>모든 아이템을 표시하거나 즐겨찾기를 표시할 때 전환합니다\nShift 키를 누른 상태에서 두 번 클릭하여 아이템을 추가하거나 제거합니다.</Korean>
<Japanese>アイテムをすべて表示するかお気に入りのみを表示するかを切り替えます。\nアイテムをお気に入りに追加または削除するには、Shiftキーを押しながらダブルクリックします。</Japanese>
<Chinesesimp>切换显示所有物品或收藏物品\n按住shift双击左键可将某物品加入或移出收藏</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_buttonHideText">
<English>Hide</English>
Expand Down Expand Up @@ -664,6 +665,7 @@
<German>Suche\nSTRG + Click für Live-Aktualisierung während des Schreibens</German>
<Korean>검색\nCtrl + 클릭으로 실시간 검색 결과를 활성화</Korean>
<Japanese>検索\nCTRL + クリックで検索結果の即時表示を有効化</Japanese>
<Chinesesimp>CTRL+左键启用即时显示搜索结果</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_buttonSharePrivateText">
<English>Private</English>
Expand Down Expand Up @@ -740,6 +742,7 @@
<German>Standardmäßig auf Favoriten eingestellt</German>
<Korean>즐겨찾기 기본값</Korean>
<Japanese>お気に入りを標準に</Japanese>
<Chinesesimp>默认仅显示收藏物品</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_defaultToFavoritesTooltip">
<English>Controls whether the ACE Arsenal defaults to showing all items or favorites.</English>
Expand All @@ -752,6 +755,7 @@
<German>Steuert, ob das ACE Arsenal standardmäßig alle Gegenstände oder nur Favoriten anzeigt.</German>
<Korean>ACE 아스널이 기본적으로 모든 아이템 또는 즐겨찾기를 표시할 지 여부를 조정합니다.</Korean>
<Japanese>ACE 武器庫が標準ですべてのアイテムを表示するか、お気に入りを表示するかを制御します。</Japanese>
<Chinesesimp>切换显示所有物品或仅显示收藏物品</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_enableIdentityTabsSettings">
<English>Enable the faces / voices / insignias tabs</English>
Expand Down Expand Up @@ -843,6 +847,7 @@
<German>Favoritenfarbe</German>
<Korean>즐겨찾기 색상</Korean>
<Japanese>お気に入りの色</Japanese>
<Chinesesimp>收藏物品颜色</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_favoritesColorTooltip">
<English>Highlight color for favorited items.</English>
Expand All @@ -855,6 +860,7 @@
<German>Hervorhebungsfarbe für Lieblingsgegenstände.</German>
<Korean>즐겨찾기한 아이템을 색상으로 강조합니다.</Korean>
<Japanese>お気に入りアイテムのハイライト色。</Japanese>
<Chinesesimp>高亮收藏物品的颜色</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_fontHeightSetting">
<English>Panel font height</English>
Expand Down Expand Up @@ -1059,6 +1065,7 @@
<German>Gesicht Speichern</German>
<Korean>얼굴 저장</Korean>
<Japanese>顔の保存</Japanese>
<Chinesesimp>保存脸模</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_loadoutsSaveInsigniaSetting">
<English>Save Insignia</English>
Expand All @@ -1071,6 +1078,7 @@
<German>Insignia Speichern</German>
<Korean>계급장 저장</Korean>
<Japanese>バッジ(記章)の保存</Japanese>
<Chinesesimp>保存徽章</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_loadoutsSaveVoiceSetting">
<English>Save Voice</English>
Expand All @@ -1083,6 +1091,7 @@
<German>Stimme Speichern</German>
<Korean>목소리 저장</Korean>
<Japanese>声の保存</Japanese>
<Chinesesimp>保存声音</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_modIconsSetting">
<English>Enable mod icons</English>
Expand Down Expand Up @@ -1317,6 +1326,7 @@
<German>Aufsteigend</German>
<Korean>오름차순</Korean>
<Japanese>昇順</Japanese>
<Chinesesimp>升序</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_sortByAccuracyText">
<English>Sort by accuracy</English>
Expand Down Expand Up @@ -1455,6 +1465,7 @@
<German>Absteigend</German>
<Korean>내림차순</Korean>
<Japanese>降順</Japanese>
<Chinesesimp>降序</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_statIlluminators">
<English>Illuminators</English>
Expand All @@ -1466,6 +1477,7 @@
<German>Leuchtmittel</German>
<Korean>조명</Korean>
<Japanese>イルミネーター</Japanese>
<Chinesesimp>照明</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_statMagCount">
<English>Ammo count</English>
Expand All @@ -1478,6 +1490,7 @@
<German>Munitionszahl</German>
<Korean>장탄 수</Korean>
<Japanese>弾薬数</Japanese>
<Chinesesimp>弹药数量</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_statMagnification">
<English>Magnification</English>
Expand Down Expand Up @@ -1599,6 +1612,7 @@
<German>Thermal und in Primärwaffe integriert</German>
<Korean>열화상과 주무기 내장</Korean>
<Japanese>熱画像装置内蔵・プライマリに内蔵</Japanese>
<Chinesesimp>热成像&amp;主镜内置</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_statVisionMode_supPrim">
<English>Primary supported</English>
Expand Down Expand Up @@ -1639,6 +1653,7 @@
<German>Thermal integriert</German>
<Korean>열화상 내장</Korean>
<Japanese>熱画像装置内蔵</Japanese>
<Chinesesimp>内置热成像</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_tabDefaultLoadoutsText">
<English>Default loadouts</English>
Expand Down
7 changes: 7 additions & 0 deletions addons/ballistics/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3453,6 +3453,7 @@
<German>Luft</German>
<Korean>항공</Korean>
<Japanese>航空</Japanese>
<Chinesesimp>对空</Chinesesimp>
</Key>
<Key ID="STR_ACE_Ballistics_ammoUsageShort_armor">
<English>Armor</English>
Expand All @@ -3465,6 +3466,7 @@
<German>Panzerung</German>
<Korean>기갑</Korean>
<Japanese>機甲</Japanese>
<Chinesesimp>对装甲</Chinesesimp>
</Key>
<Key ID="STR_ACE_Ballistics_ammoUsageShort_concealment">
<English>Smoke</English>
Expand All @@ -3477,6 +3479,7 @@
<German>Rauch</German>
<Korean>연막탄</Korean>
<Japanese>発煙弾</Japanese>
<Chinesesimp>烟雾</Chinesesimp>
</Key>
<Key ID="STR_ACE_Ballistics_ammoUsageShort_illumination">
<English>Illum</English>
Expand All @@ -3489,6 +3492,7 @@
<German>Leuchtmittel</German>
<Korean>조명탄</Korean>
<Japanese>照明弾</Japanese>
<Chinesesimp>照明弹</Chinesesimp>
</Key>
<Key ID="STR_ACE_Ballistics_ammoUsageShort_infantry">
<English>Inf</English>
Expand All @@ -3501,6 +3505,7 @@
<German>Infanterie</German>
<Korean>보병</Korean>
<Japanese>歩兵</Japanese>
<Chinesesimp>步兵</Chinesesimp>
</Key>
<Key ID="STR_ACE_Ballistics_ammoUsageShort_lightVehicle">
<English>Veh</English>
Expand All @@ -3513,6 +3518,7 @@
<German>Fahrzeug</German>
<Korean>차량</Korean>
<Japanese>車両</Japanese>
<Chinesesimp>载具</Chinesesimp>
</Key>
<Key ID="STR_ACE_Ballistics_ammoUsage_ai">
<English>AI Usage</English>
Expand All @@ -3525,6 +3531,7 @@
<German>KI Verwendet</German>
<Korean>인공지능 사용</Korean>
<Japanese>AIの使用</Japanese>
<Chinesesimp>AI使用场景</Chinesesimp>
</Key>
<Key ID="STR_ACE_Ballistics_statBallisticCoef">
<English>Ballistic coefficient</English>
Expand Down
2 changes: 2 additions & 0 deletions addons/captives/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<German>Augen verbinden</German>
<Korean>포로 눈 가리기</Korean>
<Japanese>目隠しをする</Japanese>
<Chinesesimp>使用眼罩</Chinesesimp>
</Key>
<Key ID="STR_ACE_Captives_CableTie">
<English>Cable Tie</English>
Expand Down Expand Up @@ -379,6 +380,7 @@
<German>Augenbinde entfernen</German>
<Korean>눈가리개 풀기</Korean>
<Japanese>目隠しを外す</Japanese>
<Chinesesimp>移除眼罩</Chinesesimp>
</Key>
<Key ID="STR_ACE_Captives_SetCaptive">
<English>Take Prisoner</English>
Expand Down
10 changes: 10 additions & 0 deletions addons/cargo/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
<German>%1 wird in %2 geladen...</German>
<Korean>%1을(를) %2에 싣는 중...</Korean>
<Japanese>%1 を %2 に積み込んでいます・・・</Japanese>
<Chinesesimp>正在将%1装入%2</Chinesesimp>
</Key>
<Key ID="STR_ACE_Cargo_ModuleSettings_enable">
<English>Enable Cargo</English>
Expand Down Expand Up @@ -171,6 +172,7 @@
<German>Frachtgröße: %1</German>
<Korean>화물 크기: %1</Korean>
<Japanese>貨物の大きさ: %1</Japanese>
<Chinesesimp>货物大小: %1</Chinesesimp>
</Key>
<Key ID="STR_ACE_Cargo_UnloadedItem">
<English>Unloaded&lt;br/&gt;%1 from&lt;br/&gt;%2</English>
Expand Down Expand Up @@ -213,6 +215,7 @@
<German>Kann nicht entladen werden</German>
<Korean>하역할 수가 없습니다</Korean>
<Japanese>荷降ろし不可能です</Japanese>
<Chinesesimp>无法被卸载</Chinesesimp>
</Key>
<Key ID="STR_ACE_Cargo_UnloadingItem">
<English>Unloading %1 from %2...</English>
Expand All @@ -223,6 +226,7 @@
<German>%1 wird von %2 entladen...</German>
<Korean>%1을(를) %2(으)로부터 내리는 중...</Korean>
<Japanese>%1 を %2 から降ろしています・・・</Japanese>
<Chinesesimp>正在将%1从%2中卸载</Chinesesimp>
</Key>
<Key ID="STR_ACE_Cargo_cargoMenu">
<English>Cargo Menu</English>
Expand Down Expand Up @@ -263,6 +267,7 @@
<German>Steuert, ob Objekte nach dem Entladen getragen oder gezogen werden.</German>
<Korean>화물 아이템을 내린 후 들거나 끌지 여부를 결정합니다.</Korean>
<Japanese>荷降ろし後、貨物を運ぶか引きずるかを制御する。</Japanese>
<Chinesesimp>货物被卸载后被拿起或是被拖拽</Chinesesimp>
</Key>
<Key ID="STR_ACE_Cargo_checkSize">
<English>Check Cargo Size</English>
Expand All @@ -271,6 +276,7 @@
<German>Prüfe Frachtgröße</German>
<Korean>화물 크기 확인</Korean>
<Japanese>貨物の大きさを確認</Japanese>
<Chinesesimp>检查货物尺寸</Chinesesimp>
</Key>
<Key ID="STR_ACE_Cargo_checkSizeInteraction">
<English>Show Check Cargo Size Interaction</English>
Expand All @@ -279,6 +285,7 @@
<Japanese>貨物の大きさを確認のインタラクションを表示</Japanese>
<Korean>화물 크기 확인 상호작용 표시</Korean>
<French>Afficher l'interaction de confirmation de la taille de la cargaison</French>
<Chinesesimp>显示检查货物尺寸选项</Chinesesimp>
</Key>
<Key ID="STR_ACE_Cargo_clearedCustomName">
<English>Custom name has been cleared.</English>
Expand Down Expand Up @@ -328,6 +335,7 @@
<German>Aufstellen</German>
<Korean>배치하기</Korean>
<Japanese>配置する</Japanese>
<Chinesesimp>部署</Chinesesimp>
</Key>
<Key ID="STR_ACE_Cargo_enableDeploy">
<English>Enable deploy</English>
Expand All @@ -338,6 +346,7 @@
<German>Aktiviere Aufbauen</German>
<Korean>배치 활성화</Korean>
<Japanese>配置機能を有効化</Japanese>
<Chinesesimp>启用部署</Chinesesimp>
</Key>
<Key ID="STR_ACE_Cargo_enableDeploy_description">
<English>Controls whether cargo items can be unloaded via the deploy method.</English>
Expand All @@ -348,6 +357,7 @@
<German>Steuert, ob Frachtgegenstände über die Aufbaumethode entladen werden können.</German>
<Korean>배치 방법을 통해 화물 아이템을 내릴 수 있는지 여부를 제어합니다.</Korean>
<Japanese>配置機能を介して貨物アイテムを降ろすことが出来るかどうかを制御します。</Japanese>
<Chinesesimp>是否允许使用部署选项卸载货物</Chinesesimp>
</Key>
<Key ID="STR_ACE_Cargo_labelSpace">
<English>Cargo space left: %1</English>
Expand Down
Loading

0 comments on commit 8565bd6

Please sign in to comment.