am 738ad8f5: (-s ours) am 88b88fc5: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '738ad8f5b34758ee768bdc213caf4e4e994b0d06':
  Import translations. DO NOT MERGE