Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,850 Commits 73 Branches 88 Tags 752 MiB
e6683e8077
Commit Graph

181 Commits

Author SHA1 Message Date
gienkov
3250245587 3.4.0 translations and fixes 2015-11-27 21:50:57 +01:00
Thomas Kooi
15267c0433 Merge pull request #2219 from acemod/handSignals 
Hand signals enhancement
 2015-11-26 16:04:41 +01:00
PabstMirror
185cae2fe5 Remove Old Gestures from interaction 2015-11-25 11:00:45 -06:00
BaerMitUmlaut
818466d296 Added ACE setting to hide interaction 2015-11-24 19:07:17 +01:00
SzwedzikPL
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
BaerMitUmlaut
d6dcd4112e Resolved merge conflicts 2015-10-06 17:50:55 +02:00
KoffeinFlummi
067b08611e Fix missing newlines 2015-09-17 12:54:26 +02:00
gienkov
e2f9b31fb2 small fix + repair translation 2015-09-16 11:53:05 +02:00
Alessandro Foresi
89eb98a248 Added: IT more translation, medic partial 
Fixed: dup entries (from gienkov)
 2015-09-12 23:16:57 +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
BaerMitUmlaut
c26107bc5c Added ability to pass a magazine 2015-09-08 14:07:16 +02: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
5f63290508 Merge branch 'ptbr' 2015-08-30 00:42:31 +02:00
KoffeinFlummi
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
SzwedzikPL
074ae2c2da fix conflict 2015-08-22 20:02:27 +02:00
SzwedzikPL
3e19b33493 interaction with portable lamps 2015-08-22 20:00:26 +02:00
gienkov
cf585790db fixes done 2015-08-22 11:41:15 +02:00
jonpas
1aecd54fc3 Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common 2015-08-08 18:02:20 +02:00
Harakhti
d0f91c5ebf Row 1 
Not a miracle, but it's something.
 2015-07-30 14:40:51 +02:00
Jonathan Pereira
5609ec7b6b Added PT-BR translations 
New PT-BR translations, including the slideshow and spectator module.
 2015-07-25 12:56:50 -03: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
SilentSpike
bbadc9242b Further zeus actions cleanup 2015-07-03 14:21:21 +01:00
SilentSpike
ca36b62356 Zeus interactions string cleanup 2015-07-03 13:20:32 +01:00
gienkov
70862c5de9 PL translation 2015-07-02 23:55:26 +02:00
Nicolás Badano
10ef88b655 Merge pull request #1596 from SzwedzikPL/interaction_box_inventory 
Open action for boxes
 2015-07-01 12:59:24 -03: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
SzwedzikPL
19d3cd168c del extra space 2015-06-12 19:54:45 +02:00
SzwedzikPL
805c0e1c68 Open action for boxes 2015-06-12 19:48:28 +02:00
ProfessorCZ
531372b2a3 CZ - Translation 
Already in README
 2015-06-12 14:50:50 +02:00
SilentSpike
85a281d586 Fixed random missing english string 2015-06-06 17:41:24 +01:00
SilentSpike
822dd11ec6 Moved base ACE_ZeusActions to ace_interaction 2015-06-06 17:33:13 +01:00
jonpas
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
KoffeinFlummi
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +02:00
Macusercom
038880cb01 Additional Translations for German + some corrections 2015-05-30 23:33:51 +02:00
Macusercom
489751f5aa More German string fixed 
As recommended...
 2015-05-28 16:21:53 +02:00
jonpas
87db721d4f Stringtable fixes up to medical 2015-05-27 21:19:14 +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
ed1acd8c15 Some small errors fixed #2 
Mainly tabs and wrong italian strings (got those from newest master)
 2015-05-12 19:42:35 +02:00
GieNkoV
bc72c71e8e Fix small errors inside stringtables 2015-05-12 19:11:56 +02:00
Grzegorz Sikora
156bba3321 Yes/No to BOOL 
Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/CfgVehicles.hpp
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml

Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml
 2015-05-12 18:26:24 +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
KoffeinFlummi
a1d2bd62a4 Merge branch 'patch-1' of https://github.com/FreeZbe/ACE3 into french-merge 
Conflicts:
	addons/interaction/stringtable.xml
 2015-05-03 01:08:22 +02:00
KoffeinFlummi
e918e1d661 Merge https://github.com/ruPaladin/ACE3 into russian-merge 
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-02 23:43:33 +02:00
KoffeinFlummi
d0c7fce7f3 Merge https://github.com/adam3adam/ACE3 into czech-merge 
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
 2015-05-02 23:29:45 +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
