summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/layout/display.xml1
-rw-r--r--res/values/strings.xml9
2 files changed, 9 insertions, 1 deletions
diff --git a/res/layout/display.xml b/res/layout/display.xml
index 52182a4..6500dfe 100644
--- a/res/layout/display.xml
+++ b/res/layout/display.xml
@@ -57,6 +57,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/formula"
+ android:singleLine="true"
android:textColor="@color/display_result_text_color" />
</RelativeLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 685e7be..4e01eb4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -206,7 +206,14 @@
<string name="error_aborted">Aborted</string>
<!-- Error displayed when excessive precision is required. [CHAR_LIMIT=20] -->
<string name="error_overflow">Infinite?</string>
- <!-- Error displayed when division by zero is detected. [CHAR_LIMIT=20] -->
+ <!--
+ Error displayed when division by zero is detected.
+
+ If the translation does not fit within the given limit, then a shortened version must
+ be used, e.g. "Division by 0". Exceeding the limit will result in a truncated string.
+
+ [CHAR_LIMIT=20]
+ -->
<string name="error_zero_divide">Can\'t divide by 0</string>
<!-- Toast shown when text is copied to the clipboard. [CHAR_LIMIT=40] -->