am e4e2ef8e: (-s ours) am ec930b14: (-s ours) Import translations. DO NOT MERGE

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