am 661dd349: (-s ours) am 02deaf45: (-s ours) Import translations. DO NOT MERGE

* commit '661dd3496c49a298da3c145110eac61766b855e0':
  Import translations. DO NOT MERGE