summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Klaassen <justinklaassen@google.com>2015-06-08 23:53:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-08 23:53:27 +0000
commit13eec3fe1bb885e2741210bc63c4d13f1d9a0389 (patch)
tree3b7bca12f1fb60e487df7288f2db75abc48566e7
parent8c1ec51b7afb7d52c576b79edf30e0171313974e (diff)
parent41c66a9ef9ac72fcb1dd0047c364a04c0f86044c (diff)
downloadandroid_packages_apps_ExactCalculator-13eec3fe1bb885e2741210bc63c4d13f1d9a0389.tar.gz
android_packages_apps_ExactCalculator-13eec3fe1bb885e2741210bc63c4d13f1d9a0389.tar.bz2
android_packages_apps_ExactCalculator-13eec3fe1bb885e2741210bc63c4d13f1d9a0389.zip
am 41c66a9e: Clarify "ok_remove_timeout" string description
* commit '41c66a9ef9ac72fcb1dd0047c364a04c0f86044c': Clarify "ok_remove_timeout" string description
-rw-r--r--res/values/strings.xml10
1 files changed, 9 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4e01eb4..978bb90 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -223,7 +223,15 @@
<string name="cancelled">Computation cancelled</string>
<!-- Dialog message when a computation times out. [CHAR_LIMIT=NONE] -->
<string name="timeout">Timed out. Value may be infinite or undefined.</string>
- <!-- Button label to retry a computation with a longer timeout. [CHAR_LIMIT=40] -->
+ <!--
+ Button label to allow future computations with a longer timeout.
+
+ When evaluating a result takes too long, we show a "timed out" dialog. This button allows
+ the user to increase the maximum amount of time we attempt to evaluate the expression before
+ "timing out".
+
+ [CHAR_LIMIT=40]
+ -->
<string name="ok_remove_timeout">Use longer timeouts</string>
<!-- Button label to dismiss informative text message. [CHAR_LIMIT=40] -->
<string name="dismiss">Dismiss</string>