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
8,196 Commits 73 Branches 88 Tags 752 MiB
6a21b7da1e
Commit Graph

274 Commits

Author SHA1 Message Date
SilentSpike
16597515f0 Adding remaining missing English straings 2015-07-28 20:55:22 +01: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
gienkov
2f24b240b4 Fix end line marker 2015-07-23 13:59:50 +02:00
gienkov
61fa466a53 Medical and slideshow pl translation 2015-07-23 13:56:54 +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
Clon1998
c61a0f03cd Fixed german translation. 
Fixed german translation for Key STR_ACE_Medical_AssignMedicVehicle_EnableList_Description
 2015-07-04 09:43:42 +02:00
Glowbal
44de95ea81 Merge pull request #1790 from acemod/medicalImprovements 
Medical improvements
 2015-07-03 22:21:20 +02:00
Glowbal
9edf1b1adf Implemented use conditions for PAK and SurgicalKit 
It is now possible to only have a treatment action show up for stable (not bleeding) patients
 2015-07-03 22:16:18 +02:00
gienkov
70862c5de9 PL translation 2015-07-02 23:55:26 +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
ulteq
82d80359d1 Fixes: https://github.com/acemod/ACE3/issues/1646 2015-06-16 21:57:12 +02:00
Ivan Navarro Cabello
76f7962dac Updated spanish stringatable 
Updated spanish stringatable for (Common, Medical, Optionsmenu,
Tacticalladder).
 2015-06-14 13:52:55 +02:00
ulteq
c459a80bcb Merge pull request #1613 from ProfessorCZ/master 
CZ - Translation (medical, tacticalladder)
 2015-06-13 20:48:34 +02:00
Glowbal
5013254769 Merge pull request #1530 from legman/akalegman_zeus_unconscious 
Fixed Zeus Unconscious
 2015-06-13 20:48:18 +02:00
ProfessorCZ
c9f29aefa2 CZ - Translation (medical, tacticalladder) 2015-06-13 19:49:59 +02:00
ProfessorCZ
bf464ffe00 CZ - Translation (medical, tacticalladder) 2015-06-13 19:46:31 +02:00
ViperMaul
cb1d016a39 Merge pull request #1592 from ProfessorCZ/master 
CZ - Translation
 2015-06-13 07:39:18 -07:00
ProfessorCZ
531372b2a3 CZ - Translation 
Already in README
 2015-06-12 14:50:50 +02:00
ulteq
eef7c1295a Added new adv. medical module option 'painIsOnlySuppressed' 2015-06-11 17:36:18 +02:00
ulteq
0c40c1b439 Added Adv. Medical module option 'healHitPointAfterAdvBandage': 
* Changed the default value to '0'
 2015-06-11 15:30:39 +02:00
AKALegman
5431ab5e01 fixed conflicts 2015-06-10 20:03:00 +01:00
PabstMirror
e2890b0699 #1473 - Fix Medical Log Localization 
also swap some common EFUNCs
 2015-06-09 17:30:02 -05:00
AKALegman
1ae8e29ac2 updated isPlayer v2 2015-06-08 19:12:16 +01:00
PabstMirror
fb9c1e14a3 Merge branch 'master' into allStringtableMacros 
Conflicts:
	addons/kestrel4500/CfgWeapons.hpp
 2015-06-07 12:24:40 -05:00
KoffeinFlummi
c47e0ce796 Merge https://github.com/ODK-Bn/ACE3 into russian-merge 2015-06-06 21:13:03 +00:00
PabstMirror
32ce0aa6fd Macroize all stringtables 2015-06-05 21:02:24 -05: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
5d1f2eafaa Fix German Translation 2015-05-30 23:34:19 +02:00
jonpas
1c58ff823d Stringtable fixes medical 2015-05-27 21:58:35 +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
ODK-Bn
13740d9f32 translated the missing strings into Russian 2015-05-17 13:25:08 +02:00
PabstMirror
dabd11b9c5 MedicalStringtable - Fill missing languages 2015-05-15 16:01:39 -05:00
Grzegorz
1e552496d5 Missing strings 
They need to be here otherwise few options are blank inside medical modules.
 2015-05-15 19:23:49 +02:00
Glowbal
abadf05342 Merge remote-tracking branch 'gienkov/module-translations' 
Conflicts:
	addons/medical/stringtable.xml
 2015-05-14 16:01:41 +02:00
Ivan Navarro Cabello
43c5afac55 fixed some spanish translation 
I fixed some spanish translation.
 2015-05-14 14:32:35 +02:00
GieNkoV
1610221a70 Remove duplicated strings 2015-05-12 20:01:10 +02:00
GieNkoV
bc72c71e8e Fix small errors inside stringtables 2015-05-12 19:11:56 +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
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
Alessandro Foresi
2dd06babec Added: Italian translations completed. 
Fixed: BOM markers where missing
 2015-05-10 11:44:46 +02:00
Alessandro Foresi
643df71932 Added: Italian translation from Blackedsoul p#20 2015-05-10 11:05:16 +02:00
bux578
bd69405cf4 fix czech typo in medical, fix #1010 2015-05-05 08:37:41 +02:00
ProfessorCZ
a0e443cfc6 Czech translation - Update 2015-05-03 11:48:56 +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
3aad0904cd medical2 2015-05-02 12:45:27 +03:00
ruPaladin
ca03637a54 medical 2015-05-02 12:42:02 +03:00
ToasterBR
021b00c722 Translation to Portuguese 
Done all remaining portuguese translations, including some minor
corrections
 2015-05-02 03:38:53 -03:00
