am aaadf294: (-s ours) am 2790a98c: (-s ours) Import translations. DO NOT MERGE

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