Merge remote-tracking branch 'upstream/dev-Tomcat' into Medication_Re…

…work
KAT-Advanced-Medical · Oct 27, 2024 · b1aa8af · b1aa8af
2 parents a22b5c2 + 4bc4bcb
commit b1aa8af
Show file tree

Hide file tree

Showing 52 changed files with 912 additions and 167 deletions.
diff --git a/addons/airway/stringtable.xml b/addons/airway/stringtable.xml
@@ -191,6 +191,7 @@
             <Norwegian>%1 sjekket luftveiene: %2, %3</Norwegian>
             <Finnish>%1 tarkistettu hengitystiet, %2, %3</Finnish>
             <Russian>%1 проверенные дыхательные пути: %2, %3</Russian>
+            <Chinesesimp>%1 检查呼吸道: %2, %3</Chinesesimp>
             <Dutch>%1 Heeft de luchtwegen gecheckt: %2, %3</Dutch>
         </Key>
         <Key ID="STR_KAT_Airway_airway_log">
@@ -319,6 +320,7 @@
             <Norwegian>Obstruksjon er midlertidig redusert</Norwegian>
             <Finnish>Tukos on väliaikaisesti lievennetty</Finnish>
             <Russian>Препятствие временно устранено</Russian>
+            <Chinesesimp>阻塞暂时减轻</Chinesesimp>
             <Dutch>Blokkade is tijdelijk verzacht</Dutch>
         </Key>
         <Key ID="STR_KAT_Airway_AirwayStatus_noObstruction">
@@ -330,6 +332,7 @@
             <Finnish>Ilmatiet eivät ole tukossa</Finnish>
             <Russian>Дыхательные пути не закупорены языком.</Russian>
             <German>Die Atemwege sind nicht blockiert.</German>
+            <Chinesesimp>气道未被阻塞</Chinesesimp>
             <Portuguese>Vias aéreas não obstruídas</Portuguese>
             <Dutch>Luchtweg is niet geblokkeerd</Dutch>
         </Key>
@@ -342,6 +345,7 @@
             <Finnish>Ilmatiet eivät ole likaisia</Finnish>
             <Russian>Дыхательные пути не закупорены рвотой.</Russian>
             <German>Die Atemwege sind nicht verstopft.</German>
+            <Chinesesimp>气道未闭塞</Chinesesimp>
             <Portuguese>Vias aéreas não ocluídas</Portuguese>
             <Dutch>Luchtweg is niet verstopt</Dutch>
         </Key>
@@ -354,6 +358,7 @@
             <Finnish>Hengitystiet ovat tukossa, hengityshoitoa tarvitaan</Finnish>
             <German>Atemwege sind blockiert, die Atemwege müssen freigelegt werden</German>
             <Russian>Дыхательные пути закупорены языком, требуется лечение дыхательных путей</Russian>
+            <Chinesesimp>气道阻塞，需要气道管理</Chinesesimp>
             <Portuguese>Vias aéreas obstruídas, gerenciamento de vias aéreas necessário</Portuguese>
             <Dutch>Luchtweg is geblokkeerd, luchtwegmanagement is vereist</Dutch>
         </Key>
@@ -366,6 +371,7 @@
             <Finnish>Hengitystiet ovat likaiset, tarvitaan lääkärin imu</Finnish>
             <Russian>Дыхательные пути закупорены рвотой, требуется медицинское отсасывание</Russian>
             <German>Die Atemwege sind verstopft. Medizinische Absaugung benötigt.</German>
+            <Chinesesimp>气道堵塞，需要吸痰</Chinesesimp>
             <Portuguese>Vias aéreas ocluídas, sucção médica necessária</Portuguese>
             <Dutch>Luchtweg is verstopt, medische suctie is vereist</Dutch>
         </Key>
@@ -454,6 +460,7 @@
             <Finnish>Potilaan pää on jo yli ojentunut</Finnish>
             <German>Kopf des Patienten ist bereits überstreckt</German>
             <Russian>Голова пациента уже наклонена.</Russian>
+            <Chinesesimp>病人的头部已经过度伸展</Chinesesimp>
             <Portuguese>A cabeça do paciente já está hiperestendida</Portuguese>
             <Dutch>Patiënts hoofd is al overstrekt</Dutch>
         </Key>
