116 Commits

Author	SHA1	Message	Date
ulteq	3fda9e7e7b	Merge pull request #997 from ProfessorCZ/master ... Czech translation - Update	2015-05-03 17:03:47 +02:00
ProfessorCZ	a0e443cfc6	Czech translation - Update	2015-05-03 11:48:56 +02:00
ulteq	d653aa262a	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ballisticsTranslationFix ... Conflicts: addons/ballistics/stringtable.xml	2015-05-03 10:21:57 +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
ulteq	e6187adfc7	Removed a trailing space	2015-05-02 22:09:38 +02:00
ulteq	b5ec13b992	Fixed some inconsistencies in the stringtable	2015-05-02 22:07:25 +02:00
Harakhti	6c2717be7f	More more translations ... Stope.	2015-05-02 18:06:01 +02: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
Lukas	1d3f5cc312	Czceh translation	2015-05-02 00:04:50 +02:00
Tachii	66eda924ac	Update stringtable.xml	2015-05-01 20:48:37 +03:00
Tachii	b1a23fd3c7	Update stringtable.xml	2015-05-01 20:29:57 +03:00
Tachii	43dea56ae6	Update stringtable.xml	2015-05-01 20:29:00 +03:00
Tachii	66818e0a74	Update stringtable.xml	2015-05-01 20:26:05 +03:00
Tachii	43655d0cec	Update stringtable.xml	2015-05-01 20:18:51 +03:00
Tachii	caf301ac99	Update stringtable.xml ... Added 1 RU string	2015-05-01 20:15:35 +03: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	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
FreeZbe	820c841b35	Update stringtable.xml	2015-05-01 14:12:10 +02:00
bux578	0f135c5dab	fix ballistics stringtable	2015-04-30 15:23:52 +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
ulteq	50a8a89b28	Added missing privates	2015-04-30 10:50:49 +02:00
Dimaslg	f8d5c423ae	Merge conflicts resolved	2015-04-29 21:15:22 +02:00
ulteq	4e171c2988	Merge pull request #916 from FreeZbe/master ... French: update and fix stringtable	2015-04-29 16:46:49 +02:00
FreeZbe	ca7aeece90	French: update stringtable	2015-04-29 16:28:59 +02:00
Bla1337	cfbf3bd053	Localization update	2015-04-29 11:20:21 +03:00
ulteq	a80e11d025	Fixed some 7.62 tracer magazines: ... *Made use of the ACE_20Rnd_762x51_Mag_Tracer magazine *Fixed ACE_10Rnd_762x54_Tracer_mag (inheritance, stringtable, tracersEvery)	2015-04-29 01:33:26 +02:00
bux578	621e1513a0	ballistic stringtable fixes	2015-04-28 20:24:59 +02:00
bux578	4cc6db47de	fix merge conflic	2015-04-28 20:15:56 +02:00
ulteq	85ce5e3729	Unified spacing	2015-04-28 19:43:36 +02:00
NukeDev	0b4bb6e4c9	Italian's Translation fixes ... atragmx, attach, ballistics, captives languages fixes	2015-04-28 19:40:36 +02:00
simon84	b119c85c57	found some errors	2015-04-28 19:36:31 +02:00
simon84	a244660930	German translation fixes ... Unified some translations in "ballistics" e.g. unit mm, Schuss->Patronen, decimal seperator	2015-04-28 19:25:45 +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
commy2	d6f2ac95dd	fix ace ammo box doesn't show up in zeus	2015-04-26 17:04:49 +02:00
ulteq	5ed7cee6fd	Fixed a copy&paste typo	2015-04-26 09:22:04 +02:00
Felix Wiegand	dc7c7fcaf5	Merge pull request #811 from gienkov/master ... PL translation	2015-04-25 20:46:47 +02:00
Dimaslg	274663e1b9	Spanish Translation ... Minor fixes and spelling mistakes.	2015-04-25 18:53:45 +02:00
ulteq	71df545d52	Improved the Mk248 muzzle velocity shift table	2015-04-25 18:30:58 +02:00
Grzegorz	f3d360d3d8	Update stringtable.xml	2015-04-25 14:36:42 +02:00
ulteq	b405f17df2	Added missing ;	2015-04-24 17:19:18 +02:00
ulteq	709fdcdd08	Merge pull request #821 from Brisse89/master ... Added realistic tracer burn times for several ammo types	2015-04-24 08:28:43 +02:00
ulteq	b0eadf83c7	Fixed incorrect typicalSpeed	2015-04-23 14:04:01 +02:00
Brisse89	91dfd9802a	Update CfgAmmo.hpp	2015-04-23 13:58:42 +02:00
Brisse89	8d4fff6359	Update CfgAmmo.hpp	2015-04-23 13:56:46 +02:00
Brisse89	5bfa97f490	Update CfgAmmo.hpp	2015-04-23 13:55:26 +02:00
Brisse89	f0a1900ad4	Update CfgAmmo.hpp	2015-04-23 13:53:42 +02:00
Brisse89	ae8a512e8f	Update CfgAmmo.hpp	2015-04-23 13:47:25 +02:00