am 2633ebc9: (-s ours) am 85a283f2: Import translations. DO NOT MERGE

* commit '2633ebc91a0f5ccb419788fa17d2fb2e7a4df0f5':
  Import translations. DO NOT MERGE