am 6fc0c669: (-s ours) am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '6fc0c6690ed00dbc7b3dd1a6a4dd0ce8b7dc8959':
  Import translations. DO NOT MERGE