APD-129: internationalization