99 Commits

Author	SHA1	Message	Date
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
Lukas	1d3f5cc312	Czceh translation	2015-05-02 00:04:50 +02:00
FreeZbe	6f5e64b4a5	French : update / fix stringtable	2015-05-01 23:10:06 +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
licht-im-Norden87	d12c7ff048	Update Stringtable: Rallypoint ... Angleichung	2015-05-01 21:25:39 +02:00
KoffeinFlummi	c9ff497c83	Merge branch 'master' into polish-merge ... Conflicts: addons/respawn/stringtable.xml	2015-05-01 21:13:36 +02:00
Felix Wiegand	90275b272e	Merge pull request #950 from Tachii/patch-19 ... Added few missing ru strings	2015-05-01 21:11:37 +02:00
Lubomír Blažek	dcb3196e58	Czech strings	2015-05-01 20:52:41 +02:00
Tachii	bed298d5b3	Update stringtable.xml	2015-05-01 21:38:05 +03:00
Grzegorz	7e87c3a250	Update stringtable.xml	2015-05-01 19:32:59 +02:00
Grzegorz Sikora	4668869959	PL translation	2015-05-01 19:30:30 +02:00
Tachii	889275091e	Update stringtable.xml	2015-05-01 20:24:13 +03:00
Tachii	1771b61578	added 2 missing ru strings	2015-05-01 20:23:05 +03: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
esteldunedain	a0923aa5c3	Tweak the position for rally point actions. Fix #837	2015-05-01 01:57:37 -03:00
commy2	2ae5538df5	change wrong strings	2015-04-30 22:46:08 +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
NukeDev	d4dc5e6d85	Other Fixes 2	2015-04-29 17:22:20 +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
commy2	aabe532829	manual merge	2015-04-26 21:26:57 +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
commy2	9cb27c8fb2	fix: error when getting killed with FF-messages module, fix #745	2015-04-19 07:08:57 +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
FreeZbe	f55bd5a629	French: updates / fixes stringtable	2015-04-18 18:49:46 +02:00
PabstMirror	ed2e847247	More Privates	2015-04-17 18:13:09 -05:00
PabstMirror	dce344c85f	Ignore Case	2015-04-17 16:51:27 -05: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
KoffeinFlummi	20e4858a0d	Merge https://github.com/ramius86/ACE3 into italian-merge	2015-04-17 15:44:50 +02:00
EpMAK	c2214efeb1	Russian stringtables finished ... Filled all the missing lines, little errors fixed.	2015-04-17 14:54:28 +03:00
Ivan Navarro Cabello	61d1e6854e	added spanish translation ... added spanish translation to ballistics and respawn	2015-04-16 19:03:15 +02:00
Marco	13de953aab	Update stringtable.xml ... IT	2015-04-16 10:23:34 +02:00
commy2	d68cc8f40e	sync rallypoint marker on jip	2015-04-15 20:50:03 +02:00
commy2	18be5276a9	rally point moved eh, markers at rallypoint positions	2015-04-15 19:18:42 +02:00
commy2	9c1b40f5a3	preparing for improved positions of action points	2015-04-15 16:40:20 +02:00
commy2	bf8f9b4818	all I need is a $	2015-04-15 15:34:01 +02:00
commy2	e3d1946924	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix	2015-04-15 14:37:49 +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
commy2	09289fbf48	only on server though	2015-04-15 08:34:30 +02:00
commy2	6c4e50a98d	localized names for rallypoints, auto assign slot of group leader at the start of the mission as JIP persistant rallypoint mover slot	2015-04-15 08:31:40 +02:00
Niko Lehtovirta	df8a958c42	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-15 06:45:42 +03:00
commy2	2940d1f83c	base rallypoints create a respawn marker if none is present in the mission	2015-04-15 03:10:17 +02:00
commy2	4cdf61ab9e	fix misc issues with rallypoints	2015-04-15 01:50:58 +02:00
commy2	7c5a6538a9	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix	2015-04-15 00:06:12 +02:00
KoffeinFlummi	63fe4118d4	Merge https://github.com/FreeZbe/ACE3 into french-merge	2015-04-14 14:48:13 +02:00
commy2	ea7659a36e	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix	2015-04-14 13:36:02 +02:00
Harakhti	8bfd915ec4	Translation: N to R ... This was a lot more fun than the previous two were. 12 folders left...	2015-04-13 23:45:44 +02:00