463 Commits

Author	SHA1	Message	Date
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
Macusercom	7eeddfbd65	German translations ... Added a lot of German translations and fixed even more typos.	2015-05-26 17:04:53 +02:00
ODK-Bn	13740d9f32	translated the missing strings into Russian	2015-05-17 13:25:08 +02:00
PabstMirror	dabd11b9c5	MedicalStringtable - Fill missing languages	2015-05-15 16:01:39 -05:00
Grzegorz	1e552496d5	Missing strings ... They need to be here otherwise few options are blank inside medical modules.	2015-05-15 19:23:49 +02:00
Glowbal	abadf05342	Merge remote-tracking branch 'gienkov/module-translations' ... Conflicts: addons/medical/stringtable.xml	2015-05-14 16:01:41 +02:00
Ivan Navarro Cabello	43c5afac55	fixed some spanish translation ... I fixed some spanish translation.	2015-05-14 14:32:35 +02:00
GieNkoV	1610221a70	Remove duplicated strings	2015-05-12 20:01:10 +02:00
GieNkoV	bc72c71e8e	Fix small errors inside stringtables	2015-05-12 19:11:56 +02:00
Grzegorz Sikora	44466e8be8	Remove tabs and repair errors @Glowbal found ... Conflicts: addons/map/CfgVehicles.hpp addons/medical/CfgVehicles.hpp Conflicts: addons/map/CfgVehicles.hpp addons/medical/CfgVehicles.hpp addons/optionsmenu/stringtable.xml	2015-05-12 18:27:27 +02:00
Grzegorz Sikora	156bba3321	Yes/No to BOOL ... Conflicts: addons/common/CfgVehicles.hpp addons/common/stringtable.xml addons/explosives/stringtable.xml addons/hearing/CfgVehicles.hpp addons/hearing/stringtable.xml addons/interaction/stringtable.xml addons/map/CfgVehicles.hpp addons/map/stringtable.xml addons/medical/CfgVehicles.hpp addons/medical/stringtable.xml addons/nametags/stringtable.xml addons/respawn/stringtable.xml addons/switchunits/CfgVehicles.hpp addons/switchunits/stringtable.xml Conflicts: addons/common/CfgVehicles.hpp addons/common/stringtable.xml addons/explosives/stringtable.xml addons/hearing/stringtable.xml addons/interaction/stringtable.xml addons/map/CfgVehicles.hpp addons/map/stringtable.xml addons/medical/CfgVehicles.hpp addons/medical/stringtable.xml addons/nametags/stringtable.xml addons/respawn/stringtable.xml addons/switchunits/CfgVehicles.hpp addons/switchunits/stringtable.xml	2015-05-12 18:26:24 +02:00
Grzegorz Sikora	6a821715a0	Stringtable modules ... Conflicts: addons/missionmodules/CfgVehicles.hpp addons/respawn/CfgVehicles.hpp	2015-05-12 18:25:40 +02:00
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
bux578	bd69405cf4	fix czech typo in medical, fix #1010	2015-05-05 08:37:41 +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
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
Dimaslg	339cd8febd	Add spanish translation for removing tournis	2015-05-01 22:49:52 +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
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
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
bux578	bfb68fe368	fix spelling errors	2015-05-01 14:19:30 +02:00
FreeZbe	80ae016021	Update stringtable.xml	2015-05-01 14:19:15 +02:00
bux578	aa2e5077e4	missing german translation	2015-05-01 12:17:28 +02:00
Grzegorz	3f932c0a93	Update stringtable.xml	2015-04-30 22:55:51 +02:00
Grzegorz Sikora	03973f3dcf	PL translation	2015-04-30 22:54:15 +02:00
KoffeinFlummi	270c3adc1e	Do it again, but properly this time	2015-04-30 22:06:10 +02:00
KoffeinFlummi	85669a9e92	Convert Medical stringtable key names to lowercase	2015-04-30 22:01:09 +02:00
Glowbal	1bee48214e	Merge branch 'master' into medicalMenuClientSetting ... Conflicts: addons/medical/ACE_Medical_Actions.hpp addons/medical/CfgVehicles.hpp addons/medical/stringtable.xml	2015-04-30 21:08:46 +02:00
ulteq	ac33ad109f	Merge pull request #923 from Bla1337/master ... Localization update (Russian)	2015-04-30 13:44:54 +02:00
Harakhti	4e165e2572	Update Hungarian translations ... Let us match the current revision. At the time of making, the Ballistics XML was broken.	2015-04-30 13:25:25 +02:00
ulteq	2c97b20781	Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master ... Conflicts: addons/atragmx/stringtable.xml addons/ballistics/stringtable.xml addons/medical/stringtable.xml addons/missileguidance/stringtable.xml addons/overheating/stringtable.xml addons/realisticnames/stringtable.xml addons/vehiclelock/stringtable.xml	2015-04-30 13:20:31 +02:00
Bla1337	5d1478b733	interact and medical system localization upd	2015-04-30 14:01:22 +03:00
Glowbal	943d2cbd72	Merge branch 'master' into medicalImprovements	2015-04-29 23:01:38 +02:00
Dimaslg	f8d5c423ae	Merge conflicts resolved	2015-04-29 21:15:22 +02:00
NukeDev	73772d9de1	Other Fixes	2015-04-29 16:44:42 +02:00
KoffeinFlummi	a1e709047e	Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge ... Conflicts: AUTHORS.txt addons/aircraft/stringtable.xml addons/attach/stringtable.xml addons/captives/stringtable.xml addons/common/stringtable.xml addons/disposable/stringtable.xml addons/dragging/stringtable.xml addons/explosives/stringtable.xml addons/fcs/stringtable.xml addons/frag/stringtable.xml addons/grenades/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/kestrel/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/laserpointer/stringtable.xml addons/logistics_uavbattery/stringtable.xml addons/logistics_wirecutter/stringtable.xml addons/magazinerepack/stringtable.xml addons/maptools/stringtable.xml addons/markers/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/movement/stringtable.xml addons/nametags/stringtable.xml addons/nightvision/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/parachute/stringtable.xml addons/realisticnames/stringtable.xml addons/reload/stringtable.xml addons/reloadlaunchers/stringtable.xml addons/respawn/stringtable.xml addons/safemode/stringtable.xml addons/switchunits/stringtable.xml addons/vehiclelock/stringtable.xml addons/weaponselect/stringtable.xml addons/wep_javelin/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-29 12:52:55 +02:00
Legolasindar	1c8137a7e5	fixed spanish translate for opened pull #893 ... fixed spanish translate for opened pull #893	2015-04-29 12:46:32 +02:00
Bla1337	cfbf3bd053	Localization update	2015-04-29 11:20:21 +03:00
PabstMirror	3eb2bdfc84	Display Name Progress Text	2015-04-28 21:17:29 -05:00
Dimaslg	956b5e3558	Spanish Translation ... Minor fixes and some things at the Medical system translated.	2015-04-28 21:01:48 +02:00
Glowbal	f606c24854	fixes #901	2015-04-28 20:47:11 +02:00
ulteq	2a759aba70	Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master ... Conflicts: addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-04-28 18:55:23 +02:00
ulteq	236fc10a0f	Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master ... Conflicts: addons/medical/stringtable.xml	2015-04-28 18:15:05 +02:00
NukeDev	db82df6214	Italian's Translation's Changes v2	2015-04-28 18:10:35 +02:00
Grzegorz	b88618563d	Update stringtable.xml	2015-04-28 18:05:27 +02:00
Grzegorz Sikora	bcda77c5c7	PL translation	2015-04-28 18:03:35 +02:00
Josuan Albin	b5524fb3ee	French pass ... * fixed ramp in /aircraft * added aragmx entry * added multiple medical entries * translated missileguidance * completed mk6mortar * changed Sanitaire to Médical in realisticnames also fixed some typos in there and had to rename some of the explosives (weren't fitting in boxes in game) * added myself to contributors	2015-04-28 18:00:09 +02:00
ulteq	dc09c554c0	Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master ... Conflicts: addons/medical/stringtable.xml addons/mk6mortar/stringtable.xml	2015-04-28 17:44:58 +02:00
Ivan Navarro Cabello	8a55c69cd7	added spanish translation ... added spanish translation	2015-04-28 17:03:49 +02:00
simon84	8ac6f61fcf	added some translations ... added some translations	2015-04-28 00:36:37 +02:00
ruPaladin	59aba3fb34	Update stringtable.xml	2015-04-27 19:33:22 +03:00
Grzegorz	78329110a1	Update stringtable.xml	2015-04-26 23:01:18 +02:00
Grzegorz Sikora	a272258500	PL translation	2015-04-26 22:59:20 +02:00
KoffeinFlummi	365f1e025b	Merge remote-tracking branch 'origin/GermanMedicalTranslation' into german-merge ... Conflicts: addons/medical/stringtable.xml	2015-04-26 22:04:39 +02:00
KoffeinFlummi	b472292b20	Remove tabler comments. ... sed is awesome.	2015-04-26 21:05:41 +02:00
KoffeinFlummi	1bb8628109	Merge https://github.com/simon84/ACE3 into german-merge	2015-04-26 21:00:22 +02:00
bux578	6cc4f48eb2	Uppercase Injuries	2015-04-26 14:19:28 +02:00
bux578	b3c461b9da	last few translations	2015-04-26 14:02:14 +02:00
bux578	0aa2b31dd4	gj git	2015-04-26 09:37:02 +02:00
VyMajoris	523cb49ff1	Added - Portuguese translation to lots of things. ... Also fixed a typo the english key for STR_ACE_microdagr_configure.	2015-04-26 03:09:16 -03:00
KoffeinFlummi	9a8dd5ee41	Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge ... Conflicts: addons/medical/stringtable.xml	2015-04-26 01:03:29 +02:00
Dimaslg	274663e1b9	Spanish Translation ... Minor fixes and spelling mistakes.	2015-04-25 18:53:45 +02:00
Glowbal	1415adc2bd	removed local diagnose action. Added localization	2015-04-25 12:35:07 +02:00
Glowbal	55529d0396	Added support for switching from 3d selections to radial menu	2015-04-25 09:41:55 +02:00
jaynus	b384d62edd	Fixes typos in medical strings causing missing strings.	2015-04-21 17:02:50 -07:00
Ivan Navarro Cabello	55887b7cfe	updated stringtable for spanish ... added some spanish translate	2015-04-21 19:03:55 +02:00
ruPaladin	08caf0c695	Updated russian translation (medical) ... Перевел как смог, вероятно данная настройка будет в ACE3 Настройки. Нужно проверить влезет ли туда. Если влезет, то подкорректировать перевод. Правки строго приветствуются.	2015-04-20 15:18:17 +03:00
Tachii	20293bd11b	Update stringtable.xml	2015-04-20 00:26:20 +03:00
Tachii	6c8b587890	Update stringtable.xml	2015-04-20 00:02:01 +03:00
Tachii	5038674aef	Update stringtable.xml	2015-04-19 23:01:38 +03:00
Tachii	60cab963bf	Update stringtable.xml	2015-04-19 23:00:51 +03:00
Tachii	a7d913b80e	Update stringtable.xml	2015-04-19 18:54:47 +03:00
Tachii	596fadcba0	ru translations fixes ... Не стоит додумывать правильные значения или то, как вы думаете это должно интерпертироваться. Нужно переводить то, что написано. Как пример Very Light Wounds - это не царапины, это очень лёгкие ранения. Царапины - это scratches	2015-04-19 18:51:35 +03:00
Tachii	a83925dd2d	Update stringtable.xml	2015-04-19 18:43:05 +03:00
ruPaladin	45fd90c6e0	Rus translation (medical)	2015-04-19 10:49:06 +03:00
bux578	0d86374bee	Merge pull request #754 from gienkov/master ... PL translation	2015-04-19 07:08:54 +02:00
KoffeinFlummi	65fd6b0937	Merge https://github.com/EpMAK/ACE3 into russian-merge ... Conflicts: addons/ballistics/stringtable.xml addons/medical/stringtable.xml addons/nametags/stringtable.xml addons/respawn/stringtable.xml	2015-04-19 01:04:32 +02:00
KoffeinFlummi	592e0d2dd3	Merge https://github.com/ruPaladin/ACE3 into russian-merge ... Conflicts: addons/ballistics/stringtable.xml addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-04-19 00:51:09 +02:00
Grzegorz Sikora	c08125e0f3	PL translation	2015-04-18 22:00:37 +02:00
Glowbal	9825d030e3	Merge pull request #714 from acemod/localMedicalGarbage ... ACE JIP data and event synchronization (Tested with Litter change)	2015-04-18 21:25:53 +02:00
jaynus	c438d9e790	Merge remote-tracking branch 'origin/master' into localMedicalGarbage	2015-04-18 11:12:22 -07:00
FreeZbe	f55bd5a629	French: updates / fixes stringtable	2015-04-18 18:49:46 +02:00
jaynus	c5f5b11d31	strings.	2015-04-18 08:37:21 -07:00
Grzegorz Sikora	7489e514ce	PL translation	2015-04-17 21:48:04 +02:00
EpMAK	31a2f1b279	Russian translations ... Again, filling strings, fixing errors	2015-04-17 19:36:07 +03:00
ruPaladin	2698490569	medical (patient status semantic fixes)	2015-04-17 17:49:03 +03:00
ruPaladin	874cc75271	medical (semantic correction)	2015-04-17 16:22:02 +03:00
simon84	e7f9bc09df	German translations ... Conflicts: addons/disarming/stringtable.xml addons/hearing/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-16 22:52:49 +02:00
simon84	cc75928cc0	Merge remote-tracking branch 'acemod/master' ... Conflicts: addons/disarming/stringtable.xml addons/hearing/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-16 22:47:51 +02:00
simon84	c18284d964	German translation	2015-04-16 22:04:24 +02:00
bux578	5764310833	german translation ... double checked by bw medic	2015-04-16 21:58:39 +02:00
KoffeinFlummi	11f9478035	Merge https://github.com/Legolasindar/ACE3 into spanish-merge ... Conflicts: addons/advanced_ballistics/stringtable.xml addons/atragmx/stringtable.xml addons/ballistics/stringtable.xml addons/javelin/stringtable.xml addons/kestrel4500/stringtable.xml addons/laserpointer/stringtable.xml addons/medical/stringtable.xml addons/scopes/stringtable.xml addons/weather/stringtable.xml	2015-04-16 18:31:31 +02:00
PabstMirror	0076be6a86	Fix stringtables	2015-04-15 17:08:35 -05:00
KoffeinFlummi	5c3b06b1bf	Merge branch 'patch-1' of https://github.com/ramius86/ACE3 into italian-merge ... Conflicts: addons/medical/stringtable.xml	2015-04-15 22:06:18 +02:00
ruPaladin	a3965424b9	addons/medical translation to Russian	2015-04-15 19:09:10 +03:00
Ivan Navarro Cabello	40b784fb7a	update stringtable ... added spanish translate	2015-04-15 17:41:10 +02:00
KoffeinFlummi	8b915380b7	Merge branch 'hungarian-merge'	2015-04-15 13:55:02 +02:00
KoffeinFlummi	2ffbccbf20	Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge	2015-04-15 12:59:56 +02:00
Marco	af3fdf9b91	Update stringtable.xml ... Italian translation	2015-04-15 10:28:09 +02:00
Grzegorz Sikora	3543b9c806	PL Translation ... Some french, german and russian entries were listed twice, had to remove one of two here and there so this list is for revision by different translators	2015-04-15 00:43:42 +02:00
KoffeinFlummi	91e25dc215	Missing stringtable entries	2015-04-14 22:34:08 +02:00
KoffeinFlummi	7af6ea36a6	Fix missing pain effect option name	2015-04-14 22:07:43 +02:00
KoffeinFlummi	684c36f8a5	Add pain effect option	2015-04-14 21:49:56 +02:00
KoffeinFlummi	ba377dfd3a	Show seperate message for "scratches"; localize	2015-04-14 20:40:17 +02:00
KoffeinFlummi	63fe4118d4	Merge https://github.com/FreeZbe/ACE3 into french-merge	2015-04-14 14:48:13 +02:00
KoffeinFlummi	96319c8799	Merge https://github.com/ruPaladin/ACE3 into russian-merge	2015-04-14 12:50:14 +02:00
Harakhti	1b60a335a5	Translation: J to M ... I feel burned out. This was very specifically long and tedious.	2015-04-13 23:03:09 +02:00
Kllrt	1c611ba2db	Added another new CZ strings	2015-04-13 21:15:04 +02:00
bux578	8c24d9ec35	fix invalid xml, fix duplicate keys	2015-04-13 15:25:30 +02:00
KoffeinFlummi	8d4003a396	Merge https://github.com/HerrStein/ACE3 into german-merge	2015-04-13 14:21:00 +02:00
KoffeinFlummi	f6c7d444e1	Merge https://github.com/Anthariel/ACE3 into french-merge	2015-04-13 13:31:48 +02:00
KoffeinFlummi	118b5509ea	Merge https://github.com/gienkov/ACE3 into polish-merge	2015-04-13 13:00:59 +02:00
Anthariel	77058857e6	Update stringtable.xml ... Wrong translation	2015-04-13 02:02:19 +02:00
simon84	51bc7208bc	German translation ... Some german translations and corrections	2015-04-12 20:52:15 +02:00
Anthariel	3f84ac4817	Update stringtable.xml	2015-04-12 17:59:53 +02:00
Anthariel	3842272c43	Update stringtable.xml ... Fixing French & English translation error that I've made on the line : 780 and 781 (thanks KoffeinFlummi)	2015-04-12 17:55:53 +02:00
KoffeinFlummi	8f2a1735ae	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-12 14:28:28 +02:00
KoffeinFlummi	614afa8537	Merge https://github.com/Kllrt/ACE3 into czech-merge ... Conflicts: addons/attach/stringtable.xml addons/captives/stringtable.xml addons/common/stringtable.xml addons/dragging/stringtable.xml addons/explosives/stringtable.xml addons/goggles/stringtable.xml addons/grenades/stringtable.xml addons/hearing/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/kestrel/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/laserpointer/stringtable.xml addons/logistics_uavbattery/stringtable.xml addons/logistics_wirecutter/stringtable.xml addons/magazinerepack/stringtable.xml addons/maptools/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/realisticnames/stringtable.xml addons/reload/stringtable.xml addons/reloadlaunchers/stringtable.xml addons/weaponselect/stringtable.xml addons/wep_javelin/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-12 14:27:59 +02:00
FreeZbe	45ff6c7ce9	French: (Nearly) Complete French translations ... Some entries (3 or 4) are still missing. I dont understand what you mean / what the input is related to.	2015-04-12 14:15:45 +02:00
Legolasindar	b665781399	Update stringtable.xml ... updated spanish translation and added some english missed translation	2015-04-12 13:58:06 +02:00
KoffeinFlummi	59952441d8	Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge	2015-04-12 06:22:17 +02:00
KoffeinFlummi	c6efd4e546	Merge https://github.com/EpMAK/ACE3 into russian-merge	2015-04-12 05:39:46 +02:00
EpMAK	21abff3713	Revert "Revert "Russian Translation"" ... This reverts commit ea04f4ab3e.	2015-04-11 21:33:34 +03:00
EpMAK	ea04f4ab3e	Revert "Russian Translation" ... This reverts commit 17a552bb80.	2015-04-11 21:33:07 +03:00
Kllrt	38adfbcb70	Added missing CZ strings and made little revision	2015-04-11 16:33:00 +02:00
FreeZbe	4a996bf147	Update stringtable.xml	2015-04-10 21:22:07 +02:00
esteldunedain	d6e70cfe6b	Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3 ... Conflicts: addons/common/stringtable.xml addons/explosives/stringtable.xml addons/frag/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/logistics_wirecutter/stringtable.xml addons/medical/stringtable.xml	2015-04-10 16:20:18 -03:00
FreeZbe	e09a3b29d7	Update stringtable.xml	2015-04-10 21:20:09 +02:00
FreeZbe	4dbba270f9	Translations fixes	2015-04-10 21:07:38 +02:00
ruPaladin	8ea96b3086	Update stringtable.xml	2015-04-10 21:21:40 +03:00
EpMAK	17a552bb80	Russian Translation ... Russian translation of stringtables: new lines + old lines fixed a bit, realistic names for armory are not yet filled.	2015-04-10 19:55:57 +03:00
EpMAK	68d08b8c7b	Revert "Translation" ... This reverts commit fab5605ad5.	2015-04-10 19:46:18 +03:00
EpMAK	fab5605ad5	Translation ... Russian translation of the texts	2015-04-10 17:51:48 +03:00
Asgar	16b2311376	Added German translation for a couple of things,	2015-04-10 14:21:55 +02:00
Legolasindar	52d476abd3	Update stringtable.xml ... Added spanisth translation, and two lines of english translation	2015-04-10 12:29:44 +02:00
Jo David	c258c6c00d	fixing translation	2015-04-10 09:05:37 +02:00
Jo David	33a14076fc	Merge branch 'master' of https://github.com/acemod/ACE3 into translations ... Conflicts: addons/captives/stringtable.xml addons/medical/stringtable.xml	2015-04-10 09:01:24 +02:00
Anthariel	95e53fd1bf	Update stringtable.xml ... Added: French Translations (~85%)	2015-04-10 06:20:04 +02:00
Grzegorz	bf6984400f	medical PL translation ... like a boss	2015-04-10 04:30:39 +02:00
licht-im-Norden87	6323a85f17	Update stringtable.xml ... <English>Field Dressing</English> <German>Notverband</German> I dont know if a Notverband is the same as a Field Dressing.	2015-04-10 00:23:20 +02:00
licht-im-Norden87	4522b45939	Update stringtable.xml	2015-04-10 00:03:46 +02:00
Glowbal	093d340ee7	Changed: Dragging/carrying now works for units with broken legs ... Added unload and load of unconscious units	2015-04-09 21:23:10 +02:00
Pierre Humberdroz (meat)	4c49765c8f	translation changes ... #370	2015-04-07 10:39:41 +02:00
bux578	92da20ce62	translations ... #367	2015-04-07 10:02:33 +02:00
PabstMirror	c1abb2669d	#340 - Fix stringtables	2015-04-06 11:03:04 -05:00
Glowbal	7ffd690a71	Changed: IVs are now synced and medics can see a unit is receiving an IV	2015-04-05 20:11:54 +02:00
Glowbal	36288fce43	Updated medical action config. ... Added bodybag action Added Tourniquet action to basic. Added more displayNameProgress entries. Removed deadcode	2015-04-03 22:59:28 +02:00
bux578	1f3c3ce34b	fixed spelling of engl. autoinjector ... http://en.wikipedia.org/wiki/Epinephrine_autoinjector	2015-03-25 18:22:45 +01:00
Glowbal	53e7fe1ba5	fixed #227	2015-03-24 21:08:45 +01:00
Nicolás Badano	a823fb2dca	Tweaks on action names to: ... - Remove >> for submenus - Split long action names in two lines	2015-03-24 00:16:32 -03:00
PabstMirror	2329212060	Medical Action Stringtable	2015-03-23 13:52:26 -05:00
Glowbal	7b519fc2e0	Merge branch 'master' into Medical_Dragging ... Conflicts: addons/medical/XEH_postInit.sqf addons/medical/stringtable.xml	2015-03-22 09:46:58 +01:00
Nicolás Badano	4e32e584be	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-21 15:33:36 -03:00
Nicolás Badano	f8ea603977	Added dynamic actions to unload patients (unconscious) from vehicles	2015-03-21 15:32:32 -03:00
PabstMirror	9578024693	Dupe stringtable entry ... `Item STR_ACE_MEDICAL_BANDAGING listed twice`	2015-03-21 12:52:08 -05:00
KoffeinFlummi	b1ed80a23d	Remove trailing whitespace in medical stringtable	2015-03-21 00:28:19 +01:00
KoffeinFlummi	33d4bf2f5a	Add localization for basic treatments and actions	2015-03-20 18:21:03 +01:00
KoffeinFlummi	9082712ff7	Replace Original with English keys in stringtable	2015-03-20 17:54:26 +01:00
Glowbal	2bee533a8c	Added AGM stringtables for drag, carry, load & unload	2015-03-14 09:51:08 +01:00
Glowbal	4ce524ed3c	First draft of carry and drop unit	2015-03-12 21:16:49 +01:00
Glowbal	6b91cefb90	Minor fixes and added pain status	2015-03-09 22:23:37 +01:00
Glowbal	8cc0361cb4	localization and displayText fixes	2015-03-09 22:08:43 +01:00
Glowbal	a724fb406a	Added triage status	2015-03-05 20:55:38 +01:00
Glowbal	199cd05aa0	New variant of the medical information display	2015-03-05 18:43:44 +01:00
Glowbal	8726e7f1d2	Added CMS equipment items.	2015-03-01 10:25:37 +01:00
KoffeinFlummi	930fb51a20	Medical: First Draft	2015-02-03 20:09:25 +01:00
Thomas Kooi	e468832324	Added initial port of CSE medical (CMS)	2015-01-18 22:16:35 +01:00