117 Commits

Author	SHA1	Message	Date
KoffeinFlummi	9805a8270a	Merge branch 'master' into german-merge	2015-07-25 19:35:03 +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
gienkov	70862c5de9	PL translation	2015-07-02 23:55:26 +02:00
PabstMirror	89305473a2	Add performance note.	2015-07-01 15:50:14 -05:00
PabstMirror	5e80f9d8d3	Merge branch 'master' into userActionPrototype	2015-07-01 15:04:40 -05:00
Nicolás Badano	a284cc3f6b	Merge pull request #1755 from ToasterBR/master ... Translation to Brazilian Portuguese (PT-BR)	2015-06-29 17:22:38 -03: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
SilentSpike	f2e5f729e8	Merge branch 'master' into gm_revamp	2015-06-27 18:26:30 +01:00
Macusercom	cf2f36a775	Corrections suggested by others	2015-06-16 23:17:34 +02:00
Macusercom	24cea18ae5	Revert "Revert "Added German translations"" ... This reverts commit 4403e3c665.	2015-06-16 03:21:25 +02:00
Macusercom	4403e3c665	Revert "Added German translations" ... This reverts commit 0adc07d284.	2015-06-16 03:06:23 +02:00
Macusercom	0adc07d284	Added German translations	2015-06-16 03:06:13 +02:00
PabstMirror	4a8344e1a4	Merge branch 'master' into userActionPrototype ... Conflicts: addons/interact_menu/ACE_Settings.hpp addons/interact_menu/stringtable.xml extensions/CMakeLists.txt	2015-06-13 15:05:57 -05:00
ProfessorCZ	531372b2a3	CZ - Translation ... Already in README	2015-06-12 14:50:50 +02:00
Ivan Navarro Cabello	d15bae105d	Updated spanish translation ... Updated spanish translation	2015-06-08 12:43:07 +02:00
SilentSpike	8a4b4a7e0c	Added a bunch of basic actions	2015-06-05 18:37:29 +01:00
gienkov	de13985492	interact_menu translation	2015-06-05 09:55:13 +02:00
gienkov	c1a7374404	Merge remote-tracking branch 'upstream/master' into pl-translation-1 ... Conflicts: addons/interact_menu/stringtable.xml	2015-06-05 09:40:50 +02:00
PabstMirror	cecc133a59	Missing </Key> in stringtable	2015-06-04 13:22:55 -05:00
jonpas	9fbf256acd	Merge branch 'master' into macroSTR ... Conflicts: addons/hearing/functions/fnc_putInEarplugs.sqf addons/interact_menu/ACE_Settings.hpp	2015-06-04 17:13:09 +02:00
gienkov	46dbd3113c	Fix	2015-06-04 01:38:57 +02:00
gienkov	fb10961a9b	PL translation for new things	2015-06-04 01:34:58 +02:00
SzwedzikPL	18940d0787	Interaction menu background options	2015-06-03 06:04:47 +02:00
jonpas	d934c25b78	Merge branch 'master' into macroSTR ... Conflicts: addons/interact_menu/ACE_Settings.hpp	2015-05-30 19:54:32 +02:00
Glowbal	00acbaf44d	Added blur background client setting	2015-05-29 21:56:07 +02:00
PabstMirror	b0bfb7dd43	Fix Ladders - Add User Setting	2015-05-29 13:00:04 -05:00
jonpas	87db721d4f	Stringtable fixes up to medical	2015-05-27 21:19:14 +02:00
KoffeinFlummi	2bb3a0f139	Cleanup #1095 ... - Fix tabs - Remove tabler comments - Restore one removed Russian string	2015-05-10 16:19:46 +02:00
Alessandro Foresi	2dd06babec	Added: Italian translations completed. ... Fixed: BOM markers where missing	2015-05-10 11:44:46 +02:00
Alessandro Foresi	6695a8793b	Added: Some italian translastions	2015-05-09 23:43:03 +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
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	debfe990e8	Fix duplicates	2015-05-02 00:19:10 +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
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
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
KoffeinFlummi	c9ff497c83	Merge branch 'master' into polish-merge ... Conflicts: addons/respawn/stringtable.xml	2015-05-01 21:13:36 +02:00
Lubomír Blažek	dcb3196e58	Czech strings	2015-05-01 20:52:41 +02:00
Grzegorz	e36fbe9da7	Update stringtable.xml	2015-05-01 19:32:43 +02:00
Grzegorz Sikora	4668869959	PL translation	2015-05-01 19:30:30 +02:00
ruPaladin	2aa788bba2	Update stringtable.xml	2015-05-01 19:26:23 +03: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