Commit Graph

92 Commits

Author SHA1 Message Date
licht-im-Norden87
5e8096f29c Update Stringtable: missileguidance 2015-05-01 21:29:49 +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
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
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
Dimaslg
864c3ea03b Conflicts resolve again
Conflicts resolve again
2015-04-29 21:23:32 +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
Bla1337
cfbf3bd053 Localization update 2015-04-29 11:20:21 +03:00
Josuan Albin
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
simon84
8ac6f61fcf added some translations
added some translations
2015-04-28 00:36:37 +02:00
KoffeinFlummi
b472292b20 Remove tabler comments.
sed is awesome.
2015-04-26 21:05:41 +02:00
Dimaslg
4b7daaa840 Spanish translation
Minor fixes and spelling mistakes.
2015-04-25 19:18:04 +02:00
Dimaslg
274663e1b9 Spanish Translation
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
Ivan Navarro Cabello
55887b7cfe updated stringtable for spanish
added some spanish translate
2015-04-21 19:03:55 +02:00
bux578
0d86374bee Merge pull request #754 from gienkov/master
PL translation
2015-04-19 07:08:54 +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
Grzegorz Sikora
c08125e0f3 PL translation 2015-04-18 22:00:37 +02:00
bux578
0f2e4c22b7 Merge pull request #749 from FreeZbe/master
French: updates / fixes stringtable
2015-04-18 21:16:07 +02:00
FreeZbe
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
jaynus
d1993836ae Cleanup. missing string. 2015-04-18 08:40:28 -07:00
EpMAK
31a2f1b279 Russian translations
Again, filling strings, fixing errors
2015-04-17 19:36:07 +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
21305629ed Merge branch 'patch-1' of https://github.com/nomisum/ACE3 into german-merge 2015-04-15 14:53:27 +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
76ff1da57a Update stringtable.xml
Italian
2015-04-15 11:19:54 +02:00
jaynus
57acee0f89 Changed: Cleaned up Missile guidance setting for AI, SCALAR. 2015-04-14 19:19:14 -07:00
jaynus
ad95105508 Added and enabled AMG for AI. 2015-04-14 18:25:02 -07: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
Harakhti
1b60a335a5 Translation: J to M
I feel burned out. This was very specifically long and tedious.
2015-04-13 23:03:09 +02:00
Grzegorz
2cd456432e Update stringtable.xml 2015-04-13 19:17:42 +02:00
Grzegorz
5269f32d62 weird but fixed
Something went wrong there, but fixed
2015-04-13 19:11:39 +02:00
Grzegorz Sikora
ac886828b0 Fixes 2015-04-13 18:02:48 +02:00
licht-im-Norden87
075b52c1ff Update stringtable.xml 2015-04-12 22:53:02 +02:00
nomisum
ca27e6eb5a fixed typo
`Erweitertes Raketenlenksystem` shoud be a nominalization
2015-04-12 19:52:37 +02:00
nomisum
b1c29f82c2 improved/added german translation
Imho `Raketenlenksystem` is the best fitting german translation for missile guidance. `Raketenlenkung` sounds a bit too colloquial.
2015-04-12 19:41:44 +02:00
licht-im-Norden87
88a71042e3 Update stringtable.xml 2015-04-12 14:12:05 +02:00
Kllrt
be8ff39767 Fixed broken missileguidaince stringtable.xml
sry
2015-04-12 10:58:00 +02:00
Kllrt
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00
jaynus
0225cb510c Add missile strings. 2015-04-10 12:16:18 -07:00
jaynus
61f5324d29 ACE_Settings entry for guidance. 2015-04-08 08:19:19 -07:00