Commit Graph

11 Commits

Author SHA1 Message Date
KoffeinFlummi
f020ff7c53 Merge branch 'patch-7' of https://github.com/ramius86/ACE3 into italian-merge
Conflicts:
	addons/disarming/stringtable.xml
2015-04-15 22:08:15 +02:00
ruPaladin
7051152d93 Update stringtable.xml 2015-04-15 19:53:42 +03:00
KoffeinFlummi
250d6acb22 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 2015-04-15 16:09:40 +02:00
Marco
aaee9c72c1 Update stringtable.xml
Italian translation
2015-04-15 10:44:13 +02: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
Kllrt
1c611ba2db Added another new CZ strings 2015-04-13 21:15:04 +02:00
Grzegorz Sikora
ac886828b0 Fixes 2015-04-13 18:02:48 +02:00
Legolasindar
4bb9f0cf77 Update stringtable.xml
added spanish translate
2015-04-12 14:27:42 +02:00
licht-im-Norden87
d0fb387255 Update Stringtable: Disarming 2015-04-12 13:45:47 +02:00
PabstMirror
9f25641f54 Verify Mag counts, headers, check animation 2015-03-17 14:43:50 -05:00
PabstMirror
13c9db75a7 Disarming Prototype 2015-02-10 19:55:53 -06:00