[meld] Mark merge descriptors for translation

[Kai Willadsen <kaiw src gnome org>]

commit 8a6ba2eb1b548caca7a36d4f3408f08a82036e49
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Mar 9 08:04:49 2013 +1000

    Mark merge descriptors for translation

 meld/vc/_vc.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index f517628..8bd05ed 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -42,9 +42,10 @@ CONFLICT_REMOTE, CONFLICT_MAX = list(range(5))
 CONFLICT_OTHER = CONFLICT_REMOTE
 CONFLICT_THIS = CONFLICT_LOCAL
 
-conflicts = ["Merged", "Base", "Local", "Remote"]
+conflicts = [_("Merged"), _("Base"), _("Local"), _("Remote")]
 assert len(conflicts) == CONFLICT_MAX
 
+
 class Entry(object):
     # These are the possible states of files. Be sure to get the colons correct.
     states = _("Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:Not 
present").split(":")