am e4fe339d: (-s ours) am 11b58817: (-s ours) Import translations. DO NOT MERGE

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