i18n KeyConflictDialogue

// FREEBIE

_locales/en/messages.json

@@ -1,4 +1,10 @@
 {
+    "verifyContact": {
+      "message": "You may wish to <span class='verify'>verify</span> this contact."
+    },
+    "acceptNewKey": {
+      "message": "Accept new key"
+    },
     "verify": {
       "message": "Verify"
     },

background.html

@@ -290,12 +290,10 @@
   <script type='text/x-tmpl-mustache' id='key-conflict-dialogue'>
     <div class='content'>
       <p> {{ message }} </p>
+      <p> {{ verifyContact }} </p>
       <p>
-        You may wish to <span class='verify'>verify</span> this contact.
+        <button class='cancel'>{{ cancel }}</button>
-      </p>
+        <button class='resolve'>{{ resolve }}</button>
-      <p>
-        <button class='cancel'>Cancel</button>
-        <button class='resolve'>Accept new key</button>
       </p>
     </div>
   </script>

js/views/key_conflict_dialogue_view.js

@@ -32,7 +32,12 @@
             this.conversation.resolveConflicts(this.model);
         },
         render_attributes: function() {
-            return this.model;
+            return {
+                message: this.model.message,
+                cancel: i18n('cancel'),
+                resolve: i18n('acceptNewKey'),
+                verifyContact: i18n('verifyContact')
+            };
         }
     });
 })();