am 8ee8b379: (-s ours) am e182fa77: (-s ours) Import translations. DO NOT MERGE

* commit '8ee8b37933b52d8f495cb9317b02f4843aa090bb':
  Import translations. DO NOT MERGE