Removes MSN Messenger from profile (and a few other places)

[rahaeli]

Fixes #918. Turns out MSN Messenger was referenced in a bunch of places
other than just the profile (most specifically, the directory and in
multisearch.bml) so this gets most of it, including no longer trying
to import MSN details from LJ when importing from LJ. Tested lightly
but not exhaustively, but it doesn't seem to break anything. (Knock wood.)

[zorkian]

Can you add the text you removed to deadphrases.dat so that it gets purged from the translation interface?

[rahaeli]

Added. I tried to fix the merge conflict but it didn't work, sigh.

[zorkian]

You'll need to drop the htdocs. These should just be like,

general /manage/profile/index.bml.chat.msnusername

[zorkian]

Well, as a suggestion, don't make a new branch. You've already got the branch open -- you can just keep editing the same branch. Make a new commit. Then push it again.

I don't know exactly what flow you use, but maybe it looks something like:

git fetch dreamwidth
git pull --rebase dreamwidth develop
git checkout -b newbranchname
# make some changes
git add stuff
git commit
git push origin newbranchname
# make pull request

To make changes, you would just do the last half:

git checkout newbranchname
# make some changes
git add stuff
git commit
git push origin newbranchname
# pull request is automatically updated! you don't have to do anything

Conceptually, you want to keep working on the same branch. You don't want to create a new one and merge it in, that's going to probably cause issues (like this merge conflict).

[rahaeli]

Yeah, that was what I did the first time, but Github told me it had a merge conflict and gave me a set of steps to take to fix it. Which I did, and it didn't work.

[afuna]

May I suggest making a new branch off of develop, and then basically redoing this?

That is:

# create and move to the new branch
git checkout develop -b new-branch

# pull the initial commit into your branch
git cherry-pick 4f559bc94dddf4b1e42d8c69294e75a83debc983

and now since you're starting from the latest develop, instead of worrying about merging, just brute force it and make another commit with the addition to deadphrases.dat.

(I'm assuming the merge conflict was because someone had made changes to deadphrases.dat in between the time you started your branch and the time that it was reviewed)