am d274b361: (-s ours) am 393da3d2: (-s ours) Import translations. DO NOT MERGE

* commit 'd274b3614ea32c8f0083ad43640335aae6e68348':
  Import translations. DO NOT MERGE