en.yml in e9_crm-0.1.20

- old
+ new

@@ -1,6 +1,10 @@
 en:
+  email_taken_title: Oops!
+  edit_conflict: "<p>This email is already attached to another contact and cannot be used.</p><p>Do you want to merge these contacts now?</p><p>Be careful!  If you have made extensive edits you may want to save first and come back to merge.</p>"
+  merge_conflict: "<p>This email is already attached to another contact and cannot be used.</p><p>Do you want to edit that contact instead?</p>"
+
   actions: Actions
   clear: Clear
   clear_all_filters: Clear All Filters
   edit_dated_costs: Edit Costs
   go: Go
@@ -39,10 +43,10 @@
       campaign_group: 
         confirm_destroy: Are you sure?  This cannot be undone.  Any campaigns which are associated with this group will become groupless.
 
     errors:
       messages:
-        merge_required: 'Merge Required! <a href="%{merge_path}">MERGE ME</a>.'
+        merge_required:
       models:
         campaign:
           not_a_number: "%{attribute} must be a number (maximum 2 decimal places)."
           attributes:
             code: