am ccde6e31: (-s ours) am 4d68b619: (-s ours) Import translations. DO NOT MERGE

* commit 'ccde6e31586361f3ab052cf2da89ecec77e4e823':
  Import translations. DO NOT MERGE