am e4608469: (-s ours) am a817a6af: (-s ours) am 20bfdeb1: (-s ours) Import translations. DO NOT MERGE

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