am e30461c0: (-s ours) am 60835d4b: (-s ours) Import translations. DO NOT MERGE

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