am 5cd144af: am 1e8a9f5f: am 0423aed7: Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev

* commit '5cd144afc66f99b4cd789286160fce38072a7d01':
  Settings: "No interruptions" -> "Total silence"
This commit is contained in:
John Spurlock
2015-04-29 14:46:19 +00:00
committed by Android Git Automerger

View File

@@ -5909,7 +5909,7 @@
<string name="zen_mode_option_alarms">Alarms only</string> <string name="zen_mode_option_alarms">Alarms only</string>
<!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] --> <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->
<string name="zen_mode_option_no_interruptions">No interruptions</string> <string name="zen_mode_option_no_interruptions">Total silence</string>
<!-- Sound & notification > Sound section: Zen mode combined summary + condition line [CHAR LIMIT=60] --> <!-- Sound & notification > Sound section: Zen mode combined summary + condition line [CHAR LIMIT=60] -->
<string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string> <string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string>