am 4eca5bf2: (-s ours) am df2a5a39: (-s ours) Import translations. DO NOT MERGE

* commit '4eca5bf20056f63c30881e7114970840be6fb36e':
  Import translations. DO NOT MERGE