am 3d4583df: (-s ours) am 05660914: (-s ours) Import translations. DO NOT MERGE

* commit '3d4583dfbe9ecf30510f9e8fc3f75e40fbf929d8':
  Import translations. DO NOT MERGE