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

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