Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/acemod/ACE3

Browse Source 
Conflicts:
	addons/respawn/stringtable.xml
This commit is contained in:
KoffeinFlummi 2015-05-01 22:44:42 +02:00
commit d8299332e4
3 changed files with 8 additions and 3 deletions

1
addons/medical/ACE_Medical_Treatments.hpp
View File

@ -250,6 +250,7 @@ class ACE_Medical_Actions {
treatmentTime = 2.5;
callbackSuccess = QUOTE(DFUNC(actionRemoveTourniquet));
condition = QUOTE([ARR_2(_this select 1, _this select 2)] call FUNC(hasTourniquetAppliedTo));
displayNameProgress = "$STR_ACE_Medical_RemovingTourniquet";
};
class CPR: fieldDressing {
displayName = "$STR_ACE_Medical_Actions_CPR";

4
addons/medical/stringtable.xml
View File

@ -2438,5 +2438,9 @@
<Russian>Лечение ...</Russian>
<Spanish>Tratando ...</Spanish>
</Key>
<Key ID="STR_ACE_Medical_RemovingTourniquet">
<English>Removing Tourniquet ...</English>
<German>Tourniquet entfernen ...</German>
</Key>
</Package>
</Project>

6
addons/respawn/stringtable.xml
View File

@ -16,7 +16,7 @@
<Key ID="STR_ACE_Respawn_Deployed">
<English>Rallypoint deployed</English>
<French>Point de ralliement déployé</French>
<German>Rallypoint errichtet</German>
<German>Sammelpunkt errichtet</German>
<Spanish>Punto de reunión desplegado</Spanish>
<Russian>Точка сбора установлена</Russian>
<Polish>Punkt zbiórki rozmieszczony</Polish>
@ -36,8 +36,8 @@
<Key ID="STR_ACE_Respawn_TeleportToRallypoint">
<English>Teleport to Rallypoint</English>
<Czech>Teleportovat na rallypoint</Czech>
<German>Zum Rallypoint teleportieren</German>
<Spanish>Teletransportar a Punto de reunión</Spanish>
<German>Zum Sammelpunkt teleportieren</German>
<Polish>Teleport do punktu zbiórki</Polish>
<Russian>Телепортироваться на точку сбора</Russian>
</Key>
@ -56,7 +56,7 @@
<Key ID="STR_ACE_Respawn_TeleportedToRallypoint">
<English>Teleported to Rallypoint</English>
<French>Téléporté au point de déploiement</French>
<German>Zum Rallypoint teleportiert</German>
<German>Zum Sammelpunkt teleportiert</German>
<Spanish>Teletransportado al punto de reunión</Spanish>
<Russian>Телепорт на точку сбора</Russian>
<Polish>Przeteleportowano do punktu zbiórki</Polish>