* added check for null to avoid warning
* updated translations