@@ -504,6 +511,7 @@
             <Finnish>Pään ylivenyttely onnistui</Finnish>
             <German>Kopf erfolgreich überstreckt</German>
             <Russian>Гиперэкстензия головы завершена</Russian>
+            <Chinesesimp>头部拉伸成功</Chinesesimp>
             <Portuguese>Cabeça hiperestendida com sucesso</Portuguese>
             <Dutch>Hoofd succesvol overstrekt</Dutch>
         </Key>
@@ -579,6 +587,7 @@
             <Spanish>Giro de cabeza cancelado</Spanish>
             <Finnish>pään kääntäminen peruttu</Finnish>
             <Russian>Поворот головы отменен</Russian>
+            <Chinesesimp>异物清除停止了</Chinesesimp>
             <Dutch>Hoofddraaiing gestopt</Dutch>
         </Key>
         <Key ID="STR_KAT_Airway_headTurning_start">
@@ -590,6 +599,7 @@
             <Finnish>pään kääntyminen alkoi</Finnish>
             <Russian>Начался поворот головы</Russian>
             <German>Kopfdrehung begonnen</German>
+            <Chinesesimp>开始清除异物</Chinesesimp>
             <Portuguese>Rotação de cabeça iniciada</Portuguese>
             <Dutch>Hoofddraaiing gestart</Dutch>
         </Key>
@@ -604,6 +614,7 @@
             <Spanish>Parar giro de cabeza</Spanish>
             <Finnish>Lopeta potilaan pään kääntäminen</Finnish>
             <Russian>Перестаньте поворачивать голову</Russian>
+            <Chinesesimp>停止清除异物</Chinesesimp>
             <Dutch>Stop de hoofddraaiing</Dutch>
         </Key>
         <Key ID="STR_KAT_Airway_Accuvac_NA">
@@ -786,6 +797,7 @@
             <Finnish>Ilmateiden imu</Finnish>
             <Russian>Всасывание из дыхательных путей</Russian>
             <German>Absaugung der Atemwege</German>
+            <Chinesesimp>呼吸道抽吸</Chinesesimp>
             <French>Aspiration des voies respiratoires</French>
             <Portuguese>Sucção de vias aéreas</Portuguese>
             <Dutch>Luchtweg suctie</Dutch>

diff --git a/addons/breathing/XEH_preInit.sqf b/addons/breathing/XEH_preInit.sqf
@@ -118,6 +118,15 @@ PREP_RECOMPILE_END;
     true
 ] call CBA_Settings_fnc_init;
 
