Merge branch 'patch-4' of https://github.com/VyMajoris/ACE3 into portuguese-merge

Conflicts:
	addons/captives/stringtable.xml
This commit is contained in:
KoffeinFlummi 2015-04-29 12:54:20 +02:00
commit c854d2208f

View File

@ -155,6 +155,7 @@
<Russian>Прекратить сдачу в плен</Russian>
<Hungarian>Megadás abbahagyása</Hungarian>
<Italian>Annulla la resa</Italian>
<Portuguese>Parar de se render</Portuguese>
</Key>
<Key ID="STR_ACE_Captives_Zeus_OnlyAlive">
<English>Only use on alive units</English>