am cdf00b16: (-s ours) am 1538dde4: (-s ours) Import translations. DO NOT MERGE

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