am 0dcb7092: (-s ours) am 0d725fbe: (-s ours) Import translations. DO NOT MERGE

* commit '0dcb70922a777e0f12629cb6c1229f52c35eeace':
  Import translations. DO NOT MERGE