am ff3f0bab: (-s ours) am 53c5f87a: (-s ours) am 3d2927cb: (-s ours) Import translations. DO NOT MERGE

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