Merge "Revert "Revert "Import translations. DO NOT MERGE""" into klp-dev