am a377ea1c: (-s ours) am 130fc5ca: (-s ours) Import translations. DO NOT MERGE

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