Merge commit '5c20034b' into fix
Conflicts: res/values/strings.xml
This commit is contained in:
@@ -895,13 +895,6 @@
|
||||
<!-- Sound & display settings screen, setting option summary to change screen timeout -->
|
||||
<string name="screen_timeout_summary">Adjust the delay before the screen automatically turns off</string>
|
||||
|
||||
<!-- Sound & display settings screen, compatibility mode check box label -->
|
||||
<string name="compatibility_mode_title">Compatibility mode</string>
|
||||
<!-- Sound & display settings screen, compatibility mode option summary text when check box is selected -->
|
||||
<string name="compatibility_mode_summary_on">Run older applications in Compatibility mode. This requires a reboot. </string>
|
||||
<!-- Sound & display settings screen, compatibility mode option summary text when check box is clear -->
|
||||
<string name="compatibility_mode_summary_off">Run older applications in Compatibility mode. This requires a reboot. </string>
|
||||
|
||||
<!-- SIM lock settings title -->
|
||||
<string name="sim_lock_settings">SIM card lock settings</string>
|
||||
<!-- Security & location settings screen, setting option name -->
|
||||
|
||||
Reference in New Issue
Block a user