am 8bd345f9: (-s ours) am 4a71ff87: (-s ours) Import translations. DO NOT MERGE

* commit '8bd345f90d27d88a7929b874efd6fa57c0c38146':
  Import translations. DO NOT MERGE