am b783fd4f: (-s ours) am 9ad6bdb9: (-s ours) Import translations. DO NOT MERGE

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