Applied Tina's patches for removing the xapi jar
Add some missing localization strings