APD:228: Updated i18n texts
Merge branch 'APD-228' into develop