am e3097e68: (-s ours) am 2f0660b4: (-s ours) Import translations. DO NOT MERGE

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