[meld] Remove markup from message in VC backend

[Kai Willadsen <kaiw src gnome org>]

commit 84152483ffe653a255c57de728ecd9f66a55c4d3
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Oct 7 08:38:43 2010 +1000

    Remove markup from message in VC backend

 meld/vc/_vc.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 16accf1..1d1f697 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -37,8 +37,10 @@ STATE_MISSING, STATE_MAX = range(12)
 
 class Entry(object):
     # These are the possible states of files. Be sure to get the colons correct.
-    states = _("Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:Missing").split(":")
+    states = _("Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing").split(":")
+    states[STATE_CONFLICT] = "<b>%s</b>" % states[STATE_CONFLICT]
     assert len(states)==STATE_MAX
+
     def __init__(self, path, name, state):
         self.path = path
         self.state = state