am de7ae659: (-s ours) am 91dd0872: (-s ours) Import translations. DO NOT MERGE

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