am b77346ad: (-s ours) am 6b5b052e: (-s ours) Import translations. DO NOT MERGE

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