am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE

* commit '54e55fee195e146935b86ae4fc9c253a8f7001f4':
  Import translations. DO NOT MERGE