CANNOT_MERGE_SAME duplicate entry

[ashishpatel1992]

CANNOT_MERGE_SAME duplicate entry removed

[rmcgirr83]

The purpose of that lang entry is in case an admin tries to merge the same user (same user id). Nothing to do with trying to merge himself. It is not a duplicate entry in the lang file.

[ashishpatel1992]

For both of them keys are same, they should have different keys for different text.

'CANNOT_MERGE_SAME'			=> 'You can’t merge and delete the same user.',
'CANNOT_MERGE_SAME'			=> 'You cannot merge the user account <strong>%s</strong> with itself.',

[rmcgirr83]

Please look again. They are not the same keys.

[ashishpatel1992]

See this

[rmcgirr83]

I missed that one and you are quite right. I don't have access to the repo on here anymore to make the merge of your commit.

[ashishpatel1992]

@rmcgirr83 I think someone from phpbbmodders would accept this merge