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 |
|