Commit Graph

769 Commits

Author SHA1 Message Date
Alessandro Foresi
2dd06babec Added: Italian translations completed.
Fixed: BOM markers where missing
2015-05-10 11:44:46 +02:00
Alessandro Foresi
643df71932 Added: Italian translation from Blackedsoul p#20 2015-05-10 11:05:16 +02:00
Glowbal
e674229dde enabledFor > enableFor 2015-05-08 20:10:40 +02:00
Josuan Albin
dd2ea99d15 pak
pak anim
2015-05-05 19:26:11 +02:00
Josuan Albin
f063e45e60 medical advanced added
animations added for advanced
2015-05-05 19:04:08 +02:00
Josuan Albin
b781264212 New anim update
new healing animation added to animationCaller, animationCallerSelf
stays the same
2015-05-05 18:53:17 +02:00
bux578
bd69405cf4 fix czech typo in medical, fix #1010 2015-05-05 08:37:41 +02:00
Glowbal
f6e815fbaf Merge pull request #1003 from acemod/fixMedicalLitterError
Fix treatment script error
2015-05-04 00:25:46 +02:00
Glowbal
ae47c78552 Make treatment execute before createLitter 2015-05-04 00:20:28 +02:00
Glowbal
b86012a6b1 Ensure that litterCondition is always code #1000 2015-05-04 00:16:12 +02:00
ProfessorCZ
a0e443cfc6 Czech translation - Update 2015-05-03 11:48:56 +02:00
KoffeinFlummi
e918e1d661 Merge https://github.com/ruPaladin/ACE3 into russian-merge
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
2015-05-02 23:43:33 +02:00
KoffeinFlummi
d0c7fce7f3 Merge https://github.com/adam3adam/ACE3 into czech-merge
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
2015-05-02 23:29:45 +02:00
KoffeinFlummi
298e1d88bd Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
2015-05-02 23:17:39 +02:00
Harakhti
6c2717be7f More more translations
Stope.
2015-05-02 18:06:01 +02:00
adam3adam
05a6389acd Czech translation v2
mk6mortar and some medical translation
2015-05-02 12:46:28 +02:00
ruPaladin
3aad0904cd medical2 2015-05-02 12:45:27 +03:00
ruPaladin
ca03637a54 medical 2015-05-02 12:42:02 +03:00
ToasterBR
021b00c722 Translation to Portuguese
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
PabstMirror
436e50411a Medical - Fix Uncon PFEH argument changes 2015-05-01 22:42:43 -05:00
Felix Wiegand
07ec7b96c4 Merge pull request #954 from acemod/medicalFixVehAnimation
Medical fix veh animation
2015-05-02 00:35:13 +02:00
KoffeinFlummi
f1ba0cff26 Merge https://github.com/ProfessorCZ/ACE3 into czech-merge
Conflicts:
	AUTHORS.txt
	addons/advanced_ballistics/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
2015-05-02 00:26:25 +02:00
KoffeinFlummi
13b99ed53f Merge https://github.com/adam3adam/ACE3 into czech-merge
Conflicts:
	AUTHORS.txt
	addons/interact_menu/stringtable.xml
2015-05-02 00:17:01 +02:00
Lukas
1d3f5cc312 Czceh translation 2015-05-02 00:04:50 +02:00
FreeZbe
d1da3a82d7 French : update / fix stringtable 2015-05-01 23:08:36 +02:00
KoffeinFlummi
cc627b4a92 Merge branch 'master' of https://github.com/acemod/ACE3 2015-05-01 22:50:11 +02:00
Dimaslg
339cd8febd Add spanish translation for removing tournis 2015-05-01 22:49:52 +02:00
Glowbal
937b20f551 Merge branch 'master' of github.com:acemod/ACE3 2015-05-01 22:49:24 +02:00
Glowbal
09a0158fa4 This should not be 1 2015-05-01 22:49:13 +02:00
KoffeinFlummi
a002c796da Merge branch 'patch-9' of https://github.com/gienkov/ACE3 into polish-merge
Conflicts:
	addons/medical/stringtable.xml
2015-05-01 22:46:49 +02:00
KoffeinFlummi
d8299332e4 Merge branch 'master' of https://github.com/acemod/ACE3
Conflicts:
	addons/respawn/stringtable.xml
2015-05-01 22:44:42 +02:00
KoffeinFlummi
fb807cbb86 Merge branch 'master' into spanish-merge
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/respawn/stringtable.xml
2015-05-01 22:44:10 +02:00
Dimaslg
6f2caec6ec Last touches to Spanish translation 2015-05-01 22:42:09 +02:00
bux578
1a946acc30 German Translation / Typo 2015-05-01 22:33:26 +02:00
Grzegorz
8828704e76 PL translation
STR_ACE_Medical_RemovingTourniquet
2015-05-01 22:32:53 +02:00
Glowbal
e8ccddfc2c Added missing progress bar display text 2015-05-01 22:29:52 +02:00
adam3adam
f5303d455c Translation of some stuff into czech language
adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer
and little part of medical
2015-05-01 22:23:03 +02:00
PabstMirror
bded34fa23 I suck at git
redo reverted stuff here
2015-05-01 15:03:05 -05:00
Glowbal
722c459c1e added APL pbo 2015-05-01 19:37:17 +02:00
Glowbal
80162627ec Fixed spelling of enableUnconsciousnessAI 2015-05-01 18:49:59 +02:00
ruPaladin
a883517a5e Update stringtable.xml 2015-05-01 19:18:06 +03:00
KoffeinFlummi
30e90a377e Fix duplicate entries 2015-05-01 17:51:31 +02:00
KoffeinFlummi
48e59f0d71 Merge branch 'master' of https://github.com/acemod/ACE3
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
2015-05-01 17:46:58 +02:00
KoffeinFlummi
1e786d4a92 Merge https://github.com/FreeZbe/ACE3 into french-merge
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
2015-05-01 17:45:00 +02:00
KoffeinFlummi
e46eba673f Merge branch 'master' into german-translation
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
2015-05-01 17:36:40 +02:00
KoffeinFlummi
954e4ef549 Merge branch 'master' of https://github.com/acemod/ACE3
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
2015-05-01 17:32:19 +02:00
KoffeinFlummi
e96f23c197 Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge
Conflicts:
	addons/atragmx/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/respawn/stringtable.xml
2015-05-01 17:30:59 +02:00
Felix Wiegand
526b0a2d59 Merge pull request #931 from gienkov/master
PL translation
2015-05-01 17:15:22 +02:00
KoffeinFlummi
5f60321a69 Merge https://github.com/Legolasindar/ACE3 into spanish-merge
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
2015-05-01 17:12:00 +02:00
KoffeinFlummi
761e23001f Merge https://github.com/Dimaslg/ACE3 into spanish-merge
Conflicts:
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/optionsmenu/stringtable.xml
2015-05-01 16:51:20 +02:00