This branch adds UI strings for warning the user when a newly added pending contact has the same handshake key as another pending contact, and for helping the user to specify whether they're retrying the same pending contact (which I expect will be common) or whether they've been sent the same link by different people (which could be an attack aimed at discovering who their pending contacts are). I'm imagining the UX working as follows:
Using two dialogs is a little bit clunky, but we're not expecting users to go down the "different person" path in real life so I reckon designing a wizard with a variable number of steps is probably overkill.
Part of #1565 (closed).