Skip to content

Commit

Permalink
Merge branch 'master' into pr/10331
Browse files Browse the repository at this point in the history
  • Loading branch information
PabstMirror committed Sep 23, 2024
2 parents 53553d6 + f9c35ff commit 7ef4e24
Show file tree
Hide file tree
Showing 21 changed files with 173 additions and 138 deletions.
194 changes: 97 additions & 97 deletions addons/ballistics/stringtable.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion addons/common/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@
<Hungarian>Az ACE-súgók hátterének színe.</Hungarian>
<Portuguese>A cor de fundo das hints do ACE.</Portuguese>
<Japanese>ACE によるヒントの背景色を指定します。</Japanese>
<Korean>ACE힌트의 배경색을 정합니다.</Korean>
<Korean>ACE 힌트의 배경색을 정합니다.</Korean>
<Chinese>設定ACE提示的背景顏色.</Chinese>
<Chinesesimp>设定 ACE 提示的背景颜色。</Chinesesimp>
</Key>
Expand Down
5 changes: 5 additions & 0 deletions addons/compat_spe/compat_spe_csw/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,27 @@
<Package name="Compat_SPE_CSW">
<Key ID="STR_ACE_Compat_SPE_CSW_alteringHeight">
<English>Altering Height...</English>
<Korean>높이 변경 중...</Korean>
<Japanese>高さを変更・・・</Japanese>
</Key>
<Key ID="STR_ACE_Compat_SPE_CSW_50Rnd_762x63_Tracer">
<English>.30-06 50Rnd Belt (M2/Tracer)</English>
<Korean>.30-06구경 스프링필드 50발 들이 벨트 (M2 훈련용/예광탄)</Korean>
<Japanese>.30-06 50Rnd Belt (M2/Tracer)</Japanese>
</Key>
<Key ID="STR_ACE_Compat_SPE_CSW_100Rnd_762x63_Tracer">
<English>.30-06 100Rnd Belt (M2/Tracer)</English>
<Korean>.30-06구경 스프링필드 100발 들이 벨트 (M2 훈련용/예광탄)</Korean>
<Japanese>.30-06 100Rnd Belt (M2/Tracer)</Japanese>
</Key>
<Key ID="STR_ACE_Compat_SPE_CSW_50Rnd_792x57_Tracer">
<English>7.92x57 50Rnd Gurttrommel (L.S./Tracer)</English>
<Korean>7.92x57mm 50발 들이 벨트 (L.S. 훈련용/예광탄)</Korean>
<Japanese>7.92x57 50Rnd Gurttrommel (L.S./Tracer)</Japanese>
</Key>
<Key ID="STR_ACE_Compat_SPE_CSW_100Rnd_792x57_Tracer">
<English>7.92x57 100Rnd Belt (L.S./Tracer)</English>
<Korean>7.92x57mm 100발 들이 벨트 (L.S. 훈련용/예광탄)</Korean>
<Japanese>7.92x57 100Rnd Belt (L.S./Tracer)</Japanese>
</Key>
</Package>
Expand Down
4 changes: 2 additions & 2 deletions addons/compat_ws/compat_ws_realisticnames/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -745,15 +745,15 @@
<Key ID="STR_ACE_Compat_WS_RealisticNames_apc_wheeled_02_hmg_Name">
<English>Otokar ARMA (HMG)</English>
<Japanese>オトカ アルマ (HMG)</Japanese>
<Korean>오토카르 아르마 APC (중기관총)</Korean>
<Korean>오토카 아르마 APC (중기관총)</Korean>
<German>Otokar ARMA (HMG)</German>
<Italian>Otokar ARMA (HMG)</Italian>
<French>Otokar ARMA (HMG)</French>
</Key>
<Key ID="STR_ACE_Compat_WS_RealisticNames_apc_wheeled_02_unarmed_Name">
<English>Otokar ARMA (Unarmed)</English>
<Japanese>オトカ アルマ (非武装)</Japanese>
<Korean>오토카르 아르마 APC (비무장)</Korean>
<Korean>오토카 아르마 APC (비무장)</Korean>
<German>Otokar ARMA (Unbewaffnet)</German>
<Italian>Otokar ARMA (Disarmato)</Italian>
<French>Otokar ARMA (non armé)</French>
Expand Down
12 changes: 6 additions & 6 deletions addons/explosives/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
<Portuguese>Ativar Thor III</Portuguese>
<Russian>Активировать Thor III</Russian>
<Japanese>Thor III を使う</Japanese>
<Korean>Thor III 켜기</Korean>
<Korean>토르 III 켜기</Korean>
<Chinesesimp>开启索尔三型</Chinesesimp>
<Chinese>開啟索爾三型</Chinese>
<Turkish>Thor III ü aç</Turkish>
Expand All @@ -238,7 +238,7 @@
<Portuguese>Desativar Thor III</Portuguese>
<Russian>Деактивировать Thor III</Russian>
<Japanese>Thor III を止める</Japanese>
<Korean>Thor III 끄기</Korean>
<Korean>토르 III 끄기</Korean>
<Chinesesimp>关闭索尔三型</Chinesesimp>
<Chinese>關閉索爾三型</Chinese>
<Turkish>Thor III ü kapat</Turkish>
Expand Down Expand Up @@ -847,7 +847,7 @@
<Russian>Требуется ли специалист по минному делу для обезвреживания взрывчатки? По умолчанию: Нет</Russian>
<Italian>Richiedi specialisti esplosivi per disabilitare esplosivi? Predefinito: No</Italian>
<Japanese>爆発物を無効にするために爆発物専門兵の特性を必要としますか? デフォルト: 不要</Japanese>
<Korean>폭발물을 해제하기 위해서는 전문가가 필요합니까? 기본설정: 아니요</Korean>
<Korean>폭발물을 해체하기 위해서는 전문가가 필요합니까? 기본설정: 아니요</Korean>
<Chinesesimp>需要爆破专业兵才能拆除爆炸物? 预设:否</Chinesesimp>
<Chinese>需要炸彈專家才能拆除炸彈? 預設: 否</Chinese>
<Turkish>Patlayıcı uzmanlarının patlayıcıları etkisiz hale getirmesini ister misiniz? Varsayılan: Hayır</Turkish>
Expand Down Expand Up @@ -880,7 +880,7 @@
<Russian>Увеличивать время завершения действий для не-специалистов? По умолчанию: Нет</Russian>
<Italian>Aumenta il tempo richiesto per completare azioni per non-specialisti? Predefinito: Si</Italian>
<Japanese>専門兵以外がアクション完了するのに必要な時間を増加しますか? デフォルト: 有効</Japanese>
<Korean>비전문가가 폭발물을 해제 시 더욱 많은 시간을 소요합니까? 기본설정: 예</Korean>
<Korean>비전문가가 폭발물을 해체 시 더욱 많은 시간을 소요합니까? 기본설정: 예</Korean>
<Chinesesimp>增加非专业人员相关操作的时间? 预设:是</Chinesesimp>
<Chinese>增加非專業人員相關操作的時間? 預設: 是</Chinese>
</Key>
Expand All @@ -896,7 +896,7 @@
<Russian>Взрыв при разминировании?</Russian>
<Italian>Detona se disarmati?</Italian>
<Japanese>解除中に爆発するか?</Japanese>
<Korean>해제 시 폭발합니까?</Korean>
<Korean>해체 시 폭발합니까?</Korean>
<Chinesesimp>拆除时引爆?</Chinesesimp>
<Chinese>拆除時引爆?</Chinese>
</Key>
Expand All @@ -912,7 +912,7 @@
<Russian>Разрешить определенным взрывным устройствам взрываться при разминировании? По умолчанию: Да</Russian>
<Italian>Permettere ad alcuni esplosivi di esplodere quando si tenta il disinnesco? Predefinito: Si</Italian>
<Japanese>特定の爆発物を解除中に爆発可能にしますか? デフォルト: 有効</Japanese>
<Korean>특정 폭발물이 해제 시 폭발하게 합니까? 기본설정: 예</Korean>
<Korean>특정 폭발물이 해체 시 폭발하게 합니까? 기본설정: 예</Korean>
<Chinesesimp>启用后,某些爆炸物会在拆除时引爆? 预设:是</Chinesesimp>
<Chinese>啟用後, 某些炸彈會在拆除時引爆? 預設: 是</Chinese>
</Key>
Expand Down
6 changes: 3 additions & 3 deletions addons/fastroping/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<Portuguese>Equipa o helicóptero selecionado com um Sistema de Inserção/Extração Rápida por Corda</Portuguese>
<Russian>Снаряжает выбранный вертолет оборудованием для спуска десанта по канатам</Russian>
<Japanese>選択されたヘリコプターで Fast Rope Insertion Extraction System を使えるようにします。</Japanese>
<Korean>선택된 헬리콥터에 패스트로프 투입 및 탈출 시스템을 장착합니다.</Korean>
<Korean>선택된 헬리콥터에 패스트로프 투입 및 탈출 시스템(FRIES)을 장착합니다.</Korean>
<Chinesesimp>使指定的直升机启用快速绳降及撤离系统</Chinesesimp>
<Chinese>使指定的直升機啟用快速繩降及撤離系統</Chinese>
</Key>
Expand Down Expand Up @@ -322,7 +322,7 @@
<Japanese>FRIESの自動装備</Japanese>
<German>FRIES automatisch ausrüsten</German>
<Italian>Auto-Aggiungi FRIES</Italian>
<Korean>FRIES 로프 자동 장착</Korean>
<Korean>패스트로프 자동 장착</Korean>
<French>Equipement automatique FRIES</French>
<Portuguese>Auto-equipar FRIES</Portuguese>
<Russian>Авто-подготовка канатов</Russian>
Expand All @@ -334,7 +334,7 @@
<Japanese>FRIESをサポートするヘリコプターに自動的にFRIESを追加します。</Japanese>
<German>FRIES automatisch Helikoptern hinzufügen, die es unterstützen</German>
<Italian>Aggiunge il sistema FRIES in automatico su elicotteri compatibili.</Italian>
<Korean>로프를 지원하는 헬기에 자동으로 FRIES 로프를 추가합니다.</Korean>
<Korean>로프를 지원하는 헬기에 자동으로 패스트로프를 추가합니다.</Korean>
<French>Ajoute automatiquement des FRIES aux hélicoptères qui les supportent.</French>
<Portuguese>Adiciona automaticamente FRIES a helicópteros que os suportam.</Portuguese>
<Russian>Автоматически добавляйте канаты в вертолеты, которые их поддерживают.</Russian>
Expand Down
2 changes: 1 addition & 1 deletion addons/field_rations/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@
<Hungarian>A vízzel töltött kantin</Hungarian>
<Italian>Una borraccia riempita per metà di acqua</Italian>
<Japanese>半分入っている水筒</Japanese>
<Korean>반이 차 있는 수통입니다</Korean>
<Korean>물이 반 정도 차 있는 수통입니다</Korean>
<Polish>Manierka w połowie wypełniona wodą</Polish>
<Portuguese>Uma meia cantina cheia de água</Portuguese>
<Russian>Наполовину заполненая водой фляга</Russian>
Expand Down
21 changes: 15 additions & 6 deletions addons/frag/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<Hungarian>Repesz-szimuláció</Hungarian>
<Russian>Симуляция осколков</Russian>
<Italian>Simulazione Frammentazione</Italian>
<Japanese>フラグメンテーション シミュレーション</Japanese>
<Korean>파편화 시뮬레이션</Korean>
<Japanese>破片シミュレーション</Japanese>
<Korean>파열 시뮬레이션</Korean>
<Chinesesimp>破片模拟</Chinesesimp>
<Chinese>模擬碎片</Chinese>
</Key>
Expand All @@ -29,7 +29,7 @@
<Russian>Симуляция осколков</Russian>
<Italian>Simulazione Frammentazione</Italian>
<Japanese>フラグメンテーション シミュレーション</Japanese>
<Korean>파편화 시뮬레이션</Korean>
<Korean>파열 시뮬레이션</Korean>
<Chinesesimp>破片模拟</Chinesesimp>
<Chinese>模擬碎片</Chinese>
</Key>
Expand All @@ -45,7 +45,7 @@
<Russian>Включить симуляцию осколков ACE</Russian>
<Italian>Abilita la Simulazione Frammentazione di ACE</Italian>
<Japanese>ACE フラグメンテーション シミュレーションを有効化</Japanese>
<Korean>ACE 파편화 시뮬레이션을 적용합니다.</Korean>
<Korean>ACE 파열 시뮬레이션을 적용합니다.</Korean>
<Chinesesimp>启用 ACE 破片模拟</Chinesesimp>
<Chinese>啟用ACE模擬碎片</Chinese>
</Key>
Expand All @@ -61,7 +61,7 @@
<Russian>Симуляция обломков</Russian>
<Italian>Simulazione Spalling</Italian>
<Japanese>スポーリング シミュレーション</Japanese>
<Korean>탄환파편 시뮬레이션</Korean>
<Korean>파편 시뮬레이션</Korean>
<Chinesesimp>模拟剥落</Chinesesimp>
<Chinese>模擬剝落</Chinese>
</Key>
Expand All @@ -77,7 +77,7 @@
<Russian>Включить симуляцию обломков ACE</Russian>
<Italian>Abilita la Simulazione Spalling di ACE</Italian>
<Japanese>ACE スポーリング シミュレーションを有効化</Japanese>
<Korean>ACE 탄환파편 시뮬레이션을 적용합니다.</Korean>
<Korean>ACE 파편 시뮬레이션을 적용합니다.</Korean>
<Chinesesimp>启用 ACE 模拟剥落</Chinesesimp>
<Chinese>啟用ACE模擬剝落</Chinese>
</Key>
Expand Down Expand Up @@ -113,42 +113,51 @@
</Key>
<Key ID="STR_ACE_Frag_Debug">
<English>Debug</English>
<Korean>디버그</Korean>
<Japanese>デバッグ</Japanese>
</Key>
<Key ID="STR_ACE_Frag_SpallIntensity">
<English>Spalling Intensity</English>
<Korean>파편 강도</Korean>
<Japanese>スポーリング強度</Japanese>
</Key>
<Key ID="STR_ACE_Frag_SpallIntensity_Desc">
<English>Modifier to increase or decrease the number and intensity of spalling events. Increasing this value may cause performance degradation.</English>
<Korean>파편 이벤트 수와 강도를 늘리거나 줄입니다. 이 값을 늘리면 성능이 저하될 수 있습니다.</Korean>
<Japanese>スポーリング現象が発生する数と強度を増減することが出来ます。この値を大きくすることはパフォーマンスの低下につながる可能性があります。</Japanese>
</Key>
<Key ID="STR_ACE_Frag_EnableDebugTrace">
<English>Frag/Spall Debug Tracing</English>
<German>Splitter-/Explosions-Debug-Verfolgung</German>
<Japanese>フラグとスポールの追跡デバッグ</Japanese>
<Korean>파열/파편 디버그 추적</Korean>
</Key>
<Key ID="STR_ACE_Frag_EnableDebugTrace_Desc">
<English>Enables visual tracing of fragmentation and spalling rounds.</English>
<German>Splitter-/Explosions-Debugging</German>
<Korean>파열과 파편의 시각적 추적을 활성화합니다.</Korean>
<Japanese>フラグメンテーションとスポーリングによって発生した破片飛翔体の動きを視覚的に追跡できる機能を有効化します。</Japanese>
</Key>
<Key ID="STR_ACE_Frag_HitSphereEnable">
<English>Draw Event Spheres</English>
<Korean>이벤트 구체 그리기</Korean>
<Japanese>イベントを球体として描画</Japanese>
</Key>
<Key ID="STR_ACE_Frag_HitSphereEnable_Desc">
<English>Draw color coded spheres at any event for tracked rounds.</English>
<Korean>모든 ㅇ이벤트에서 추적된 파편을 위한 색상으로 구분하는 구체를 그립니다.</Korean>
<Japanese>追跡中の飛翔体に発生した全てのイベントを色付けた球体として描画します。</Japanese>
</Key>
<Key ID="STR_ACE_Frag_DrawHitBox">
<English>Draw Hitboxes</English>
<Korean>히트박스 그리기</Korean>
<Japanese>ヒットボックスを描画</Japanese>
</Key>
<Key ID="STR_ACE_Frag_DrawHitBox_Desc">
<English>Draw hitboxes on objects that were targeted.</English>
<German>Splitter-/Explosions-Debugging</German>
<Japanese>被弾した物体のヒットボックスを描画します。</Japanese>
<Korean>타겟팅된 오브젝트에 히트박스를 그립니다.</Korean>
</Key>
</Package>
</Project>
4 changes: 2 additions & 2 deletions addons/headless/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<Key ID="STR_ACE_Headless_EndMissionDesc">
<English>End mission when there are no players connected (same as 'persistent = 0' in server configuration but with Headless Client support).</English>
<German>Beende die Mission, wenn keine Spieler mehr verbunden sind (das gleiche wie 'persitent = 0' in den Serverkonfigurationen aber mit Headless Client Unterstützung).</German>
<Korean>연결된 플레이어가 없을 때 임무 종료. (서버 구성에서는 'persistent = 0'과 같지만 Headless Client는 지원함)</Korean>
<Korean>연결된 플레이어가 없으면 미션을 종료합니다(서버 설정의 'persistent = 0'과 같지만 헤드리스 클라이언트는 지원합니다).</Korean>
<Japanese>プレイヤーが接続していない場合はミッション終了します。(サーバ設定の'presistent =0'と同じですが、ヘッドレスクライアントをサポートします)</Japanese>
<French>Termine la mission lorsqu'il n'y a plus de joueur connecté (idem que 'persistent = 0' dans la config serveur mais avec la gestion du Headless Client).</French>
<Chinesesimp>当服务器里没有任何玩家还连线时自动结束任务(效果同于伺服器设定的'persistent = 0',但支援 Headless 客户端)。</Chinesesimp>
Expand Down Expand Up @@ -145,7 +145,7 @@
<English>Log transfer statistics and Headless Client (dis)connections to RPT. (Default: No)</English>
<German>Zeichnet Transferstatistiken, Verbindungen und Verbindungsabbrüche in einer RPT-Datei auf. (Standard: Nein)</German>
<Polish>Zapisz statystyki transferu i status połączenia Headless Clienta do RPT. (Domyślnie: Tak)</Polish>
<Korean>전송 통계 및 헤드리스 클라이언트 연결(해제)를 RPT파일에 로그함. (기본값: No)</Korean>
<Korean>전송 통계 및 헤드리스 클라이언트 연결(해제)를 RPT파일에 기록합니다. (기본값: No)</Korean>
<Japanese>統計とヘッドレスクライアントの接続有無を PRT へ記録します。 (デフォルト: 無効)</Japanese>
<French>Archive les statistiques de transfert et de (dé)connections du Headless Client dans le RPT. (Défaut: Non)</French>
<Chinesesimp>记录 Headless 客户端间的转换数量与连线/断线等记录到 RPT 报告档中。(预设:关闭)</Chinesesimp>
Expand Down
Loading

0 comments on commit 7ef4e24

Please sign in to comment.