am 110a58ff: (-s ours) am 693abd31: Import translations. DO NOT MERGE

* commit '110a58ff5d7b58b4a6a1711aeb74199be16e6933':
  Import translations. DO NOT MERGE