PabstMirror
dccc1d33fd
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
2016-02-17 12:30:03 -06:00
SzwedzikPL
94ea26c7b9
typo fix
2016-02-08 00:14:55 +01:00
SzwedzikPL
3bfac35b65
ace repair and medical attributes
2016-02-07 23:56:45 +01:00
Glowbal
575f362fb6
Add setting for limiting usage of Epinephrine in basic medical #1792
...
Part of focus feature medical #3134 . Default settings are inline with old default.
2016-02-07 13:10:38 +01:00
Glowbal
bfd90cd5d3
Add Adenosine to replace atropine #1573
2016-02-07 12:54:23 +01:00
Glowbal
84878c3d8b
Merge branch 'master' into medical-focus-feature
2016-02-07 12:11:25 +01:00
ProfessorCZ
61611d0ec7
Czech Translation - Update
...
Update
2016-02-03 18:31:31 +01:00
Glowbal
209d10065b
Fix missing event log entries #3134
2016-01-17 12:28:37 +01:00
PabstMirror
c2f780e95f
#1259 - Medical Locations Boost Training
2016-01-09 23:54:48 -06:00
jokoho48
6d49bbda28
add delay to Unconsciousness Captivity(posible fix for #3121 )
2016-01-06 17:46:59 +01:00
Alessandro Foresi
c16d97cad0
Merge branch 'master' into translation/15bn/alef
2016-01-03 12:23:27 +01:00
kaban
fd06472f4d
Russian Translations - Update
2015-12-10 20:32:16 +03:00
PabstMirror
39edd205f0
Merge pull request #2942 from acemod/CzechTables
...
Czech Translations - Update
2015-12-07 09:32:00 -06:00
PabstMirror
358228f5bb
Cleanup De Stringtables
2015-12-06 15:03:15 -06:00
ProfessorCZ
cf41ac5fba
Czech Translations - Update
2015-12-04 22:28:10 -06:00
licht-im-Norden87
291f4df072
Update German Stringtables
...
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
kommas...........................................................................................................................................................
Rallypoint
Update stringtable.xml
slideshow, not finished yet
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
What does Curator mean in this context?
l. 294, l 302
cargo
Update stringtable.xml
Update stringtable.xml
I left a few things out. I'd like if someone gives me advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...
Update stringtable.xml
Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Fix Mistakes from merge
Fix Empty Entries
Fix Mistake
Fix
2015-12-04 22:06:44 -06:00
kaban
e2763dde27
Russian Translations - Update
2015-11-05 03:28:53 +03:00
Jonathan Pereira
ce5364d7af
Added PT-BR translations
...
Added all remaining translations, including dagr, dragging, map,
map_gestures, medical, repair, tacticalladder and zeus.
2015-10-26 22:04:03 -02:00
Glowbal
94ed78a173
Merge pull request #2578 from alganthe/strings_fix
...
PAK and Surgical Kit strings normalized inside modules.
2015-10-11 12:05:11 +02:00
gienkov
d88d2fe578
Merge remote-tracking branch 'origin' into pl-strings
2015-09-29 21:56:29 +02:00
KoffeinFlummi
3471ebef16
Merge https://github.com/dudakov/ACE3 into russian-merge
2015-09-23 19:17:52 +02:00
alganthe
10296d2883
PAK and Surgical Kit strings normalized inside modules.
...
Signed-off-by: alganthe <alganthe@live.fr>
2015-09-23 15:50:50 +02:00
gienkov
bbccfbaa35
pl medical string
2015-09-22 01:04:46 +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
Alessandro Foresi
89eb98a248
Added: IT more translation, medic partial
...
Fixed: dup entries (from gienkov)
2015-09-12 23:16:57 +02:00
Alessandro Foresi
d4cb290930
Tweaked: shorter sentence, fixed "pressione"
2015-09-12 22:00:43 +02:00
Alessandro Foresi
8fe629e953
Changed: epi to adrenalina, more wording fixing
2015-09-12 22:00:41 +02:00
Alessandro Foresi
5d74dd1aed
Tweak: Better wording
2015-09-12 22:00:40 +02:00
Alessandro Foresi
15e7f9b767
Add: IV now EV (endovena)
2015-09-12 22:00:39 +02:00
Alessandro Foresi
16fd6b490d
Add: IT translation for medical
2015-09-12 09:42:48 +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
ToasterBR
f4a51d57ef
Translation to Brazilian Portuguese (PT-BR)
...
Made all remaining translations, including new ones like the sitting
module, for example.
2015-06-27 15:48:39 -03:00
ulteq
82d80359d1
Fixes: https://github.com/acemod/ACE3/issues/1646
2015-06-16 21:57:12 +02:00
Ivan Navarro Cabello
76f7962dac
Updated spanish stringatable
...
Updated spanish stringatable for (Common, Medical, Optionsmenu,
Tacticalladder).
2015-06-14 13:52:55 +02:00
ulteq
c459a80bcb
Merge pull request #1613 from ProfessorCZ/master
...
CZ - Translation (medical, tacticalladder)
2015-06-13 20:48:34 +02:00
Glowbal
5013254769
Merge pull request #1530 from legman/akalegman_zeus_unconscious
...
Fixed Zeus Unconscious
2015-06-13 20:48:18 +02:00
ProfessorCZ
c9f29aefa2
CZ - Translation (medical, tacticalladder)
2015-06-13 19:49:59 +02:00
ProfessorCZ
bf464ffe00
CZ - Translation (medical, tacticalladder)
2015-06-13 19:46:31 +02:00
ViperMaul
cb1d016a39
Merge pull request #1592 from ProfessorCZ/master
...
CZ - Translation
2015-06-13 07:39:18 -07:00
ProfessorCZ
531372b2a3
CZ - Translation
...
Already in README
2015-06-12 14:50:50 +02:00
ulteq
eef7c1295a
Added new adv. medical module option 'painIsOnlySuppressed'
2015-06-11 17:36:18 +02:00
ulteq
0c40c1b439
Added Adv. Medical module option 'healHitPointAfterAdvBandage':
...
* Changed the default value to '0'
2015-06-11 15:30:39 +02:00
AKALegman
5431ab5e01
fixed conflicts
2015-06-10 20:03:00 +01:00
PabstMirror
e2890b0699
#1473 - Fix Medical Log Localization
...
also swap some common EFUNCs
2015-06-09 17:30:02 -05:00
AKALegman
1ae8e29ac2
updated isPlayer v2
2015-06-08 19:12:16 +01:00
PabstMirror
fb9c1e14a3
Merge branch 'master' into allStringtableMacros
...
Conflicts:
addons/kestrel4500/CfgWeapons.hpp
2015-06-07 12:24:40 -05:00
KoffeinFlummi
c47e0ce796
Merge https://github.com/ODK-Bn/ACE3 into russian-merge
2015-06-06 21:13:03 +00:00
PabstMirror
32ce0aa6fd
Macroize all stringtables
2015-06-05 21:02:24 -05:00
jonpas
541f1010a7
Merge branch 'master' into macroSTR
...
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
KoffeinFlummi
fa73aec15b
Merge https://github.com/Macusercom/ACE3 into german-merge
2015-06-01 14:27:49 +02:00
Macusercom
5d1f2eafaa
Fix German Translation
2015-05-30 23:34:19 +02:00
jonpas
1c58ff823d
Stringtable fixes medical
2015-05-27 21:58:35 +02:00
Ivan Navarro Cabello
047a2ee736
added spansih translate
...
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).
I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
2015-05-27 15:27:04 +02:00
