am c815ddc2: (-s ours) am 9d4f29d2: (-s ours) Import translations. DO NOT MERGE

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