Commit Graph

38 Commits

Author SHA1 Message Date
bux578
621e1513a0 ballistic stringtable fixes 2015-04-28 20:24:59 +02:00
bux578
4cc6db47de fix merge conflic 2015-04-28 20:15:56 +02:00
ulteq
85ce5e3729 Unified spacing 2015-04-28 19:43:36 +02:00
simon84
b119c85c57 found some errors 2015-04-28 19:36:31 +02:00
simon84
a244660930 German translation fixes
Unified some translations in "ballistics"
e.g. unit mm, Schuss->Patronen, decimal seperator
2015-04-28 19:25:45 +02:00
simon84
8ac6f61fcf added some translations
added some translations
2015-04-28 00:36:37 +02:00
Felix Wiegand
dc7c7fcaf5 Merge pull request #811 from gienkov/master
PL translation
2015-04-25 20:46:47 +02:00
Grzegorz
f3d360d3d8 Update stringtable.xml 2015-04-25 14:36:42 +02:00
ulteq
b1521345c2 Added magazines for the new AP rounds:
*Fixed some stringtable inconsistencies
*Removed some obsolete stringtable entries
2015-04-23 13:35:57 +02:00
Grzegorz Sikora
1063d4bb2c PL translation 2015-04-22 13:17:43 +02:00
ulteq
1d108f42a7 Added a magazine for the new 6.5 Creedmor cartridge
*Fixed the 65x47mm short name
2015-04-22 11:53:22 +02:00
ulteq
e479557f8a Some magazine Stringtable fixes 2015-04-22 10:48:45 +02:00
KoffeinFlummi
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
KoffeinFlummi
592e0d2dd3 Merge https://github.com/ruPaladin/ACE3 into russian-merge
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
2015-04-19 00:51:09 +02:00
Grzegorz Sikora
7489e514ce PL translation 2015-04-17 21:48:04 +02:00
Aleksey Yermakov
8a669c390a Update stringtable.xml 2015-04-17 20:35:34 +03:00
Aleksey Yermakov
2f1ee94d91 Update stringtable.xml 2015-04-17 20:24:32 +03:00
Aleksey Yermakov
bf7a7b5bc9 Update stringtable.xml 2015-04-17 20:18:41 +03:00
EpMAK
31a2f1b279 Russian translations
Again, filling strings, fixing errors
2015-04-17 19:36:07 +03:00
ruPaladin
b80ec3f790 ballistics russian fixes + multilanguage fix 2015-04-17 15:57:25 +03:00
Ivan Navarro Cabello
61d1e6854e added spanish translation
added spanish translation to ballistics and respawn
2015-04-16 19:03:15 +02:00
KoffeinFlummi
11f9478035 Merge https://github.com/Legolasindar/ACE3 into spanish-merge
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/atragmx/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
2015-04-16 18:31:31 +02:00
FreeZbe
550c32e801 French : update stringtable 2015-04-15 20:53:41 +02:00
ulteq
3cff85e85d Added Mk319 Mod 0 ammo and magazines 2015-04-15 19:51:34 +02:00
ulteq
f8061922f7 Added ACE_10Rnd_338_API526_Mag, ACE_5Rnd_127x99_Mag, ACE_5Rnd_127x99_AMAX_Mag 2015-04-15 18:59:41 +02:00
Ivan Navarro Cabello
40b784fb7a update stringtable
added spanish translate
2015-04-15 17:41:10 +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
ulteq
42dbd8f5d2 Continued work on the magazine classes:
*Fixed Katiba using the wrong magazine
*Added ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim
*Added ACE_10Rnd_338_300gr_HPBT_Mag
*Changed some of the .338 magazine initSpeeds to match the new Mar-10 barrel length
*Added the new caseless green ir dim magazine to the ammo crates
*Allowed the Mar-10 to shoot .300 Win Mag
2015-04-15 12:30:48 +02:00
Grzegorz
d538cd257c PL translation fix
Typo, wrote Mk248 Mod 0, should be Mk248 Mod 1
2015-04-15 01:44:33 +02: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
ulteq
e214511e36 Added new magazine classes:
*ACE_100Rnd_65x39_caseless_mag_Tracer_Dim
*ACE_200Rnd_65x39_cased_Box_Tracer_Dim
*ACE_30Rnd_556x45_Stanag_Mk262_mag
*ACE_30Rnd_556x45_Stanag_Mk318_mag
*ACE_10Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x67_Mk248_Mod_0_Mag
*ACE_20Rnd_762x67_Mk248_Mod_1_Mag
*ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag
*ACE_30Rnd_65x47_Scenar_mag
*ACE_10Rnd_762x54_Tracer_mag
2015-04-14 22:19:51 +02:00
ulteq
33a06c5706 Updated stringtable 2015-04-13 21:36:47 +02:00
ulteq
2332f19274 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics
Conflicts:
	addons/ballistics/stringtable.xml
	addons/magazines/CfgAmmo.hpp
	addons/magazines/CfgMagazines.hpp
	addons/magazines/CfgVehicles.hpp
	addons/magazines/CfgWeapons.hpp
	addons/magazines/newclasses.txt
2015-04-13 21:35:53 +02:00
ulteq
8edb2d2c49 Complete overhaul of all ammo/magazine and weapon classes:
*Merged the magazines- into the ballistics module
*Adjusted all magazine class initSpeeds
*Adjusted all weapon class initSpeeds
2015-04-13 21:08:31 +02:00
commy2
b9551f6ad8 split mags from ballistic 2015-01-20 22:40:15 +01:00
commy2
7071f34131 split flashhiders and uniform/vest nerfs from ballistics 2015-01-20 19:55:17 +01:00
commy2
9c99eee461 port ballistics 2015-01-14 04:02:48 +01:00