am 37c36291: (-s ours) am 1c79e7da: (-s ours) Import translations. DO NOT MERGE

* commit '37c36291f3b7c089bba44a41d9c371956af67cad':
  Import translations. DO NOT MERGE