diff --git a/res/values/strings.xml b/res/values/strings.xml
index 270041d7d70..ea9f6cad32e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -630,6 +630,12 @@
     <!-- Warning string that will be displayed when encryption cannot be started -->
     <string name="crypt_keeper_unplugged_text">Please plug in your charger and try again.</string>
 
+    <!-- Dialog title, shown when encryption cannot proceed because a PIN/Password is needed -->
+    <string name="crypt_keeper_dialog_need_password_title">No lock screen PIN or password</string>
+    <!-- Dialog message, shown when encryption cannot proceed because a PIN/Password is needed -->
+    <string name="crypt_keeper_dialog_need_password_message">You must set a lock screen PIN or
+    password before you can start encryption.</string>
+
     <!-- Title of the final confirmation screen before starting device encryption -->
     <string name="crypt_keeper_confirm_title">Confirm encryption</string>
     <!-- Warning text in the final confirmation screen before starting device encryption -->
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index 02982b7a3ab..01ef3f2b9e5 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -91,11 +91,11 @@ public class CryptKeeperSettings extends Fragment {
 
         public void onClick(View v) {
             if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
-                // TODO remove with proper flow
+                // TODO replace (or follow) this dialog with an explicit launch into password UI
                 new AlertDialog.Builder(getActivity())
-                    .setTitle("No password set")
+                    .setTitle(R.string.crypt_keeper_dialog_need_password_title)
                     .setIcon(android.R.drawable.ic_dialog_alert)
-                    .setMessage("Before you enable encryption you must set a device password.")
+                    .setMessage(R.string.crypt_keeper_dialog_need_password_message)
                     .setPositiveButton(android.R.string.ok, null)
                     .create()
                     .show();