Merge "Merge "Revert "Add extra strings for 'tomorrow' text"" into pi-dev am:...

    <string name="power_discharge_by">Should last until about <xliff:g id="time">%1$s</xliff:g> (<xliff:g id="level">%2$s</xliff:g>)</string>

    <!-- [CHAR_LIMIT=100] Label for estimated time that phone will run out of battery -->

    <string name="power_discharge_by_only">Should last until about <xliff:g id="time">%1$s</xliff:g></string>

    <!-- [CHAR_LIMIT=100] Label for enhanced estimated time that phone will run out of battery tomorrow-->

    <string name="power_discharge_by_tomorrow_enhanced">Should last until about <xliff:g id="time">%1$s</xliff:g> tomorrow based on your usage (<xliff:g id="level">%2$s</xliff:g>)</string>

    <!-- [CHAR_LIMIT=100] Label for enhanced estimated time that phone will run out of battery tomorrow with no percentage -->

    <string name="power_discharge_by_tomorrow_only_enhanced">Should last until about <xliff:g id="time">%1$s</xliff:g> tomorrow based on your usage</string>

    <!-- [CHAR_LIMIT=100] Label for estimated time that phone will run out of battery tomorrow -->

    <string name="power_discharge_by_tomorrow">Should last until about <xliff:g id="time">%1$s</xliff:g> tomorrow (<xliff:g id="level">%2$s</xliff:g>)</string>

    <!-- [CHAR_LIMIT=100] Label for estimated time that phone will run out of battery tomorrow-->

    <string name="power_discharge_by_tomorrow_only">Should last until about <xliff:g id="time">%1$s</xliff:g> tomorrow</string>

    <!-- [CHAR_LIMIT=60] label for estimated remaining duration of battery when under a certain amount -->

    <string name="power_remaining_less_than_duration_only">Less than <xliff:g id="threshold">%1$s</xliff:g> remaining</string>