am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev

* commit 'bdedbb851699016a70eafdb82b038240646358c8':
  Changing settings UI changes related to strings to be displayed
This commit is contained in:
Sanket Padawe
2014-10-20 20:51:07 +00:00
committed by Android Git Automerger
2 changed files with 12 additions and 6 deletions

View File

@@ -5499,7 +5499,7 @@
<!-- Name label of Sim Editor. [CHAR LIMIT=40] -->
<string name="sim_editor_name">SIM name</string>
<!-- Title label of Sim Editor. [CHAR LIMIT=40] -->
<string name="sim_editor_title">SIM card</string>
<string name="sim_editor_title">SIM slot %1$d</string>
<!-- Carrier label of Sim Editor. [CHAR LIMIT=40] -->
<string name="sim_editor_carrier">Carrier</string>
<!-- Number label of Sim Editor. [CHAR LIMIT=40] -->
@@ -5534,7 +5534,7 @@
<string name="preferred_network_offload_popup">Disabling Network Name Broadcast will prevent automatic connection to hidden networks.</string>
<!-- This is a divider in the SIM cards preferences that is the header of various settings where the user chooses which SIM to use for phone calls, data, and SMS messages [CHAR LIMIT=50] -->
<string name="sim_pref_divider">Activities</string>
<string name="sim_pref_divider">Preferred SIM for</string>
<!-- When a user chooses this "Ask first" preference for the SIM to use for phone calls, they'll be prompted to choose a SIM every time they initiate a call [CHAR LIMIT=50] -->
<string name="sim_calls_ask_first_prefs_title">Ask first</string>
<!-- When a SIM preference hasn't been selected yet, this string is displayed as the pref summary until the user chooses a SIM subscription from the preference list [CHAR LIMIT=50] -->