diff options
| author | Alan Lau <alanlau@google.com> | 2014-06-06 22:05:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-06 22:05:07 +0000 |
| commit | 8ea557f99872f075377e503c95620e4c9bc7bbe4 (patch) | |
| tree | 1cebbb30e7570e157730df707dc8c6fb5fe7cee9 /res | |
| parent | 3b2742ee456cc88f3445a6b906ef5d3d41badcb1 (diff) | |
| parent | 9e6156e36f6076d869a036f8a719b32f924ae2b9 (diff) | |
| download | android_packages_apps_UnifiedEmail-8ea557f99872f075377e503c95620e4c9bc7bbe4.tar.gz android_packages_apps_UnifiedEmail-8ea557f99872f075377e503c95620e4c9bc7bbe4.tar.bz2 android_packages_apps_UnifiedEmail-8ea557f99872f075377e503c95620e4c9bc7bbe4.zip | |
am 9e6156e3: Merge "Modify canned responses used for replying email on Wear." into ub-gmail-ur13-dev
* commit '9e6156e36f6076d869a036f8a719b32f924ae2b9':
Modify canned responses used for replying email on Wear.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index a5216cf78..e8336c48b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1093,7 +1093,9 @@ <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> <string name="reply_choice_nice">Nice</string> <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> - <string name="reply_choice_later">I\'ll get back to you later</string> + <string name="reply_on_my_way">On my way</string> + <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> + <string name="reply_choice_later">OK, let me get back to you</string> <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> <string name="reply_choice_smiling_face">:)</string> <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> @@ -1107,6 +1109,7 @@ <item>@string/reply_choice_thanks</item> <item>@string/reply_choice_i_agree</item> <item>@string/reply_choice_nice</item> + <item>@string/reply_on_my_way</item> <item>@string/reply_choice_later</item> <item>@string/reply_choice_smiling_face</item> <item>@string/reply_choice_frowning_face</item> |