KoffeinFlummi
3471ebef16
Merge https://github.com/dudakov/ACE3 into russian-merge
2015-09-23 19:17:52 +02:00
PabstMirror
45e44251b6
Merge branch 'release'
...
Conflicts:
addons/repair/stringtable.xml
2015-09-21 17:14:53 -05:00
PabstMirror
86fae2c251
#2528 - addToLog date / missing string fullHeal
2015-09-20 13:19:51 -05:00
esteldunedain
a621a0c693
Fixes to spanish translations
2015-09-18 13:36:57 -03:00
esteldunedain
3422f5a7f1
Merge branch 'master' of https://github.com/Legolasindar/ACE3 into spanish-translation
...
Conflicts:
addons/medical/stringtable.xml
addons/repair/stringtable.xml
2015-09-18 13:20:22 -03:00
KoffeinFlummi
067b08611e
Fix missing newlines
2015-09-17 12:54:26 +02:00
kaban
4d2707eae2
Russian Translations - Update
2015-09-17 12:21:21 +03:00
kaban
341e122e4c
Russian Translations - Update
2015-09-17 11:43:14 +03:00
Ivan Navarro Cabello
463e21dd91
330
2015-09-16 12:40:30 +02:00
gienkov
ef36b27fe2
medical pl translation
2015-09-11 23:49:41 +02:00
SilentSpike
17f9eab03a
Improve display name of medical heal hitpoints setting
...
ace_medical_healHitPointAfterAdvBandage had a slightly misleading display name that didn't quite convey what it is actually doing
2015-09-11 12:33:18 +01:00
KoffeinFlummi
63c2712360
Merge branch 'release' into portuguese
2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
KoffeinFlummi
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be
Update French translations
2015-09-10 19:14:51 +02:00
gienkov
ad50c1ab4b
medical and repair translation
2015-09-07 16:15:18 +02:00
Jonathan Pereira
7147891710
Added latest ACE3 PT-BR translations
2015-09-05 15:12:31 -03:00
kaban
08b7110e58
Russian Translations - Update
2015-09-03 04:54:52 +03:00
kaban
91cae690c0
Russian Translations - Update
2015-09-03 03:36:15 +03:00
commy2
9665f73fa3
Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments
2015-09-02 17:03:36 +02:00
KoffeinFlummi
5f63290508
Merge branch 'ptbr'
2015-08-30 00:42:31 +02:00
KoffeinFlummi
a7f2a7fefc
Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3
2015-08-30 00:35:11 +02:00
Glowbal
db96d42f25
Merge branch 'CodeCleanUpMedical' into medical-adjustments
2015-08-26 09:06:27 +02:00
Felix Wiegand
3098794951
Merge pull request #2194 from NemesisRE/patch-1
...
Changed german strings for aid kit
2015-08-25 23:18:21 +02:00
Steven Koeberich
d5a1a99f90
Update stringtable.xml
...
corrected spelling
2015-08-23 18:58:13 +02:00
jokoho48
ff6c8a31be
Code Cleanup Medical Module (Part 3).
2015-08-22 18:33:06 +02:00
gienkov
cf585790db
fixes done
2015-08-22 11:41:15 +02:00
gienkov
cc430fc8c2
medical translation
2015-08-21 23:54:01 +02:00
Glowbal
bf8318530e
Merge pull request #2081 from acemod/close-med-menus-distance
...
Fixed #1893 - Menu closes when patient is more as 10 meters away
2015-08-21 14:20:41 +02:00
SilentSpike
33ef60266b
Fix medical CPR code and log message
...
Performing CPR would never succeed when the patient was in revive state because the code was accidentally using `exitWith` instead of `then`. The log message string was also incorrect.
2015-08-19 23:30:13 +01:00
Steven Koeberich
b333fe0cd1
Changed german strings for aid kit
...
Missed some.
2015-08-17 17:42:03 +02:00
Steven Koeberich
f543cf2897
Changed german strings for aid kit
...
The translation for Fielddressing and Aid kit are the same in the german translation which is missleading.
Changed to "Erste-Hilfe-Set" (first aid kit) which is less missleading.
2015-08-17 17:31:40 +02:00
jonpas
5b0168efdb
Fixed Atropine autoinjector display name
2015-08-16 14:14:49 +02:00
Glowbal
3cac137851
Fixed #1893 - Menu closes when patient is more as 10 meters away
2015-08-09 09:14:42 +02:00
PabstMirror
c6be0bbb8c
Merge branch 'master' into add-category-optionsmenu
...
Conflicts:
addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf
addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
2015-08-08 12:39:14 -05:00
jonpas
1aecd54fc3
Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common
2015-08-08 18:02:20 +02:00
Glowbal
e9151d921c
Localized category names for medical settings
2015-08-08 11:52:37 +02:00
KoffeinFlummi
261cd42202
Merge branch 'pl-translation-4' of https://github.com/gienkov/ACE3 into polish-merge
2015-08-02 17:14:41 +02:00
KoffeinFlummi
8f848947ac
Merge https://github.com/Clon1998/ACE3 into german-merge
2015-08-02 17:11:06 +02:00
Harakhti
d0f91c5ebf
Row 1
...
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
SilentSpike
16597515f0
Adding remaining missing English straings
2015-07-28 20:55:22 +01:00
Jonathan Pereira
5609ec7b6b
Added PT-BR translations
...
New PT-BR translations, including the slideshow and spectator module.
2015-07-25 12:56:50 -03:00
gienkov
2f24b240b4
Fix end line marker
2015-07-23 13:59:50 +02:00
gienkov
61fa466a53
Medical and slideshow pl translation
2015-07-23 13:56:54 +02:00
Ivan Navarro Cabello
78529af60c
Update spanish translation
2015-07-08 20:57:46 +02:00
ProfessorCZ
89a9218e59
CZ Translation - Update
2015-07-04 15:56:00 +02:00
Clon1998
c61a0f03cd
Fixed german translation.
...
Fixed german translation for Key STR_ACE_Medical_AssignMedicVehicle_EnableList_Description
2015-07-04 09:43:42 +02:00
Glowbal
44de95ea81
Merge pull request #1790 from acemod/medicalImprovements
...
Medical improvements
2015-07-03 22:21:20 +02:00
Glowbal
9edf1b1adf
Implemented use conditions for PAK and SurgicalKit
...
It is now possible to only have a treatment action show up for stable (not bleeding) patients
2015-07-03 22:16:18 +02:00
gienkov
70862c5de9
PL translation
2015-07-02 23:55:26 +02:00
