diff options
| author | Patrick Scott <phanna@android.com> | 2010-09-22 09:17:29 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2010-09-28 09:12:44 -0400 |
| commit | 4d42d3ded6e3d46f5c9d0511ec0f0c26c9fef705 (patch) | |
| tree | 76430f37228e722e66e1ca0e9c1b87e95c50efb4 /res/values-rm | |
| parent | 9e32fed582019546b0d380c28a40961c77fc303e (diff) | |
| download | android_packages_apps_DeskClock-4d42d3ded6e3d46f5c9d0511ec0f0c26c9fef705.tar.gz android_packages_apps_DeskClock-4d42d3ded6e3d46f5c9d0511ec0f0c26c9fef705.tar.bz2 android_packages_apps_DeskClock-4d42d3ded6e3d46f5c9d0511ec0f0c26c9fef705.zip | |
Manually merge the following commit:
Handle the new set alarm intent.
Enable a few options by default and check for duplicates.
Also remove the previous public provider for setting alarms since we went with a
different approach.
Change-Id: I6c99e9729caad0c6f99f1a18d4a7599ad9bb2c9b
Diffstat (limited to 'res/values-rm')
| -rw-r--r-- | res/values-rm/strings.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index dbb4d5da4..9f77ddc36 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -115,10 +115,6 @@ <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="7517010911981312358">"Infurmaziuns davart l\'aura n\'èn betg diponiblas en il mument."</string> <string name="menu_item_dock_settings" msgid="3524235151132971114">"Parameters da la basa"</string> - <!-- no translation found for permission_provider (1285718676421141062) --> - <skip /> - <!-- no translation found for permission_provider_desc (8795064961509550253) --> - <skip /> <!-- no translation found for alarm_klaxon_service_desc (2153290655559916468) --> <skip /> </resources> |