am a371f3eb: (-s ours) am edaa63a3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

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