am f858d629: (-s ours) am f9271f67: (-s ours) Import translations. DO NOT MERGE

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