am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit 'ba38155d257aa00e0dabb9cf9eefc1a281278a14':
  Fix issue #23037720: New Battery Optimization Strings
This commit is contained in:
Dianne Hackborn
2015-08-11 00:11:09 +00:00
committed by Android Git Automerger

View File

@@ -6743,12 +6743,12 @@
</plurals>
<!-- Title of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
<string name="high_power_prompt_title">Ignore battery optimizations</string>
<string name="high_power_prompt_title">Ignore battery optimizations?</string>
<!-- Body text of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
<string name="high_power_prompt_body">Allow
<xliff:g id="app_name" example="Settings">%1$s</xliff:g> to stay connected in the
background (may use more battery)?</string>
<string name="high_power_prompt_body">Let app
<xliff:g id="app_name" example="Settings">%1$s</xliff:g> stay connected in the
background? This may use more battery.</string>
<!-- Summary of power usage for an app [CHAR LIMIT=NONE] -->
<string name="battery_summary"><xliff:g id="percentage" example="2">%1$d</xliff:g>%% use since last full charge</string>