Use the terms "Link and Unlink" instead of "Merge and separate".

BUG 24704875

Change-Id: I466907482434c0312f8ab922cdfa5e2e82ec4637
5 files changed