85 Commits

Author	SHA1	Message	Date
PabstMirror	822bd22c97	gj git	2015-04-20 02:18:46 -05:00
PabstMirror	e747234443	Cleanup Spelling	2015-04-20 02:17:47 -05:00
PabstMirror	8c449a454b	merge conflict	2015-04-19 23:57:15 -05: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
FreeZbe	f55bd5a629	French: updates / fixes stringtable	2015-04-18 18:49:46 +02:00
PabstMirror	060dc22ad5	Merge pull request #721 from acemod/privatesPass1 ... Privates Var Fixing	2015-04-17 23:51:23 -05:00
PabstMirror	caef5c105f	More Privates	2015-04-17 22:40:37 -05:00
Tachii	b7c7d2ff15	Update stringtable.xml	2015-04-18 03:04:14 +03:00
Tachii	bd3ef35c88	Update stringtable.xml	2015-04-18 02:07:49 +03:00
ruPaladin	766321224b	hearing	2015-04-17 15:59:29 +03:00
KoffeinFlummi	1b67b2df26	Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge ... Conflicts: addons/disposable/stringtable.xml addons/explosives/stringtable.xml addons/fcs/stringtable.xml addons/frag/stringtable.xml addons/hearing/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/javelin/stringtable.xml addons/kestrel4500/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/laserpointer/stringtable.xml addons/magazinerepack/stringtable.xml addons/maptools/stringtable.xml addons/markers/stringtable.xml addons/microdagr/stringtable.xml addons/movement/stringtable.xml	2015-04-15 22:20:47 +02:00
commy2	6710040633	toLower in, always follow your own advice	2015-04-15 16:13:53 +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	9a8dd905f2	Update stringtable.xml	2015-04-15 10:56:39 +02:00
jaynus	df3c8155a0	Merge branch 'master' of github.com:acemod/ACE3	2015-04-14 14:45:30 -07:00
jaynus	c6943fbdaf	fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588	2015-04-14 14:45:21 -07:00
KoffeinFlummi	ebcdafe610	Fix spelling of "isClientSetable"	2015-04-14 21:43:19 +02:00
KoffeinFlummi	b563bf8a8e	Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge	2015-04-14 15:04:42 +02:00
KoffeinFlummi	63fe4118d4	Merge https://github.com/FreeZbe/ACE3 into french-merge	2015-04-14 14:48:13 +02:00
Harakhti	3c3f6ba4c3	Translation: A to I ... Some parts filled out, other parts corrected or stylized.	2015-04-13 19:28:58 +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
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
licht-im-Norden87	15e9b2cccc	Update stringtable.xml	2015-04-12 13:59:09 +02:00
licht-im-Norden87	2222192aee	Update stringtable.xml	2015-04-12 13:51:47 +02:00
bux578	0e3d971274	Fix translations error	2015-04-12 07:46:43 +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
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
PabstMirror	ae064359f6	Remove Debug	2015-04-10 23:51:07 -05:00
PabstMirror	0edcf03e12	Handle Vehicle Attunation	2015-04-10 23:21:54 -05:00
PabstMirror	dac3047fca	Use AllVehicles Instead of CAManBase	2015-04-10 22:16:33 -05: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
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	04bf321099	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 06:31:42 +02:00
Grzegorz	d874140268	hearing PL translation	2015-04-10 03:33:40 +02:00
licht-im-Norden87	828e19a268	Update stringtable.xml	2015-04-09 23:42:45 +02:00
licht-im-Norden87	2097a5f213	Update stringtable.xml	2015-04-09 23:42:15 +02:00
commy2	5ea35a01bb	sorting out required addons for modularity	2015-04-09 13:23:29 +02:00
bux578	92da20ce62	translations ... #367	2015-04-07 10:02:33 +02:00
jaynus	1bb6be5654	Cleaning up of all tabs in source code files.	2015-04-06 09:22:43 -07:00
Nicolás Badano	4fb50fa71e	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-24 15:44:10 -03:00
Nicolás Badano	8b3648cf8d	Configure exceptions for self actions inside vehicles	2015-03-24 15:43:49 -03:00
bux578	60c50e0daf	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons	2015-03-24 19:12:23 +01:00
Nicolás Badano	5e79970740	Switching nicknames	2015-03-24 01:18:00 -03:00