am f6ffeb44: (-s ours) am 2aae3926: (-s ours) am a3cb8d02: (-s ours) Import translations. DO NOT MERGE

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