diff --git a/res/values/strings.xml b/res/values/strings.xml
index ceaedf94635..d6e52f7b7eb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2951,9 +2951,21 @@
Choose the SIM you prefer for mobile data.
- Change data SIM?
+
+ Use %1$s for mobile data?
+
- Use %1$s instead of %2$s for mobile data?
+
+ You\u0027re using %2$s for mobile data.
+ If you switch to %1$s,
+ %2$s will no longer be used for mobile
+ data.
+
+
+
+ Use %1$s
+
Update preferred SIM card?
@@ -10673,6 +10685,27 @@
disabling/enabling a SIM. The SIM is disabled in this state. [CHAR LIMIT=40] -->
Off
+
+
+ Switch to %1$s?
+
+
+
+ Only one downloaded SIM can be active at a time.\n\nSwitching to
+ %1$s won\u0027t cancel your
+ %2$s service.
+
+
+
+ Switch to %1$s
+
+
Erase SIM
diff --git a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
index 276d1fbe613..a6183e96a5b 100644
--- a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
+++ b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
@@ -93,14 +93,18 @@ public class MobileDataDialogFragment extends InstrumentedDialogFragment impleme
R.string.sim_selection_required_pref)
: nextSubInfo.getDisplayName().toString();
+ final String newName = (currentSubInfo == null)
+ ? getContext().getResources().getString(
+ R.string.sim_selection_required_pref)
+ : currentSubInfo.getDisplayName().toString();
+
return new AlertDialog.Builder(context)
- .setTitle(R.string.sim_change_data_title)
+ .setTitle(context.getString(R.string.sim_change_data_title, newName))
.setMessage(context.getString(R.string.sim_change_data_message,
- currentSubInfo != null
- ? currentSubInfo.getDisplayName()
- : "",
- previousName))
- .setPositiveButton(android.R.string.ok, this)
+ newName, previousName))
+ .setPositiveButton(
+ context.getString(R.string.sim_change_data_ok, newName),
+ this)
.setNegativeButton(R.string.cancel, null)
.create();
default: