am db211693: (-s ours) am 8aa955dc: (-s ours) Import translations. DO NOT MERGE

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