am 7a14a015: (-s ours) am 68b17a1a: (-s ours) Import translations. DO NOT MERGE

* commit '7a14a01549486bb0a6d505d68bd9b83fdfd327bf':
  Import translations. DO NOT MERGE