am ee9a2cbc: (-s ours) am 1177cdec: (-s ours) Import translations. DO NOT MERGE

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