summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaria Evdokimova <dariaevdo@google.com>2015-06-23 01:32:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-23 01:32:02 +0000
commit08cdab0a5d443ca5e3475b63af89d5a00db552a3 (patch)
treea1307a07ec0a1fbc728df2cc2b05661f618ac203 /res
parent482df3ab4dcd4a32c6a41ee624e0df29bd0f39ad (diff)
parent88c87d533bcd5bddc07a31e920432002837d0d46 (diff)
downloadandroid_packages_apps_DeskClock-08cdab0a5d443ca5e3475b63af89d5a00db552a3.tar.gz
android_packages_apps_DeskClock-08cdab0a5d443ca5e3475b63af89d5a00db552a3.tar.bz2
android_packages_apps_DeskClock-08cdab0a5d443ca5e3475b63af89d5a00db552a3.zip
am 88c87d53: am 07424a1e: Voice Interactor strings for SET_ALARM & SET_TIMER
* commit '88c87d533bcd5bddc07a31e920432002837d0d46': Voice Interactor strings for SET_ALARM & SET_TIMER
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml18
1 files changed, 17 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ffbe82fd2..36844fe2a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -965,6 +965,12 @@
-->
<string name="alarm_is_dismissed"><xliff:g id="alarm_time" example="14:20">%s</xliff:g> alarm dismissed</string>
+ <!-- String that represents that the user has dismissed an alarm through a voice action.
+ %s represents alarm time, e.g. 14:20
+ [CHAR LIMIT=NONE]
+ -->
+ <string name="alarm_is_set">Alarm is set for <xliff:g id="alarm_time" example="14:20">%s</xliff:g></string>
+
<!-- String that represents that the user attempted to send a voice action 'delete a timer'
when there were no timers available.
[CHAR LIMIT=NONE]
@@ -989,12 +995,22 @@
-->
<string name="multiple_timers_available">Unable to complete your request, multiple timers available</string>
-
<!-- String that represents that the user has successfully started a timer through a voice action.
[CHAR LIMIT=NONE]
-->
<string name="timer_started">Timer started</string>
+ <!-- String that represents that the user has successfully created a timer through a voice action.
+ [CHAR LIMIT=NONE]
+ -->
+ <string name="timer_created">Timer created</string>
+
+ <!-- String that represents that the user attempted to start a timer through a voice action
+ but specified invalid length.
+ [CHAR LIMIT=NONE]
+ -->
+ <string name="invalid_timer_length">Invalid timer length</string>
+
<!-- String that represents that the user has successfully reset a timer through a voice action.
[CHAR LIMIT=NONE]
-->