Commit Graph

237 Commits

Author SHA1 Message Date
8bdd5d0597 Merge remote-tracking branch 'brGuy/Translations-December' into fixStringtablesMerge 2015-12-31 14:30:29 -06:00
f2b3275538 Changed action name
Changed extraction action to 'Get Out' to match other civilian actions.
2015-12-29 09:25:33 -07:00
1aa192f7e0 Extract civilans from vehicles, rmeoved actions from civilians in vehicles 2015-12-23 00:19:41 -07:00
ad48f51ec7 Added PT-BR translations
All remaining translations of gestures, hearing, interact_menu,
interaction, nightvision, rearm, refuel, viewdistance were done!
2015-12-18 15:14:19 -02:00
fd06472f4d Russian Translations - Update 2015-12-10 20:32:16 +03:00
b091b73e24 fixes 2015-11-27 21:54:04 +01:00
3250245587 3.4.0 translations and fixes 2015-11-27 21:50:57 +01:00
15267c0433 Merge pull request #2219 from acemod/handSignals
Hand signals enhancement
2015-11-26 16:04:41 +01:00
185cae2fe5 Remove Old Gestures from interaction 2015-11-25 11:00:45 -06:00
818466d296 Added ACE setting to hide interaction 2015-11-24 19:07:17 +01:00
98f6bb3589 Merge branch 'master' of https://github.com/acemod/ACE3 into interactions_lamps
Conflicts:
	addons/cargo/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/interaction/XEH_preInit.sqf
	addons/interaction/stringtable.xml
2015-10-15 11:49:08 +02:00
d6dcd4112e Resolved merge conflicts 2015-10-06 17:50:55 +02:00
067b08611e Fix missing newlines 2015-09-17 12:54:26 +02:00
e2f9b31fb2 small fix + repair translation 2015-09-16 11:53:05 +02:00
89eb98a248 Added: IT more translation, medic partial
Fixed: dup entries (from gienkov)
2015-09-12 23:16:57 +02:00
c2ffe7cad0 Merge branch 'release' into russian 2015-09-10 21:05:32 +02:00
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
c26107bc5c Added ability to pass a magazine 2015-09-08 14:07:16 +02:00
08b7110e58 Russian Translations - Update 2015-09-03 04:54:52 +03:00
91cae690c0 Russian Translations - Update 2015-09-03 03:36:15 +03:00
5f63290508 Merge branch 'ptbr' 2015-08-30 00:42:31 +02:00
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
074ae2c2da fix conflict 2015-08-22 20:02:27 +02:00
3e19b33493 interaction with portable lamps 2015-08-22 20:00:26 +02:00
cf585790db fixes done 2015-08-22 11:41:15 +02:00
1aecd54fc3 Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common 2015-08-08 18:02:20 +02:00
d0f91c5ebf Row 1
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
5609ec7b6b Added PT-BR translations
New PT-BR translations, including the slideshow and spectator module.
2015-07-25 12:56:50 -03:00
78529af60c Update spanish translation 2015-07-08 20:57:46 +02:00
89a9218e59 CZ Translation - Update 2015-07-04 15:56:00 +02:00
bbadc9242b Further zeus actions cleanup 2015-07-03 14:21:21 +01:00
ca36b62356 Zeus interactions string cleanup 2015-07-03 13:20:32 +01:00
70862c5de9 PL translation 2015-07-02 23:55:26 +02:00
10ef88b655 Merge pull request #1596 from SzwedzikPL/interaction_box_inventory
Open action for boxes
2015-07-01 12:59:24 -03:00
a284cc3f6b Merge pull request #1755 from ToasterBR/master
Translation to Brazilian Portuguese (PT-BR)
2015-06-29 17:22:38 -03:00
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
f2e5f729e8 Merge branch 'master' into gm_revamp 2015-06-27 18:26:30 +01:00
19d3cd168c del extra space 2015-06-12 19:54:45 +02:00
805c0e1c68 Open action for boxes 2015-06-12 19:48:28 +02:00
531372b2a3 CZ - Translation
Already in README
2015-06-12 14:50:50 +02:00
85a281d586 Fixed random missing english string 2015-06-06 17:41:24 +01:00
822dd11ec6 Moved base ACE_ZeusActions to ace_interaction 2015-06-06 17:33:13 +01:00
541f1010a7 Merge branch 'master' into macroSTR
Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +02:00
038880cb01 Additional Translations for German + some corrections 2015-05-30 23:33:51 +02:00
489751f5aa More German string fixed
As recommended...
2015-05-28 16:21:53 +02:00
87db721d4f Stringtable fixes up to medical 2015-05-27 21:19:14 +02:00
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
7eeddfbd65 German translations
Added a lot of German translations and fixed even more typos.
2015-05-26 17:04:53 +02:00