am 54fbb3a6: (-s ours) am e8137079: (-s ours) Import translations. DO NOT MERGE

* commit '54fbb3a63e7dcb2afa9480e08263d8f0e991daee':
  Import translations. DO NOT MERGE