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
ac33ad109f
Merge pull request #923 from Bla1337/master
...
Localization update (Russian)
2015-04-30 13:44:54 +02:00
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
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
5d1478b733
interact and medical system localization upd
2015-04-30 14:01:22 +03:00
943d2cbd72
Merge branch 'master' into medicalImprovements
2015-04-29 23:01:38 +02:00
f8d5c423ae
Merge conflicts resolved
2015-04-29 21:15:22 +02:00
73772d9de1
Other Fixes
2015-04-29 16:44:42 +02:00
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
1c8137a7e5
fixed spanish translate for opened pull #893
...
fixed spanish translate for opened pull #893
2015-04-29 12:46:32 +02:00
cfbf3bd053
Localization update
2015-04-29 11:20:21 +03:00
3eb2bdfc84
Display Name Progress Text
2015-04-28 21:17:29 -05:00
956b5e3558
Spanish Translation
...
Minor fixes and some things at the Medical system translated.
2015-04-28 21:01:48 +02:00
f606c24854
fixes #901
2015-04-28 20:47:11 +02:00
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
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
db82df6214
Italian's Translation's Changes v2
2015-04-28 18:10:35 +02:00
b88618563d
Update stringtable.xml
2015-04-28 18:05:27 +02:00
bcda77c5c7
PL translation
2015-04-28 18:03:35 +02:00
b5524fb3ee
French pass
...
* fixed ramp in /aircraft
* added aragmx entry
* added multiple medical entries
* translated missileguidance
* completed mk6mortar
* changed Sanitaire to Médical in realisticnames also fixed some typos
in there and had to rename some of the explosives (weren't fitting in
boxes in game)
* added myself to contributors
2015-04-28 18:00:09 +02:00
dc09c554c0
Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master
...
Conflicts:
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
2015-04-28 17:44:58 +02:00
8a55c69cd7
added spanish translation
...
added spanish translation
2015-04-28 17:03:49 +02:00
8ac6f61fcf
added some translations
...
added some translations
2015-04-28 00:36:37 +02:00
59aba3fb34
Update stringtable.xml
2015-04-27 19:33:22 +03:00
78329110a1
Update stringtable.xml
2015-04-26 23:01:18 +02:00
a272258500
PL translation
2015-04-26 22:59:20 +02:00
365f1e025b
Merge remote-tracking branch 'origin/GermanMedicalTranslation' into german-merge
...
Conflicts:
addons/medical/stringtable.xml
2015-04-26 22:04:39 +02:00
b472292b20
Remove tabler comments.
...
sed is awesome.
2015-04-26 21:05:41 +02:00
1bb8628109
Merge https://github.com/simon84/ACE3 into german-merge
2015-04-26 21:00:22 +02:00
6cc4f48eb2
Uppercase Injuries
2015-04-26 14:19:28 +02:00
b3c461b9da
last few translations
2015-04-26 14:02:14 +02:00
0aa2b31dd4
gj git
2015-04-26 09:37:02 +02:00
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
9a8dd5ee41
Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge
...
Conflicts:
addons/medical/stringtable.xml
2015-04-26 01:03:29 +02:00
274663e1b9
Spanish Translation
...
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
1415adc2bd
removed local diagnose action. Added localization
2015-04-25 12:35:07 +02:00
55529d0396
Added support for switching from 3d selections to radial menu
2015-04-25 09:41:55 +02:00
b384d62edd
Fixes typos in medical strings causing missing strings.
2015-04-21 17:02:50 -07:00
55887b7cfe
updated stringtable for spanish
...
added some spanish translate
2015-04-21 19:03:55 +02:00
08caf0c695
Updated russian translation (medical)
...
Перевел как смог, вероятно данная настройка будет в ACE3 Настройки. Нужно проверить влезет ли туда. Если влезет, то подкорректировать перевод. Правки строго приветствуются.
2015-04-20 15:18:17 +03:00
20293bd11b
Update stringtable.xml
2015-04-20 00:26:20 +03:00
6c8b587890
Update stringtable.xml
2015-04-20 00:02:01 +03:00
5038674aef
Update stringtable.xml
2015-04-19 23:01:38 +03:00
60cab963bf
Update stringtable.xml
2015-04-19 23:00:51 +03:00
a7d913b80e
Update stringtable.xml
2015-04-19 18:54:47 +03:00
596fadcba0
ru translations fixes
...
Не стоит додумывать правильные значения или то, как вы думаете это должно интерпертироваться. Нужно переводить то, что написано. Как пример Very Light Wounds - это не царапины, это очень лёгкие ранения. Царапины - это scratches
2015-04-19 18:51:35 +03:00
a83925dd2d
Update stringtable.xml
2015-04-19 18:43:05 +03:00
45fd90c6e0
Rus translation (medical)
2015-04-19 10:49:06 +03:00
0d86374bee
Merge pull request #754 from gienkov/master
...
PL translation
2015-04-19 07:08:54 +02:00
65fd6b0937
Merge https://github.com/EpMAK/ACE3 into russian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
2015-04-19 01:04:32 +02:00
