am ee4a1fe6: (-s ours) am 61283a85: (-s ours) Import translations. DO NOT MERGE

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