summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-12-07 22:17:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-12-07 22:17:55 +0000
commit2976d21daa0e2fe8a68320275dabdadbf44b0439 (patch)
tree62ab5a02eeb2ba2db3ab7d6cc2509ee1fb1120d6 /res
parent6559d35aac2e300c0f5c309ca063813fb609c89a (diff)
parent532b77ef7566447d32de1c6c0ccd753f6b6660b5 (diff)
downloadandroid_packages_apps_ExactCalculator-2976d21daa0e2fe8a68320275dabdadbf44b0439.tar.gz
android_packages_apps_ExactCalculator-2976d21daa0e2fe8a68320275dabdadbf44b0439.tar.bz2
android_packages_apps_ExactCalculator-2976d21daa0e2fe8a68320275dabdadbf44b0439.zip
Merge "Clarify "Clear History" UX." into ub-calculator-euler
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml9
1 files changed, 7 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4345cd..9bb4d6c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -294,8 +294,8 @@
<string name="menu_licenses">Open source licenses</string>
<!-- Menu option to access calculation history. [CHAR_LIMIT=40] -->
<string name="menu_history">History</string>
- <!-- Menu option to clear calculation history. [CHAR_LIMIT=40] -->
- <string name="menu_clear_history">Clear history</string>
+ <!-- Menu option to clear calculation history and memory. [CHAR_LIMIT=40] -->
+ <string name="menu_clear_history">Clear</string>
<!-- Action bar title in history page. [CHAR_LIMIT=40] -->
<string name="title_history">History</string>
@@ -305,6 +305,11 @@
<!-- Title for alert dialog when calculation takes too long (timeout). [CHAR_LIMIT=30] -->
<string name="dialog_timeout">Timeout</string>
+ <!--
+ Message for alert dialog when user is about to clear history and memory. [CHAR_LIMIT=30]
+ -->
+ <string name="dialog_clear">Clear history and memory?</string>
+
<!-- Title for "current expression" in history page. [CHAR_LIMIT=40] -->
<string name="title_current_expression">Current Expression</string>
<!-- Placeholder string when there is no history to be shown. [CHAR_LIMIT=40] -->