am 46fc16f2: (-s ours) am 6ac23953: (-s ours) Import translations. DO NOT MERGE

* commit '46fc16f209161bc99dc69ba835f99cda5b085aeb':
  Import translations. DO NOT MERGE