am fbea9637: (-s ours) am 9ce3a1f1: (-s ours) Import translations. DO NOT MERGE

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