am b6d55917: (-s ours) am e965be75: (-s ours) am d6e863a1: (-s ours) Import translations. DO NOT MERGE

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