am bf6cc3da: (-s ours) am cf5c527c: (-s ours) Import translations. DO NOT MERGE

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