1 files changed, 114 insertions, 0 deletions
diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
index db555323c1..65e02870d6 100644
--- a/filter/libfilter-i18n.h
+++ b/filter/libfilter-i18n.h
@@ -1,11 +1,32 @@
 /* Automatically generated. Do not edit. */
+<<<<<<< libfilter-i18n.h
+<<<<<<< libfilter-i18n.h
+<<<<<<< libfilter-i18n.h
+char *s = N_("after");
+=======
+char *s = N_("Answered");
+>>>>>>> 1.7
+=======
+char *s = N_("after");
+>>>>>>> 1.11
+=======
+>>>>>>> 1.13
 char *s = N_("Assign Colour");
 char *s = N_("Assign Score");
 char *s = N_("Copy to Folder");
 char *s = N_("Date received");
 char *s = N_("Date sent");
 char *s = N_("Delete");
+<<<<<<< libfilter-i18n.h
+<<<<<<< libfilter-i18n.h
+<<<<<<< libfilter-i18n.h
+=======
+char *s = N_("Deleted");
+char *s = N_("Draft");
+=======
+>>>>>>> 1.13
 char *s = N_("Expression");
+char *s = N_("Flagged");
 char *s = N_("Forward to Address");
 char *s = N_("Mailing list");
 char *s = N_("Message Body");
@@ -13,16 +34,108 @@ char *s = N_("Message Header");
 char *s = N_("Message was received");
 char *s = N_("Message was sent");
 char *s = N_("Move to Folder");
+<<<<<<< libfilter-i18n.h
+char *s = N_("Priority");
+=======
+>>>>>>> 1.13
 char *s = N_("Recipients");
 char *s = N_("Regex Match");
+<<<<<<< libfilter-i18n.h
+char *s = N_("Seen");
+=======
 char *s = N_("Score");
+>>>>>>> 1.13
 char *s = N_("Sender");
+<<<<<<< libfilter-i18n.h
+char *s = N_("Set Flag");
+=======
 char *s = N_("Set Status");
+>>>>>>> 1.13
 char *s = N_("Source");
 char *s = N_("Specific header");
+<<<<<<< libfilter-i18n.h
+=======
+char *s = N_("Status");
+>>>>>>> 1.13
+char *s = N_("Stop Processing");
+char *s = N_("Subject");
+<<<<<<< libfilter-i18n.h
+char *s = N_("after");
+char *s = N_("before");
+char *s = N_("contains");
+>>>>>>> 1.7
+char *s = N_("does not contain");
+char *s = N_("does not end with");
+char *s = N_("does not exist");
+char *s = N_("does not sound like");
+char *s = N_("does not start with");
+char *s = N_("ends with");
+char *s = N_("exists");
+=======
+char *s = N_("does not contain");
+char *s = N_("does not end with");
+char *s = N_("does not exist");
+char *s = N_("does not sound like");
+char *s = N_("does not start with");
+char *s = N_("ends with");
+char *s = N_("exists");
+>>>>>>> 1.11
+char *s = N_("Expression");
+char *s = N_("Forward to Address");
+<<<<<<< libfilter-i18n.h
+char *s = N_("is");
+char *s = N_("is greater than");
+char *s = N_("is less than");
+char *s = N_("is not");
+<<<<<<< libfilter-i18n.h
+char *s = N_("matches regex");
+=======
+char *s = N_("is");
+char *s = N_("is greater than");
+char *s = N_("is less than");
+char *s = N_("is not");
+>>>>>>> 1.11
+char *s = N_("Message Body");
+char *s = N_("Message was received");
+char *s = N_("Message was sent");
+char *s = N_("Move to Folder");
+<<<<<<< libfilter-i18n.h
+=======
+char *s = N_("is");
+>>>>>>> 1.8
+char *s = N_("on or after");
+char *s = N_("on or before");
+<<<<<<< libfilter-i18n.h
+=======
+char *s = N_("on or after");
+char *s = N_("on or before");
+>>>>>>> 1.11
+char *s = N_("Priority");
+char *s = N_("Recipients");
+<<<<<<< libfilter-i18n.h
+=======
+char *s = N_("Regex Match");
+>>>>>>> 1.11
+char *s = N_("Sender");
+<<<<<<< libfilter-i18n.h
+=======
+char *s = N_("Set Status");
+char *s = N_("sounds like");
+>>>>>>> 1.11
+char *s = N_("Source");
+char *s = N_("Specific header");
+<<<<<<< libfilter-i18n.h
+=======
+char *s = N_("sounds like");
+>>>>>>> 1.7
+char *s = N_("starts with");
+=======
+char *s = N_("starts with");
 char *s = N_("Status");
+>>>>>>> 1.11
 char *s = N_("Stop Processing");
 char *s = N_("Subject");
+=======
 char *s = N_("after");
 char *s = N_("before");
 char *s = N_("contains");
@@ -41,5 +154,6 @@ char *s = N_("on or after");
 char *s = N_("on or before");
 char *s = N_("sounds like");
 char *s = N_("starts with");
+>>>>>>> 1.13
 char *s = N_("was after");
 char *s = N_("was before");