am eba4fb66: (-s ours) am e0659df8: (-s ours) Import translations. DO NOT MERGE

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