Merge branch 'readonly-p4-donut' into donut

This commit is contained in:
Eric Fischer
2009-04-13 09:01:43 -07:00
committed by The Android Open Source Project

View File

@@ -234,9 +234,9 @@
<string name="date_time_12_hour_sample">1:00 pm</string>
<!-- Date/time settings. Summary of the checkbox for choosing between 12 hour time or 24 hour time. Sample of 24-hour time -->
<string name="date_time_24_hour_sample">13:00</string>
<!-- Do not translate. Title to change time -->
<!-- Title of the dialog for setting the time. -->
<string name="date_time_changeTime_text">Change time</string>
<!-- Do not translate. Title to change date -->
<!-- Title of the dialog for setting the date. -->
<string name="date_time_changeDate_text">Date</string>
<!-- The title of the activity to pick a time zone. -->
<string name="choose_timezone">Select time zone</string>