am e699d8bf: (-s ours) am 5c68e5f0: Import translations. DO NOT MERGE

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