merged translations branch