am 3d1d7a77: (-s ours) am 66838ce1: (-s ours) am cc665090: (-s ours) Import translations. DO NOT MERGE

* commit '3d1d7a77dd391815f1fc9b4efcae2b78675216d5':
  Import translations. DO NOT MERGE