Different Bible translations use different conventions; some have made the distinction that theo mentions in #7 and others haven't, just as some German Bibles have written HErr, and others haven't. It might indeed be helpful to have two entries with explanations in italics, like
the Lord [rel.] - der Herr (Gott oder Jesus)
the LORD [rel.] - der HErr (Gott)
But the existing entry with 'Christus' should indeed be deleted, because it's a mistranslation; it substitutes one title for another. Either way, whether you write LORD or Lord, HErr or Herr, the word Christ means Christus, and the word Lord means Herr; the two are simply different titles.
Lord/Herr, as we know, means something like master, ruler, sir, sire ...
Christ/Christus means the anointed one, and by implication in Jewish and Christian contexts, the Messiah. It is not a name and does not literally mean God.
Even though Lord/Herr is used in the Bible for either God the Creator or Jesus, there's no reason to translate Lord/Herr as Christ/Christus. In fact, it would be simply wrong, since the two titles have different meanings.
It may help to think of other titles that refer to the same person or being. For example, we can refer to God/Allah as 'the All-Merciful' and 'the All-Knowing,' but it would be wrong to translate one with the other; the words themselves don't have the same meaning, and it would be wrong to substitute one for another.
Similarly, in the days of monarchies, a character might address a king as 'sire' or as 'my liege,' but one is not the translation of the other, because 'my liege' expresses a specific meaning, namely, the vassal relationship.
Or on a more prosaic level, you can refer to your neighbor as Max, or as Mr. Müller, or as 'my neighbor.' You can even call him 'neighbor,' as in 'Hi, neighbor, haven't seen you for a while.' But if a German text has 'Guten Tag, Herr Müller,' it would be wrong to translate it as 'Hi, neighbor' in English.
In fact, haven't we already had this discussion before?