diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-06-11 16:56:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-10 22:18:15 +0000 |
| commit | 782d0f689106aed05de80e93948f9e7b30701601 (patch) | |
| tree | 2b82c896c91f0bfcbf235b8fd73327d0258a2c3d /res | |
| parent | 1c3203e83efed2d5c257da8e4f5fba4844b6fa47 (diff) | |
| parent | a7a62c5b66189f114a8ad41c53bbe0bb00ae1e90 (diff) | |
| download | packages_apps_Settings-782d0f689106aed05de80e93948f9e7b30701601.tar.gz packages_apps_Settings-782d0f689106aed05de80e93948f9e7b30701601.tar.bz2 packages_apps_Settings-782d0f689106aed05de80e93948f9e7b30701601.zip | |
Merge "Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels" into lmp-preview-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 6b148f875..8ddde4444 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3565,16 +3565,6 @@ <string name="battery_stats_phone_signal_label">Mobile network signal</string> <!-- Battery usage during last unplugged period --> <string name="battery_stats_last_duration">@string/menu_stats_last_unplugged</string> - <!-- [CHAR_LIMIT=5] Label for an hour time when using 24 hour mode --> - <string name="battery_stats_hour_24_label"><xliff:g id="time">%1$d</xliff:g>:00</string> - <!-- [CHAR_LIMIT=5] Label for an hour time when using 12 hour mode in the AM --> - <string name="battery_stats_hour_am_label"><xliff:g id="time">%1$d</xliff:g> AM</string> - <!-- [CHAR_LIMIT=5] Label for an hour time when using 12 hour mode in the PM --> - <string name="battery_stats_hour_pm_label"><xliff:g id="time">%1$d</xliff:g> PM</string> - <!-- [CHAR_LIMIT=3] Label for date of day and month (not year) when the day is shown first --> - <string name="battery_stats_date_day_first_label"><xliff:g id="day">%1$d</xliff:g>/<xliff:g id="month">%2$d</xliff:g></string> - <!-- [CHAR_LIMIT=3] Label for date of day and month (not year) when the month is shown first --> - <string name="battery_stats_date_month_first_label"><xliff:g id="month">%2$d</xliff:g>/<xliff:g id="day">%1$d</xliff:g></string> <!-- CPU awake time title --> <string name="awake">Device awake time</string> <!-- Wifi on time --> |