am 355bf30e: (-s ours) am c8b350fd: (-s ours) Import translations. DO NOT MERGE

* commit '355bf30e57e10c4c21f193fcaa99fa9016bafe26':
  Import translations. DO NOT MERGE