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