am cd6e6034: (-s ours) am d0d54fc1: (-s ours) Import translations. DO NOT MERGE

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