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
esteldunedain
7b797d906f
Merge branch 'master' into linearMenuExperiment
...
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
addons/overheating/stringtable.xml
2015-04-12 00:19:33 -03: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
KoffeinFlummi
c6efd4e546
Merge https://github.com/EpMAK/ACE3 into russian-merge
2015-04-12 05:39:46 +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
esteldunedain
d6e70cfe6b
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3
...
Conflicts:
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/frag/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/medical/stringtable.xml
2015-04-10 16:20:18 -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
FreeZbe
3541500947
Translation changes
2015-04-10 16:41:51 +02:00
Anthariel
b5841f8f09
Update stringtable.xml
...
Added: French Translation (100%)
2015-04-10 06:28:59 +02:00
Grzegorz
2984aa2e8c
interaction PL translation
2015-04-10 03:26:03 +02:00
Legolasindar
2542f994d6
Update stringtable.xml
...
added spanish translation
2015-04-10 01:29:52 +02:00
Clon1998
d7bdb48547
Update stringtable.xml
2015-04-10 01:15:20 +02:00
licht-im-Norden87
852f939430
whoops
2015-04-10 01:00:35 +02:00
licht-im-Norden87
7994441968
Update stringtable.xml
2015-04-09 23:48:21 +02:00
Pierre Humberdroz (meat)
4c49765c8f
translation changes
...
#370
2015-04-07 10:39:41 +02:00
bux578
92da20ce62
translations
...
#367
2015-04-07 10:02:33 +02:00
PabstMirror
75351f2a5b
TapShoulder - fix hint message
2015-04-04 17:54:15 -05:00
esteldunedain
a658cafb4e
Remove line breaks from actions
2015-04-04 01:45:03 -03:00
Nicolás Badano
a823fb2dca
Tweaks on action names to:
...
- Remove >> for submenus
- Split long action names in two lines
2015-03-24 00:16:32 -03:00
Nicolás Badano
d7363a6dab
Move main interactions to pelvis; leave torso for medical
2015-03-21 11:01:38 -03:00
Nicolás Badano
66731c9cdd
First rough implementation of the passengers menu, with mounted main actions
2015-03-20 00:53:58 -03:00
Nicolás Badano
2e0b195cba
Added base action for handheld weapons
2015-03-01 01:32:21 -03:00
Nicolás Badano
78b1d698c1
Added base actions for limbs on CAManBase
2015-03-01 00:52:08 -03:00
Nicolás Badano
2b0cfac8e4
Removed obsolote code from ace_interaction ( #109 )
2015-02-28 23:00:24 -03:00
Nicolás Badano
dd92c5e845
Tap on either shoulder. "Tap" animation
2015-02-19 19:45:46 -03:00
Nicolás Badano
f7d5d615ee
allow actions to be defined for different selections
2015-02-19 15:36:27 -03:00
Nicolás Badano
1aa862bc3b
Change stringtables and main variables prefixes to ACE
2015-01-12 01:20:02 -03:00
Nicolás Badano
6769189e7c
AGM_Interaction pre CBA
2015-01-11 16:32:51 -03:00
