Merge two similar translation strings in wp-activate.php

[ramiy]

See the attached patch.

[ramiy]

This patch is:

1. Merges the two similar translation strings into one string BUT with different placeholder variables.
2. Removes $login_url var. It is being used once. I moved it into to the sprintf().
3. Adds esc_url() to all the URL's.

[SergeyBiryukov]

I think these strings are intentionally slightly different, one is for creating an account and a site, and the other is for just creating an account on the network.

Also, wp_login_url() won't work outside of switch_to_blog()/restore_current_blog() here, see [34790].

[ramiy]

@SergeyBiryukov , What do you suggest to do?

[flixos90]

Replying to SergeyBiryukov:

I think these strings are intentionally slightly different, one is for creating an account and a site, and the other is for just creating an account on the network.

I agree, I don't think this should be changed for the reason you mentioned. I would say invalid.