am 6689bfb3: (-s ours) am fda0172a: (-s ours) Import translations. DO NOT MERGE

* commit '6689bfb3502e608189e5b6a3969c4b1847dbe7fe':
  Import translations. DO NOT MERGE