am 63a354ee: (-s ours) am d83484db: (-s ours) Import translations. DO NOT MERGE

* commit '63a354ee094f3e71773cbdd29359b5c28df2b9f0':
  Import translations. DO NOT MERGE