am b4c5c944: (-s ours) am f9f57a86: (-s ours) Import translations. DO NOT MERGE

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