Commit Graph

8 Commits

Author SHA1 Message Date
Jo David
33a14076fc Merge branch 'master' of https://github.com/acemod/ACE3 into translations
Conflicts:
	addons/captives/stringtable.xml
	addons/medical/stringtable.xml
2015-04-10 09:01:24 +02:00
Legolasindar
7b4d62c46c Update stringtable.xml
Fixed spanish terms
2015-04-10 00:05:47 +02:00
bux578
92da20ce62 translations
#367
2015-04-07 10:02:33 +02:00
commy2
baf9396459 cleanup attach 2015-02-15 15:31:09 +01:00
PabstMirror
8ceb2aabc1 Attach Stuff 2015-01-31 11:43:58 -06:00
PabstMirror
08763b6b9f Initial port of old pull
Still some problem with interaction...
2015-01-30 14:32:21 -06:00
Nicolás Badano
e090119d82 Tag replacements in attach 2015-01-13 20:00:31 -03:00
commy2
f969be6302 trying to fix capitilization 2 2015-01-11 21:39:49 +01:00