+[
+    QGVAR(paco2Active),
+    "CHECKBOX",
+    [LLSTRING(SETTING_PACO2_ENABLE), LLSTRING(SETTING_PACO2_ENABLE_DESC)],
+    [CBA_SETTINGS_CAT, ELSTRING(GUI,SubCategory_Basic)],
+    [false],
+    true
+] call CBA_Settings_fnc_init;
+
 //Settable list for using Pulseoximeter per medical class
 [
     QGVAR(medLvl_Pulseoximeter),

diff --git a/addons/breathing/stringtable.xml b/addons/breathing/stringtable.xml
@@ -138,6 +138,14 @@
             <Russian>Инфузионный множитель</Russian>
             <Dutch>Perfusie vermenigvuldiger</Dutch>
         </Key>
+        <Key ID="STR_KAT_Breathing_SETTING_PACO2_ENABLE">
+            <English>Enable PaCO2</English>
+            <Japanese>PaCO2を有効化</Japanese>
+        </Key>
+        <Key ID="STR_KAT_Breathing_SETTING_PACO2_ENABLE_DESC">
+            <English>Enables PaCO2 movement and effects on ph and breathing rate</English>
+            <Japanese>phや呼吸速度へ影響を与えるPaCO2(動脈血二酸化炭素分圧)の変動を有効にします</Japanese>
+        </Key>
         <Key ID="STR_KAT_Breathing_SETTING_pneumothorax">
             <English>Probability for a pneumothorax</English>
             <German>Wahrscheinlichkeit für einen Pneumothorax</German>
@@ -760,7 +768,7 @@
             <English>Enables advanced pneumothoraxes - hemopneumothorax and tensionpneumothorax</English>
             <Spanish>Habitilita neumotóraxes avanzados - hemotórax y neumotórax a tensión</Spanish>
             <Polish>Włącza zaawansowane odmiany odmy opłucnowej - krwiaka opłucnej oraz odmę prężną</Polish>
-            <Japanese>血気胸および緊張性気胸を有効化します</Japanese>
+            <Japanese>高度な気胸である血気胸および緊張性気胸の症状を有効にします</Japanese>
             <Czech>Povolí pokročilé pneumotoraxy - hemopneumotorax a tenzní pneumotorax.</Czech>
             <French>Active les pneumothorax avancés - Hémopneumothorax et pneumothorax sous tension</French>
             <Korean>고급 기흉을 활성화합니다. - 혈기흉 및 긴장성 기흉</Korean>
@@ -1459,7 +1467,7 @@
             <English>Enable Pneumothorax Arrest</English>
             <Russian>Включить остановку сердца</Russian>
             <Spanish>Habilitar Parada por Pneumothorax</Spanish>
-            <Japanese>気胸による心停止を有効にする</Japanese>
+            <Japanese>気胸による心停止を有効化</Japanese>
             <French>Activer l'arrêt dû au pneumothorax</French>
             <Portuguese>Habilitar Parada por Pneumotórax</Portuguese>
             <Dutch>Sta pneumothorax hartstilstand toe</Dutch>
@@ -1468,7 +1476,7 @@
             <English>Enables a chance for cardiac arrest following pneumothorax</English>
             <Russian>Увеличивает вероятность остановки сердца после Пневмоторакса</Russian>
             <Spanish>Habilitar la probabilidad para parada cardíaca tras un pneumothorax</Spanish>
-            <Japanese>気胸発生に付随して心停止となる可能性を有効化します</Japanese>
+            <Japanese>気胸発生に付随して心停止となる可能性を有効にします</Japanese>
             <French>Active la chance qu'un arrêt cardiaque se produise en cas de pneumothorax</French>
             <Portuguese>Habilita uma chance de parada cardíaca após o pneumotórax</Portuguese>
             <Dutch>Staat de kans op een hartstilstand na een pneumothorax toe</Dutch>
@@ -1556,7 +1564,7 @@
             <Spanish>Habilita perdida de resistencia por Sp02 bajo</Spanish>
             <German>Aktiviere Verlust von Ausdauer bei niedrigen SpO2 Wert</German>
             <French>Autoriser la perte d'endurance en cas de SpO2 basse</French>
-            <Japanese>低SpO2でのスタミナ損失を有効にする</Japanese>
+            <Japanese>低SpO2でのスタミナ損失を有効化</Japanese>
             <Korean>낮은 산소포화도에서 스태미나 손실 활성화</Korean>
             <Italian>Abilita la perdità di stamina con bassa pressione SPO2</Italian>
             <Portuguese>Ativar perda de stamina sob baixo SpO2</Portuguese>

diff --git a/addons/circulation/stringtable.xml b/addons/circulation/stringtable.xml
@@ -37,7 +37,7 @@
             <Italian>Ritmo avanzato attivato?</Italian>
             <Spanish>¿Ritmo avanzado activado?</Spanish>
             <Czech>Pokročilý Rytmus aktivován?</Czech>
-            <Japanese>高度な心調律 を有効化しますか?</Japanese>
+            <Japanese>高度な心調律を有効化しますか?</Japanese>
             <Russian>Продвинутый ритм активирован?</Russian>
             <Portuguese>Ritmo avançado ativado?</Portuguese>
             <Finnish>Edistyneet sykerytmit aktivoitu?</Finnish>
@@ -927,6 +927,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_AnalyzeRhythm">
             <English>Analyze Rhythm</English>
+            <Chinesesimp>心率分析</Chinesesimp>
             <Japanese>心調律を解析</Japanese>
             <French>Analyser le rythme cardiaque</French>
             <Korean>리듬 분석</Korean>
@@ -1029,6 +1030,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_AED_Action_PlacePads">
             <English>Place AED Pads</English>
+            <Chinesesimp>放置DEA电极</Chinesesimp>
             <Japanese>AEDパッドを貼り付ける</Japanese>
             <French>Placer les électrodes du AED</French>
             <Korean>자동심장충격기 패드 붙이기</Korean>
@@ -1065,6 +1067,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_AEDX_Action_PlacePads">
             <English>Place AED-X Pads</English>
+            <Chinesesimp>放置AED-X电极</Chinesesimp>
             <Japanese>AED-Xパッドを貼り付ける</Japanese>
             <French>Placer les électrodes du AED-X</French>
             <Korean>X-시리즈 자동심장충격기 패드 붙이기</Korean>
@@ -1101,6 +1104,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_Defibrillator_Action_RemovePads">
             <English>Remove Defibrillator Pads</English>
+            <Chinesesimp>取下除颤器电极</Chinesesimp>
             <Japanese>除細動器パッドを取り外す</Japanese>
             <French>Retirer les électrodes du défibrilateur</French>
             <Korean>자동심장충격기 패드 떼기</Korean>
@@ -1113,6 +1117,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_Defibrillator_Action_PlacePads_Progress">
             <English>Placing Defibrillator Pads</English>
+            <Chinesesimp>放置除颤器电极</Chinesesimp>
             <Japanese>除細動器パッドを貼り付けています</Japanese>
             <French>Mise en place des électrodes du défibrilateur</French>
             <Korean>자동심장충격기 패드 붙이는 중</Korean>
@@ -1125,6 +1130,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_Defibrillator_Action_RemovePads_Progress">
             <English>Removing Defibrillator Pads</English>
+            <Chinesesimp>正在取下除颤器垫</Chinesesimp>
             <Japanese>除細動器パッドを取り外しています</Japanese>
             <French>Retrait des électrodes du défibrillateur</French>
             <Korean>자동심장충격기 패드 떼는 중</Korean>
@@ -1137,6 +1143,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_Defibrillator_Action_Shock">
             <English>Administer Shock</English>
+            <Chinesesimp>实施休克</Chinesesimp>
             <Japanese>ショックを実施</Japanese>
             <French>Délivrer le choc</French>
             <Korean>쇼크 실시</Korean>
@@ -1149,6 +1156,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_Defibrillator_Action_Charge">
             <English>Charge Defibrillator</English>
+            <Chinesesimp>除颤器充能</Chinesesimp>
             <Japanese>除細動器を充電</Japanese>
             <French>Charger le défibrillateur</French>
             <Korean>자동심장충격기 충전</Korean>
@@ -1161,6 +1169,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_Defibrillator_Action_CancelCharge">
             <English>Cancel Charge</English>
+            <Chinesesimp>取消充能</Chinesesimp>
             <Japanese>充電を取り消す</Japanese>
             <French>Annuler la charge du défibrillateur</French>
             <Korean>충전 취소</Korean>
@@ -1173,6 +1182,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_ViewMonitor">
             <English>View Monitor</English>
+            <Chinesesimp>查看监护仪</Chinesesimp>
             <Japanese>バイタルモニターを表示</Japanese>
             <French>Visualiser le moniteur</French>
             <Korean>보니터 보기</Korean>
@@ -1185,6 +1195,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_AEDX_Action_ConnectMonitor">
             <English>Connect Vitals Monitor</English>
+            <Chinesesimp>连接监控</Chinesesimp>
             <Japanese>バイタルモニターの接続</Japanese>
             <French>Connecter les capteurs de signe vitaux à l'AED-X</French>
             <Korean>환자감시장치 연결</Korean>
@@ -1197,6 +1208,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_AEDXStation_Action_ConnectMonitor">
             <English>Station: Connect Vitals Monitor</English>
+            <Chinesesimp>设置AED：连接监护仪</Chinesesimp>
             <Japanese>設置AED: バイタルモニターの接続</Japanese>
             <French>Station: Connecter les capteurs de signe vitaux à l'AED-X</French>
             <Korean>환자감시장치 연결(바닥)</Korean>
@@ -1245,6 +1257,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_AEDX_Action_EnableAudio">
             <English>Vitals Monitor Audio ON</English>
+            <Chinesesimp>监护仪音频 开启</Chinesesimp>
             <Japanese>モニター音声オン</Japanese>
             <French>Activer le son des signes vitaux de l'AED-X</French>
             <Korean>환자감시장치 소리 켜기</Korean>
@@ -1257,6 +1270,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_AEDX_Action_DisableAudio">
             <English>Vitals Monitor Audio OFF</English>
+            <Chinesesimp>监护仪音频 关闭</Chinesesimp>
             <Japanese>モニター音声オフ</Japanese>
             <French>Désactiver le son des signes vitaux de l'AED-X</French>
             <Korean>환자감시장치 소리 끄기</Korean>
@@ -2610,6 +2624,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_DrawArterial_Action_Use">
             <English>Draw Arterial Sample</English>
+            <Chinesesimp>动脉血液取样</Chinesesimp>
             <Dutch>Neem Arterieel bloedstaal</Dutch>
             <Spanish>Extraer muestra arterial</Spanish>
             <Japanese>動脈サンプルを採る</Japanese>
@@ -2814,6 +2829,7 @@
         </Key>
         <Key ID="STR_KAT_Circulation_SETTING_AdvRhythm_canDeteriorate">
             <English>Can Deteriorate</English>
+            <Chinesesimp>存在心脏功能受损的可能性</Chinesesimp>
             <Japanese>調律状態が悪化するようにする</Japanese>
             <French>Possibilité de détérioration de la fonction cardiaque</French>
             <Korean>심장기능이 악화될 수 있음</Korean>

diff --git a/addons/feedback/functions/fnc_effectLowSpO2.sqf b/addons/feedback/functions/fnc_effectLowSpO2.sqf
@@ -20,7 +20,7 @@
 params ["_enable", "_intensity"];
 
 if ((!_enable) || {_intensity == 0}) exitWith {
-    if (GVAR(lowSpO2) != -1) then { GVAR(lowSpO2) ppEffectEnable true; };
+    if (GVAR(lowSpO2) != -1) then { GVAR(lowSpO2) ppEffectEnable false; };
 };
 if (GVAR(lowSpO2) != -1) then { GVAR(lowSpO2) ppEffectEnable true; };
 

diff --git a/addons/feedback/stringtable.xml b/addons/feedback/stringtable.xml
@@ -35,7 +35,7 @@
         </Key>
         <Key ID="STR_KAT_Feedback_SETTING_OpioidEffect_DESC">
             <English>Enables opioid effect on ketamine, fentanyl and pervitin</English>
-            <Japanese>ケタミン、フェンタニル、ペルビチンなどでオピオイド効果を有効化します</Japanese>
+            <Japanese>ケタミン、フェンタニル、ペルビチンなどでオピオイドの効果を有効にします</Japanese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/gui/stringtable.xml b/addons/gui/stringtable.xml
@@ -15,6 +15,7 @@
             <Portuguese>Configurações básicas</Portuguese>
             <Finnish>Perus asetukset</Finnish>
             <Russian>Основные настройки</Russian>
+            <Chinese>基础设置</Chinese>
             <Dutch>Basisinstellingen</Dutch>
         </Key>
         <Key ID="STR_KAT_GUI_SETTING_ColoredLogs">
@@ -55,6 +56,7 @@
         </Key>
         <Key ID="STR_KAT_GUI_Status_NoIv">
             <English>No pushed fluids</English>
+            <Chinesesimp>无法进行输液</Chinesesimp>
             <Korean>주입된 액체 없음</Korean>
             <Japanese>点滴中の輸液なし</Japanese>
             <German>Keine verabreichten Flüssigkeiten</German>
@@ -67,6 +69,7 @@
         </Key>
         <Key ID="STR_KAT_GUI_SETTING_overlayBodyPart">
             <English>Overlay Selected Body Part</English>
+            <Chinesesimp>突出显示选定的身体部位</Chinesesimp>
             <Korean>선택한 신체 부위 오버레이</Korean>
             <Japanese>選択した身体部位のオーバーレイ表示</Japanese>
             <German>Ausgewähltes Körperteil überlagern</German>
@@ -79,6 +82,7 @@
         </Key>
         <Key ID="STR_KAT_GUI_SETTING_showPatientSideLabels">
             <English>Label Patient Sides</English>
+            <Chinesesimp>查看患者标签</Chinesesimp>
             <Korean>환자 측면에 라벨 붙이기</Korean>
             <Japanese>患者の向きのラベル表示</Japanese>
             <German>Beschriftung der Patientenseiten</German>