am 29f7a858: (-s ours) am 9014214d: (-s ours) Import translations. DO NOT MERGE

* commit '29f7a858f752c4a253cc2f87481e4bfc3f363627':
  Import translations. DO NOT MERGE