am f6eb12f4: (-s ours) Import translations. DO NOT MERGE

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