Re-merge translations - do not merge

Change-Id: I52f28841a2c2411a331352b8d0da51ae4c7b707b
49 files changed