adam3adam
05a6389acd Czech translation v2 
mk6mortar and some medical translation
 2015-05-02 12:46:28 +02:00
ruPaladin
219735611f interaction2 2015-05-02 12:47:06 +03:00
ruPaladin
3b6e491f5c interaction 2015-05-02 12:42:44 +03:00
FreeZbe
66f39fc1dc French : update / fix stringtable 2015-05-02 10:12:28 +02:00
ToasterBR
021b00c722 Translation to Portuguese 
Done all remaining portuguese translations, including some minor
corrections
 2015-05-02 03:38:53 -03:00
licht-im-Norden87
106f2ab89b Added german strings to interaction 2015-05-02 03:25:28 +02:00
Grzegorz
c1d87f2a75 PL translation 
interaction
 2015-05-01 23:50:27 +02:00
Felix Wiegand
a211bcfacf Merge pull request #689 from acemod/group 
Reword the group action names
 2015-05-01 23:30:10 +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
PabstMirror
a46d4e11ab Remove linebreak from teamManagement, fix leaveteam 2015-04-30 12:38:19 -05:00
PabstMirror
ca57a4e168 Merge branch 'master' into group 
Conflicts:
	addons/interaction/CfgVehicles.hpp
	addons/interaction/stringtable.xml
 2015-04-30 11:59:53 -05: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
Bla1337
cfbf3bd053 Localization update 2015-04-29 11:20:21 +03:00
VyMajoris
523cb49ff1 Added - Portuguese translation to lots of things. 
Also fixed a typo the english key for STR_ACE_microdagr_configure.
 2015-04-26 03:09:16 -03:00
Dimaslg
274663e1b9 Spanish Translation 
Minor fixes and spelling mistakes.
 2015-04-25 18:53:45 +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
esteldunedain
80f37b9ad9 Reword team actions on AI 2015-04-17 01:13:05 -03:00
esteldunedain
c8ebed234f Reword the group actions 2015-04-17 01:01:31 -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
KoffeinFlummi
234e8e5c40 Merge branch 'patch-1' of https://github.com/Clon1998/ACE3 into german-merge 
Conflicts:
	addons/interaction/stringtable.xml
 2015-04-15 21:55:52 +02:00
FreeZbe
bc5b9bdfe9 French : update / fix strintable 2015-04-15 20:11:08 +02:00
Marco
ad67fca8f4 Update stringtable.xml 2015-04-15 17:45:48 +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
6e7c1ce9d2 Update stringtable.xml 
Ita
 2015-04-15 11:04:18 +02:00
Nicolás Badano
10b1587453 Merge pull request #592 from gienkov/master 
PL translation
 2015-04-14 20:36:25 -03:00
Grzegorz Sikora
3543b9c806 PL Translation 
Some french, german and russian entries were listed twice, had to remove
one of two here and there so this list is for revision by different
translators
 2015-04-15 00:43:42 +02:00
esteldunedain
6f4bb48489 Merge branch 'master' into linearMenuExperiment 
Conflicts:
	addons/attach/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/overheating/stringtable.xml
	extensions/CMakeLists.txt
 2015-04-14 19:09:57 -03:00
KoffeinFlummi
c1fccecb21 Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge 2015-04-14 15:12:24 +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
b93cf4fb4a Merge branch 'polish-merge' 2015-04-13 13:01:17 +02:00
KoffeinFlummi
118b5509ea Merge https://github.com/gienkov/ACE3 into polish-merge 2015-04-13 13:00:59 +02:00
Kllrt
915ac46e04 Very small typo in CZ translation 
-.-
 2015-04-13 11:00:47 +02:00
ruPaladin
ccc2124abe Russian translation for addons/interaction 
Fix for addons/interaction translation.
 2015-04-13 11:53:15 +03:00
Anthariel
67be340360 Update stringtable.xml 2015-04-13 02:05:15 +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
licht-im-Norden87
a01c4a0e0b Update stringtable.xml 2015-04-12 13:55:55 +02:00
esteldunedain
dfea99debf Switch "Team" for "Group" 2015-04-12 01:32:03 -03:00
esteldunedain
0565eb6c74 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into linearMenuExperiment 
Conflicts:
	addons/laser_selfdesignate/stringtable.xml
 2015-04-12 01:26:55 -03:00
esteldunedain
0420a94938 Streamline Team management actions 2015-04-12 01:19:38 -03:00