am f3381a80: (-s ours) am f23da91e: (-s ours) Import translations. DO NOT MERGE

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