am f8dd1c80: (-s ours) am 308f3e36: Import translations. DO NOT MERGE

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