diff --git a/res/values/strings.xml b/res/values/strings.xml
index 56f19a1..2d7d62e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -641,10 +641,17 @@
     <string name="toast_text_copied">Text copied</string>
 
     <!-- Contents of the alert dialog when the user hits the Cancel button in the editor [CHAR LIMIT=128] -->
-    <string name="cancel_confirmation_dialog_message">Discard your changes?</string>
+    <string name="cancel_confirmation_dialog_message">Discard your changes and quit editing?</string>
 
-    <!-- Positive button text of the alert dialog when the user hits the Cancel button in the editor [CHAR LIMIT=40] -->
-    <string name="cancel_confirmation_dialog_message_positive_button">Discard</string>
+    <!-- Positive button text for the cancel editing confirmation dialog.
+      Pushing this button indicates that the user wishes to discard the changes they have already
+      made and close the editor. [CHAR LIMIT=50] -->
+    <string name="cancel_confirmation_dialog_cancel_editing_button">Discard changes</string>
+
+    <!-- Negative button text for the cancel editing confirmation dialog.
+      Pushing this button indicates that the user wishes to continue editing
+      and return to the editor [CHAR LIMIT=40] -->
+    <string name="cancel_confirmation_dialog_keep_editing_button">Keep editing</string>
 
     <!-- Description of a call log entry, made of a call type and a date -->
     <string name="call_type_and_date">
diff --git a/src/com/android/contacts/editor/CancelEditDialogFragment.java b/src/com/android/contacts/editor/CancelEditDialogFragment.java
index 6780578..ba5f9fa 100644
--- a/src/com/android/contacts/editor/CancelEditDialogFragment.java
+++ b/src/com/android/contacts/editor/CancelEditDialogFragment.java
@@ -46,7 +46,7 @@
         return new AlertDialog.Builder(getActivity())
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(R.string.cancel_confirmation_dialog_message)
-                .setPositiveButton(R.string.cancel_confirmation_dialog_message_positive_button,
+                .setPositiveButton(R.string.cancel_confirmation_dialog_cancel_editing_button,
                         new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialogInterface, int which) {
@@ -55,7 +55,7 @@
                             }
                         }
                 )
-                .setNegativeButton(android.R.string.cancel, null)
+                .setNegativeButton(R.string.cancel_confirmation_dialog_keep_editing_button, null)
                 .create();
     }