am c0498333: (-s ours) am 4e4ef211: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'c0498333d7a836f24ea72934e9d8d118a273b324':
  Import translations. DO NOT MERGE