resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev

[android-x86/packages-apps-Settings.git] / res / values / strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ca39374..d8bf0e0 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5494,8 +5494,6 @@
     <string name="sim_editor_number">Number</string>
     <!-- Color label of Sim Editor.  [CHAR LIMIT=40] -->
     <string name="sim_editor_color">SIM color</string>
-    <!-- Display label numbers of Sim Editor.  [CHAR LIMIT=40] -->
-    <string name="sim_editor_num_format">Display numbers</string>
     <!-- Select label Title of Sim Editor.  [CHAR LIMIT=40] -->
     <string name="sim_card_select_title">Select SIM card</string>
     <!-- Orange label.  [CHAR LIMIT=40] -->
@@ -5910,6 +5908,12 @@
     <!-- [CHAR LIMIT=70] Don't rotate when screen is turned option -->
     <string name="display_auto_rotate_stay_in_current">Stay in current orientation</string>
 
+    <!-- Title and summary for SIM Status -->
+    <!-- Title for IMEI preference [CHAR LIMIT=30] -->
+    <string name="imei_information_title">IMEI information</string>
+    <!-- Description for IMEI preference [CHAR LIMIT=40] -->
+    <string name="imei_information_summary">IMEI relative information</string>
+
     <!-- Encryption interstitial title [CHAR LIMIT=30] -->
     <string name="encryption_interstitial_header">Encryption</string>