am a68aa4e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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