am 5b6c1af3: (-s ours) am 29e5c899: Import translations. DO NOT MERGE

* commit '5b6c1af304e9250fdca2141783c02832f02ec900':
  Import translations. DO NOT MERGE