am 4934f7cf: (-s ours) am c394aec2: (-s ours) Import translations. DO NOT MERGE

* commit '4934f7cfd5a2d48b898265081d5d18bf92579b39':
  Import translations. DO NOT MERGE