am 044029b1: (-s ours) am cf5c527c: (-s ours) Import translations. DO NOT MERGE

* commit '044029b1d71299b847f708dc362e5a1c1dfbf934':
  Import translations. DO NOT MERGE