137 Commits

Author	SHA1	Message	Date
kaban	da16fc1038	\addons\captives\stringtable.xml - resolving conflicts.	2015-11-18 06:50:00 +03:00
Jonathan Pereira	7ec480c98e	Added ace_captives translation to PT-BR	2015-11-07 11:39:02 -02:00
gienkov	0b6fcacaf0	pl translation	2015-11-06 00:56:15 +01:00
PabstMirror	1c26f6c9f5	Captives - Module to set handcuffing ... also add player check for GVAR(requireSurrender) in canApplyHandcuffes	2015-10-23 14:17:31 -05:00
bux578	602832cc0c	adjust german translations	2015-10-19 07:29:02 +02:00
licht-im-Norden87	66e8914360	Update stringtable.xml	2015-10-01 04:38:21 +02:00
licht-im-Norden87	88ee846d7d	Update Stringtable, german: "captives"	2015-10-01 01:36:27 +02:00
esteldunedain	a621a0c693	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
Ivan Navarro Cabello	463e21dd91	330	2015-09-16 12:40:30 +02:00
Alessandro Foresi	a764f1772e	Added: IT captives, fixed ballistics	2015-09-12 09:35:56 +02:00
KoffeinFlummi	63c2712360	Merge branch 'release' into portuguese	2015-09-10 21:59:30 +02:00
KoffeinFlummi	c2ffe7cad0	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
KoffeinFlummi	83aa2cc68c	Merge branch 'release' into french	2015-09-10 19:36:56 +02:00
FreeZbe	fa7943c8be	Update French translations	2015-09-10 19:14:51 +02:00
Jonathan Pereira	7147891710	Added latest ACE3 PT-BR translations	2015-09-05 15:12:31 -03:00
kaban	08b7110e58	Russian Translations - Update	2015-09-03 04:54:52 +03:00
kaban	91cae690c0	Russian Translations - Update	2015-09-03 03:36:15 +03:00
KoffeinFlummi	a7f2a7fefc	Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3	2015-08-30 00:35:11 +02:00
gienkov	be787883f2	captives translation	2015-08-09 22:38:34 +02:00
Glowbal	c7ac190f58	Finalized settings	2015-08-09 00:21:59 +02:00
Glowbal	27ec3adeac	Added stringtable entries requireSurrender setting	2015-08-07 14:51:56 +02:00
Harakhti	d0f91c5ebf	Row 1 ... Not a miracle, but it's something.	2015-07-30 14:40:51 +02:00
KoffeinFlummi	9805a8270a	Merge branch 'master' into german-merge	2015-07-25 19:35:03 +02: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
Macusercom	500504d93b	Further improvements as suggested for German translation	2015-06-18 00:43:23 +02: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
ProfessorCZ	acc5f4d29f	CZ - Translation	2015-06-12 15:05:04 +02: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
gienkov	ecf7873f33	captives and tripod PL translation	2015-06-07 18:55:49 +02:00
PabstMirror	5dc94487c5	Module Settings for Captivity ... Setting for handcuffing own team, and allowing surrender.	2015-06-02 20:50:27 -05:00
SilentSpike	bfce854be3	Localise module messages	2015-06-01 20:50:19 +01:00
KoffeinFlummi	fa73aec15b	Merge https://github.com/Macusercom/ACE3 into german-merge	2015-06-01 14:27:49 +02:00
Macusercom	489751f5aa	More German string fixed ... As recommended...	2015-05-28 16:21:53 +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
GieNkoV	1610221a70	Remove duplicated strings	2015-05-12 20:01:10 +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	6a821715a0	Stringtable modules ... Conflicts: addons/missionmodules/CfgVehicles.hpp addons/respawn/CfgVehicles.hpp	2015-05-12 18:25:40 +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	643df71932	Added: Italian translation from Blackedsoul p#20	2015-05-10 11:05:16 +02:00
Alessandro Foresi	6695a8793b	Added: Some italian translastions	2015-05-09 23:43:03 +02:00
ToasterBR	021b00c722	Translation to Portuguese ... Done all remaining portuguese translations, including some minor corrections	2015-05-02 03:38:53 -03: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
KoffeinFlummi	b263ac6847	Merge branch 'patch-5' of https://github.com/VyMajoris/ACE3 into portuguese-merge ... Conflicts: addons/common/stringtable.xml	2015-04-29 12:57:48 +02:00
KoffeinFlummi	c854d2208f	Merge branch 'patch-4' of https://github.com/VyMajoris/ACE3 into portuguese-merge ... Conflicts: addons/captives/stringtable.xml	2015-04-29 12:54: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
NukeDev	0b4bb6e4c9	Italian's Translation fixes ... atragmx, attach, ballistics, captives languages fixes	2015-04-28 19:40:36 +02:00
KoffeinFlummi	06a4f3d10e	Remove tabler comments.	2015-04-20 15:48:50 +02:00
Grzegorz Sikora	8530684fa6	PL fix #2	2015-04-19 23:09:11 +02:00
FreeZbe	f55bd5a629	French: updates / fixes stringtable	2015-04-18 18:49:46 +02:00
ruPaladin	e38a6fc62b	one more russian fix	2015-04-17 12:01:01 +03:00
Tachii	def2f9c28e	Update stringtable.xml	2015-04-16 18:13:53 +03:00
PabstMirror	0076be6a86	Fix stringtables	2015-04-15 17:08:35 -05:00
KoffeinFlummi	9e6ae52ca5	Merge branch 'patch-6' of https://github.com/ramius86/ACE3 into italian-merge ... Conflicts: addons/captives/stringtable.xml	2015-04-15 22:07:42 +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	f328d302e1	Update stringtable.xml ... Italian translation	2015-04-15 10:42:25 +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	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
Anthariel	3db8f4ad44	Update stringtable.xml ... Added: Some missing french translation.	2015-04-12 18:10:41 +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
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
ruPaladin	a3a40a711c	Update stringtable.xml	2015-04-10 20:24:23 +03:00
ruPaladin	100954da06	Update stringtable.xml	2015-04-10 20:19:19 +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
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
Grzegorz	37be4f9e53	captives PL translation	2015-04-10 03:56:24 +02:00
VyMajoris	f98b9c27c6	Added - Portuguese translation to Captive surrendering ... I need more context on "STR_ACE_Captives_Zeus_OnlyInfentry" and "STR_ACE_Captives_Zeus_OnlyAlive" to translate. Are those texts talking to the player or is just a description for an action?	2015-04-09 22:16:14 -03:00
VyMajoris	ac5589c1c1	Added - Portuguese translation to Captive surendering ... Need more context to translate STR_ACE_Captives_Zeus_OnlyAlive and STR_ACE_Captives_Zeus_OnlyInfentry.	2015-04-09 20:30:09 -03:00
Legolasindar	1dcbebc04c	Update stringtable.xml ... Updated spanish terms	2015-04-10 00:10:47 +02:00
licht-im-Norden87	2c7df9da6a	Stringtable: German additions	2015-04-09 23:02:28 +02:00
bux578	92da20ce62	translations ... #367	2015-04-07 10:02:33 +02:00
PabstMirror	80ac6d83de	Zeus Module Messages	2015-02-24 12:44:54 -06:00
PabstMirror	98564fae68	Surrendering	2015-02-06 15:54:26 -06:00
PabstMirror	982f3b230a	Captives First Pass	2015-02-02 20:04:50 -06:00
PabstMirror	3865598095	AGM_Captives	2015-02-02 19:48:33 -06:00