Commit Graph

109 Commits

Author SHA1 Message Date
jonpas
1aecd54fc3 Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common 2015-08-08 18:02:20 +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
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