Titles changed to be more descriptive.
Crash fixed when selecting a file with no base in the "Resolve merge conflicts" dialog. Closes #2463
Revert "Titles changed to be more descriptive."

This reverts commit 2fabac802d9f5cdf14129cde6cc4da2aa8959db2.
Merge branch 'release/2.48' of github.com:gitextensions/gitextensions into release/2.48