From 270c3adc1e67bdfa111e29fcc04e62a411c64afc Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 30 Apr 2015 22:06:10 +0200 Subject: [PATCH] Do it again, but properly this time --- addons/medical/ACE_Medical_Treatments.hpp | 6 +- addons/medical/CfgWeapons.hpp | 12 ++-- .../fnc_actionCheckBloodPressureLocal.sqf | 22 +++---- .../functions/fnc_actionCheckPulseLocal.sqf | 18 +++--- addons/medical/stringtable.xml | 62 +++++++++---------- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/addons/medical/ACE_Medical_Treatments.hpp b/addons/medical/ACE_Medical_Treatments.hpp index 4f47e68a0b..8a42bbbb68 100644 --- a/addons/medical/ACE_Medical_Treatments.hpp +++ b/addons/medical/ACE_Medical_Treatments.hpp @@ -225,7 +225,7 @@ class ACE_Medical_Actions { }; class CheckPulse: fieldDressing { displayName = ""; - displayNameProgress = "$STR_ACE_Medical_Check_Pulse_CONTENT"; + displayNameProgress = "$STR_ACE_Medical_Check_Pulse_Content"; treatmentLocations[] = {"All"}; requiredMedic = 0; treatmentTime = 2; @@ -240,11 +240,11 @@ class ACE_Medical_Actions { }; class CheckBloodPressure: CheckPulse { callbackSuccess = QUOTE(DFUNC(actionCheckBloodPressure)); - displayNameProgress = "$STR_ACE_Medical_Check_Bloodpressure_CONTENT"; + displayNameProgress = "$STR_ACE_Medical_Check_Bloodpressure_Content"; }; class CheckResponse: CheckPulse { callbackSuccess = QUOTE(DFUNC(actionCheckResponse)); - displayNameProgress = "$STR_ACE_Medical_Check_Response_CONTENT"; + displayNameProgress = "$STR_ACE_Medical_Check_Response_Content"; }; class RemoveTourniquet: CheckPulse { treatmentTime = 2.5; diff --git a/addons/medical/CfgWeapons.hpp b/addons/medical/CfgWeapons.hpp index 5fc5a4c9a8..d70b64a1d2 100644 --- a/addons/medical/CfgWeapons.hpp +++ b/addons/medical/CfgWeapons.hpp @@ -102,8 +102,8 @@ class CfgWeapons { scope = 2; displayName = $STR_ACE_Medical_Plasma_IV; picture = QUOTE(PATHTOF(ui\items\plasmaIV_x_ca.paa)); - descriptionShort = $STR_ACE_Medical_Plasma_IV_DESC_SHORT; - descriptionUse = $STR_ACE_Medical_Plasma_IV_DESC_USE; + descriptionShort = $STR_ACE_Medical_Plasma_IV_Desc_Short; + descriptionUse = $STR_ACE_Medical_Plasma_IV_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 10; }; @@ -125,8 +125,8 @@ class CfgWeapons { model = "\A3\Structures_F_EPA\Items\Medical\BloodBag_F.p3d"; displayName = $STR_ACE_Medical_Blood_IV; picture = QUOTE(PATHTOF(ui\items\bloodIV_x_ca.paa)); - descriptionShort = $STR_ACE_Medical_Blood_IV_DESC_SHORT; - descriptionUse = $STR_ACE_Medical_Blood_IV_DESC_USE; + descriptionShort = $STR_ACE_Medical_Blood_IV_Desc_Short; + descriptionUse = $STR_ACE_Medical_Blood_IV_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 10; }; @@ -147,8 +147,8 @@ class CfgWeapons { scope = 2; displayName = $STR_ACE_Medical_Saline_IV; picture = QUOTE(PATHTOF(ui\items\salineIV_x_ca.paa)); - descriptionShort = $STR_ACE_Medical_Saline_IV_DESC_SHORT; - descriptionUse = $STR_ACE_Medical_Saline_IV_DESC_USE; + descriptionShort = $STR_ACE_Medical_Saline_IV_Desc_Short; + descriptionUse = $STR_ACE_Medical_Saline_IV_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 10; }; diff --git a/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf b/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf index 7a0b332400..560b171400 100644 --- a/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf +++ b/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf @@ -28,27 +28,27 @@ _bloodPressureLow = _bloodPressure select 0; _output = ""; _logOutPut = ""; if ([_caller] call FUNC(isMedic)) then { - _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_1"; + _output = "STR_ACE_Medical_Check_Bloodpressure_Output_1"; _logOutPut = format["%1/%2",round(_bloodPressureHigh),round(_bloodPressureLow)]; } else { if (_bloodPressureHigh > 20) then { - _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_2"; - _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_LOW"; + _output = "STR_ACE_Medical_Check_Bloodpressure_Output_2"; + _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_Low"; if (_bloodPressureHigh > 100) then { - _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_3"; - _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_NORMAL"; + _output = "STR_ACE_Medical_Check_Bloodpressure_Output_3"; + _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_Normal"; if (_bloodPressureHigh > 160) then { - _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_4"; - _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_HIGH"; + _output = "STR_ACE_Medical_Check_Bloodpressure_Output_4"; + _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_High"; }; }; } else { if (random(10) > 3) then { - _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_5"; - _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_NOBLOODPRESSURE"; + _output = "STR_ACE_Medical_Check_Bloodpressure_Output_5"; + _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_NoBloodpressure"; } else { - _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_6"; + _output = "STR_ACE_Medical_Check_Bloodpressure_Output_6"; }; }; }; @@ -56,5 +56,5 @@ if ([_caller] call FUNC(isMedic)) then { ["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName), round(_bloodPressureHigh),round(_bloodPressureLow)], 1.75, _caller]] call EFUNC(common,targetEvent); if (_logOutPut != "") then { - [_target,"activity", localize "STR_ACE_Medical_Check_Bloodpressure_LOG", [[_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog); + [_target,"activity", localize "STR_ACE_Medical_Check_Bloodpressure_Log", [[_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog); }; diff --git a/addons/medical/functions/fnc_actionCheckPulseLocal.sqf b/addons/medical/functions/fnc_actionCheckPulseLocal.sqf index 3f49cba6e6..85e9bee828 100644 --- a/addons/medical/functions/fnc_actionCheckPulseLocal.sqf +++ b/addons/medical/functions/fnc_actionCheckPulseLocal.sqf @@ -23,24 +23,24 @@ _heartRate = _unit getvariable [QGVAR(heartRate), 80]; if (!alive _unit) then { _heartRate = 0; }; -_heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_5"; +_heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_5"; _logOutPut = "No heart rate"; if (_heartRate > 1.0) then { if ([_caller] call FUNC(isMedic)) then { - _heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_1"; + _heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_1"; _logOutPut = format["%1",round(_heartRate)]; } else { // non medical personel will only find a pulse/HR - _heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_2"; - _logOutPut = localize "STR_ACE_Medical_Check_Pulse_WEAK"; + _heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_2"; + _logOutPut = localize "STR_ACE_Medical_Check_Pulse_Weak"; if (_heartRate > 60) then { if (_heartRate > 100) then { - _heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_3"; - _logOutPut = localize "STR_ACE_Medical_Check_Pulse_STRONG"; + _heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_3"; + _logOutPut = localize "STR_ACE_Medical_Check_Pulse_Strong"; } else { - _heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_4"; - _logOutPut = localize "STR_ACE_Medical_Check_Pulse_NORMAL"; + _heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_4"; + _logOutPut = localize "STR_ACE_Medical_Check_Pulse_Normal"; }; }; }; @@ -49,5 +49,5 @@ if (_heartRate > 1.0) then { ["displayTextStructured", [_caller], [[_heartRateOutput, [_unit] call EFUNC(common,getName), round(_heartRate)], 1.5, _caller]] call EFUNC(common,targetEvent); if (_logOutPut != "") then { - [_unit,"activity", localize "STR_ACE_Medical_Check_Pulse_LOG",[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog); + [_unit,"activity", localize "STR_ACE_Medical_Check_Pulse_Log",[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog); }; diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 122244f990..c164b37bf1 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -978,7 +978,7 @@ Plasma IV (1000ml) Plasma IV (1000ml) - + A volume-expanding blood supplement. Дополнительный препарат, применяемый при возмещении объема крови. Suplemento para expandir el volumen sanguíneo. @@ -989,7 +989,7 @@ Volumenerweiterungsmittel (künstliches Blutvolumen) Suplemento para expandir o volume sanguíneo. - + A volume-expanding blood supplement. Дополнительный препарат, применяемый при возмещении объема крови. Suplemento para expandir el volumen sanguíneo. @@ -1033,7 +1033,7 @@ Sangue IV (1000ml) Sangue IV (1000ml) - + Blood IV, for restoring a patients blood (keep cold) Пакет крови для возмещения объёма потерянной крови (хранить в холодильнике) Sangre intravenosa, para restarurar el volumen sanguíneo (mantener frío) @@ -1044,7 +1044,7 @@ Blut IV, Bluthaushalt des Patienten wiederherstellen. (Kühl halten) Sangue intravenoso, para restaurar o volume sanguinio do paciente.(Manter frio) - + O Negative infusion blood used in strict and rare events to replenish blood supply usually conducted in the transport phase of medical care. Кровь I группы, резус-отрицательная, применяется по жизненным показаниям для возмещения объема потерянной крови на догоспитальном этапе оказания медицинской помощи. Krew 0 Rh-, używana w rzadkich i szczególnych przypadkach do uzupełnienia krwi u pacjenta, zazwyczaj w trakcie fazie transportu rannej osoby do szpitala. @@ -1087,7 +1087,7 @@ Soluzione salina IV (1000ml) Soro IV (1000ml) - + Saline IV, for restoring a patients blood Пакет физраствора для возмещения объёма потерянной крови Solución salina intravenosa, para restaurar el volumen sanguíneo @@ -1098,7 +1098,7 @@ Kochsalzlösung, ein medizinisches Volumenersatzmittel Solução Salina Intravenosa 0.9%, para restaurar o volume de sangue temporariamente. - + A medical volume-replenishing agent introduced into the blood system through an IV infusion. Пакет физиологического раствора для возмещения объёма потерянной крови путем внутривенного вливания Suero fisiológico inoculado al torrente sanguíneo de forma intravenosa. @@ -1285,7 +1285,7 @@ Pressione sanguigna Pressão Arterial - + Checking Blood Pressure.. Mesure de la tension ... Проверка артериального давления ... @@ -1296,7 +1296,7 @@ Controllando la pressione sanguigna.. Aferindo Pressão Arterial... - + %1 checked Blood Pressure: %2 %1 kontrollierte Blutdruck: %2 %1 controllata pressione sanguigna: %2 @@ -1304,7 +1304,7 @@ %1 à vérifié la tension: %2 %1 sprawdził ciśnienie krwi: %2 - + You checked %1 Vous diagnostiquez %1 Вы осмотрели раненого %1 @@ -1315,7 +1315,7 @@ Hai diagnosticato %1 Você aferiu o paciente %1 - + You find a blood pressure of %2/%3 Vous avez trouvé une tension de %2/%3 Артериальное давление %2/%3 @@ -1326,7 +1326,7 @@ Der Blutdruck liegt bei %2/%3 A Pressão Arterial é de %2/%3 - + You find a low blood pressure Tension basse Давление низкое @@ -1337,7 +1337,7 @@ La pressione sanguigna è bassa Pressão Arterial baixa - + You find a normal blood pressure Tension normale Давление нормальное @@ -1348,7 +1348,7 @@ La pressione sanguigna è normale Pressão Arterial normal - + You find a high blood pressure Tension haute Давление высокое @@ -1359,7 +1359,7 @@ La pressione sanguigna è alta Pressão Arterial Alta - + You find no blood pressure Pas de tension Давления нет @@ -1370,7 +1370,7 @@ La pressione sanguigna è assente Sem Pressão Arterial - + You fail to find a blood pressure Vous n'avez pas pu mesurer de tension Артериальное давление не определяется @@ -1381,7 +1381,7 @@ Manca strumento per misurare pressione sanguigna Você falhou em aferir a Pressão Arterial - + Low Niedrig Basso @@ -1389,7 +1389,7 @@ Faible Niskie - + Normal Normal Normale @@ -1397,7 +1397,7 @@ Normale Normalne - + High Hoch Alto @@ -1405,7 +1405,7 @@ Haute Wysokie - + No Blood Pressure Kein Blutdruck Nessuna Pressione Sanguigna @@ -1424,7 +1424,7 @@ Polso Pulso - + Checking Heart Rate ... Vérification du rythme cardiaque ... Проверка пульса ... @@ -1435,7 +1435,7 @@ Controllando il battito cardiaco ... Aferindo Pulso ... - + You checked %1 Вы осмотрели раненого %1 Vous examinez %1 @@ -1446,7 +1446,7 @@ Hai diagnosticato %1 Você aferiu o paciente %1 - + %1 checked Heart Rate: %2 %1 kontrollierte Herzfrequenz: %2 %1 Controllata Frequenza Cardiaca: %2 @@ -1454,7 +1454,7 @@ %1 à vérifié le rythme cardiaque: %2 %1 sprawdził tętno: %2 - + Weak Schwach Lento @@ -1462,7 +1462,7 @@ Faible Słabe - + Normal Normal Normale @@ -1470,7 +1470,7 @@ Normal Normalne - + Strong Stark Veloce @@ -1478,7 +1478,7 @@ Fort Silne - + You find a Heart Rate of %2 Rythme cardiaque de %2 Пульс %2 уд./мин. @@ -1489,7 +1489,7 @@ Il battito cardiaco è %2 A Freqüência Cardíaca é de %2 - + You find a weak Heart Rate Rythme cardiaque faible Пульс слабый @@ -1500,7 +1500,7 @@ Hai riscontrato un debole battito cardiaco Freqüência Cardíaca baixa - + You find a strong Heart Rate Rythme cardiaque élevé Пульс учащенный @@ -1511,7 +1511,7 @@ Hai riscontrato un forte battito cardiaco Freqüência Cardíaca normal - + You find a normal Heart Rate Rythme cardiaque normal Пульс в норме @@ -1522,7 +1522,7 @@ Hai riscontrato un normale battito cardiaco Freqüência Cardíaca alta - + You find no Heart Rate Pas de rythme cardiaque Пульс не прощупывается @@ -1544,7 +1544,7 @@ Risposta Reação - + You check response of patient Vous vérifiez la réponse du patient Вы проверяете реакцию раненого