KoffeinFlummi
f1ba0cff26 Merge https://github.com/ProfessorCZ/ACE3 into czech-merge 
Conflicts:
	AUTHORS.txt
	addons/advanced_ballistics/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-02 00:26:25 +02:00
KoffeinFlummi
13b99ed53f Merge https://github.com/adam3adam/ACE3 into czech-merge 
Conflicts:
	AUTHORS.txt
	addons/interact_menu/stringtable.xml
 2015-05-02 00:17:01 +02:00
Lukas
1d3f5cc312 Czceh translation 2015-05-02 00:04:50 +02:00
FreeZbe
d1da3a82d7 French : update / fix stringtable 2015-05-01 23:08:36 +02:00
Dimaslg
339cd8febd Add spanish translation for removing tournis 2015-05-01 22:49:52 +02:00
KoffeinFlummi
a002c796da Merge branch 'patch-9' of https://github.com/gienkov/ACE3 into polish-merge 
Conflicts:
	addons/medical/stringtable.xml
 2015-05-01 22:46:49 +02:00
KoffeinFlummi
d8299332e4 Merge branch 'master' of https://github.com/acemod/ACE3 
Conflicts:
	addons/respawn/stringtable.xml
 2015-05-01 22:44:42 +02:00
Dimaslg
6f2caec6ec Last touches to Spanish translation 2015-05-01 22:42:09 +02:00
bux578
1a946acc30 German Translation / Typo 2015-05-01 22:33:26 +02:00
Grzegorz
8828704e76 PL translation 
STR_ACE_Medical_RemovingTourniquet
 2015-05-01 22:32:53 +02:00
Glowbal
e8ccddfc2c Added missing progress bar display text 2015-05-01 22:29:52 +02:00
adam3adam
f5303d455c Translation of some stuff into czech language 
adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer
and little part of medical
 2015-05-01 22:23:03 +02:00
ruPaladin
a883517a5e Update stringtable.xml 2015-05-01 19:18:06 +03:00
KoffeinFlummi
30e90a377e Fix duplicate entries 2015-05-01 17:51:31 +02:00
KoffeinFlummi
48e59f0d71 Merge branch 'master' of https://github.com/acemod/ACE3 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:46:58 +02:00
KoffeinFlummi
1e786d4a92 Merge https://github.com/FreeZbe/ACE3 into french-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:45:00 +02:00
KoffeinFlummi
e46eba673f Merge branch 'master' into german-translation 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:36:40 +02:00
KoffeinFlummi
954e4ef549 Merge branch 'master' of https://github.com/acemod/ACE3 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:32:19 +02:00
KoffeinFlummi
e96f23c197 Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge 
Conflicts:
	addons/atragmx/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-01 17:30:59 +02:00
Felix Wiegand
526b0a2d59 Merge pull request #931 from gienkov/master 
PL translation
 2015-05-01 17:15:22 +02:00
KoffeinFlummi
5f60321a69 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
 2015-05-01 17:12:00 +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
bux578
bfb68fe368 fix spelling errors 2015-05-01 14:19:30 +02:00
FreeZbe
80ae016021 Update stringtable.xml 2015-05-01 14:19:15 +02:00
bux578
aa2e5077e4 missing german translation 2015-05-01 12:17:28 +02:00
Grzegorz
3f932c0a93 Update stringtable.xml 2015-04-30 22:55:51 +02:00
Grzegorz Sikora
03973f3dcf PL translation 2015-04-30 22:54:15 +02:00
KoffeinFlummi
270c3adc1e Do it again, but properly this time 2015-04-30 22:06:10 +02:00
KoffeinFlummi
85669a9e92 Convert Medical stringtable key names to lowercase 2015-04-30 22:01:09 +02:00
Glowbal
1bee48214e Merge branch 'master' into medicalMenuClientSetting 
Conflicts:
	addons/medical/ACE_Medical_Actions.hpp
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
 2015-04-30 21:08:46 +02:00
ulteq
ac33ad109f Merge pull request #923 from Bla1337/master 
Localization update (Russian)
 2015-04-30 13:44:54 +02:00
Harakhti
4e165e2572 Update Hungarian translations 
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
 2015-04-30 13:25:25 +02: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
Bla1337
5d1478b733 interact and medical system localization upd 2015-04-30 14:01:22 +03:00
Glowbal
943d2cbd72 Merge branch 'master' into medicalImprovements 2015-04-29 23:01:38 +02:00
Dimaslg
f8d5c423ae Merge conflicts resolved 2015-04-29 21:15:22 +02:00
NukeDev
73772d9de1 Other Fixes 2015-04-29 16:44:42 +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
Legolasindar
1c8137a7e5 fixed spanish translate for opened pull #893 
fixed spanish translate for opened pull #893
 2015-04-29 12:46:32 +02:00
Bla1337
cfbf3bd053 Localization update 2015-04-29 11:20:21 +03:00
PabstMirror
3eb2bdfc84 Display Name Progress Text 2015-04-28 21:17:29 -05:00
Dimaslg
956b5e3558 Spanish Translation 
Minor fixes and some things at the Medical system translated.
 2015-04-28 21:01:48 +02:00
Glowbal
f606c24854 fixes #901 2015-04-28 20:47:11 +02:00
ulteq
2a759aba70 Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-28 18:55:23 +02:00
ulteq
236fc10a0f Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master 
Conflicts:
	addons/medical/stringtable.xml
 2015-04-28 18:15:05 +02:00