am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev

* commit '5c0d0729b1701428d46ee7abb31f2a83d8da38ab':
  Start cleaning up percentage formatting in Settings.
This commit is contained in:
Elliott Hughes
2014-09-08 23:39:56 +00:00
committed by Android Git Automerger
9 changed files with 95 additions and 114 deletions

View File

@@ -3808,8 +3808,6 @@
<string name="power_discharge_remaining"><xliff:g id="remain">%1$s</xliff:g> remaining</string>
<!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
<string name="power_charge_remaining"><xliff:g id="until_charged">%1$s</xliff:g> to charge</string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when discharging -->
<string name="power_discharging"><xliff:g id="level">%1$d</xliff:g>%%</string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->
<string name="power_discharging_duration"><xliff:g id="level">%1$d</xliff:g>%%
- approx. <xliff:g id="time">%2$s</xliff:g> left</string>
@@ -5151,9 +5149,6 @@
<!-- Button label for cancelling the new-password operation and retaining the user's previous full-backup password -->
<string name="backup_pw_cancel_button_text">Cancel</string>
<!-- Representation of a numerical percentage. [CHAR LIMIT=8] -->
<string name="percentage"><xliff:g id="number" example="30">%d</xliff:g>%%</string>
<!-- A menu item in "About phone" that allows the user to update the phone with settings
from their cell phone carrier. The use of the string is similar to the string
"system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->