am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE

* commit '05facd935a44d882ca6f5e0ee7b3b1cffd1c0ad4':
  Import translations. DO NOT MERGE