Merge branch 'patch-7' of https://github.com/ramius86/ACE3 into italian-merge

Conflicts:
	addons/disarming/stringtable.xml
This commit is contained in:
KoffeinFlummi 2015-04-15 22:08:15 +02:00
commit f020ff7c53

View File

@ -8,6 +8,7 @@
<Czech>Otevřít inventář</Czech>
<Spanish>Abrir inventario</Spanish>
<Russian>Открыть инвентарь</Russian>
<Italian>Apri l'inventario</Italian>
</Key>
</Package>
</Project>