merge in nakasi-factoryrom-release history after reset to jb-dev
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ca9b12a..2fe8913 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -62,5 +62,23 @@
<string name="eDesc" msgid="6709583372168924068">"Eulers tal"</string>
<string name="piDesc" msgid="8838151606775021517">"pi"</string>
<string name="equalDesc" msgid="4164435100263313101">"lig med"</string>
- <!-- no translation found for operatorDescs:10 (3456824579675198186) -->
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"venstre parentes"</item>
+ <item msgid="1688156211934459752">"højre parentes"</item>
+ <item msgid="6664829080840305856">"faktoriel"</item>
+ <item msgid="2880199289575144121">"naturlig logaritme"</item>
+ <item msgid="4398774906998694599">"logaritme"</item>
+ <item msgid="1791869359785943266">"kvadratrod"</item>
+ <item msgid="6833720171974254459">"divideret med"</item>
+ <item msgid="2646574635189709515">"ganget med"</item>
+ <item msgid="3487936384379753697">"plus"</item>
+ <item msgid="8608534484562258856">"minus"</item>
+ <item msgid="3456824579675198186">" point "</item>
+ <item msgid="4528629783180278651">"tænd/sluk"</item>
+ <item msgid="4050948027333760159">"tangent"</item>
+ <item msgid="8716478860618683850">"sinus"</item>
+ <item msgid="3203211483560707480">"cosinus"</item>
+ <item msgid="8587490959348493065">"pi"</item>
+ <item msgid="8134315487552198394">"lig med"</item>
+ </string-array>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d612081..b69735c 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -62,5 +62,23 @@
<string name="eDesc" msgid="6709583372168924068">"自然対数の底"</string>
<string name="piDesc" msgid="8838151606775021517">"パイ"</string>
<string name="equalDesc" msgid="4164435100263313101">"イコール"</string>
- <!-- no translation found for operatorDescs:10 (3456824579675198186) -->
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"左かっこ"</item>
+ <item msgid="1688156211934459752">"右かっこ"</item>
+ <item msgid="6664829080840305856">"階乗"</item>
+ <item msgid="2880199289575144121">"自然対数"</item>
+ <item msgid="4398774906998694599">"対数"</item>
+ <item msgid="1791869359785943266">"平方根"</item>
+ <item msgid="6833720171974254459">"割る"</item>
+ <item msgid="2646574635189709515">"掛ける"</item>
+ <item msgid="3487936384379753697">"足す"</item>
+ <item msgid="8608534484562258856">"引く"</item>
+ <item msgid="3456824579675198186">"ポイント"</item>
+ <item msgid="4528629783180278651">"累乗"</item>
+ <item msgid="4050948027333760159">"タンジェント"</item>
+ <item msgid="8716478860618683850">"サイン"</item>
+ <item msgid="3203211483560707480">"コサイン"</item>
+ <item msgid="8587490959348493065">"パイ"</item>
+ <item msgid="8134315487552198394">"イコール"</item>
+ </string-array>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 508bc46..2bc864a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -62,5 +62,23 @@
<string name="eDesc" msgid="6709583372168924068">"namba ya Euler"</string>
<string name="piDesc" msgid="8838151606775021517">"pi"</string>
<string name="equalDesc" msgid="4164435100263313101">"sawa na"</string>
- <!-- no translation found for operatorDescs:10 (3456824579675198186) -->
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"Mabano ya kushoto"</item>
+ <item msgid="1688156211934459752">"mabano ya kulia"</item>
+ <item msgid="6664829080840305856">"kiwanda"</item>
+ <item msgid="2880199289575144121">"logi asili"</item>
+ <item msgid="4398774906998694599">"logi"</item>
+ <item msgid="1791869359785943266">"Kipeo cha pili"</item>
+ <item msgid="6833720171974254459">"imegawanywa na"</item>
+ <item msgid="2646574635189709515">"imezidishwa na"</item>
+ <item msgid="3487936384379753697">"jumlisha"</item>
+ <item msgid="8608534484562258856">"kutoa"</item>
+ <item msgid="3456824579675198186">" mahali "</item>
+ <item msgid="4528629783180278651">"nguvu"</item>
+ <item msgid="4050948027333760159">"mstari"</item>
+ <item msgid="8716478860618683850">"sine"</item>
+ <item msgid="3203211483560707480">"kosi"</item>
+ <item msgid="8587490959348493065">"pi"</item>
+ <item msgid="8134315487552198394">"sawa na"</item>
+ </string-array>
</resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 4060643..8676d59 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -23,4 +23,21 @@
<dimen name="left_right_padding">16sp</dimen>
<dimen name="top_bottom_padding">16sp</dimen>
<dimen name="group_padding">16sp</dimen>
-</resources>
+
+ <style name="display_style">
+ <item name="android:textSize">@dimen/display_text_size</item>
+ <item name="android:inputType">text|textNoSuggestions</item>
+ <item name="android:gravity">right|bottom</item>
+ <item name="android:layout_gravity">right|bottom</item>
+ <item name="android:textColor">#ffffff</item>
+ <item name="android:maxLines">1</item>
+ <item name="android:scrollbars">none</item>
+ <item name="android:scrollHorizontally">true</item>
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:paddingTop">8dp</item>
+ <item name="android:paddingLeft">8dp</item>
+ <item name="android:paddingRight">8dp</item>
+ <item name="android:paddingBottom">0dp</item>
+ </style>
+</resources>
\ No newline at end of file
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 36ba45a..be93218 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -62,5 +62,23 @@
<string name="eDesc" msgid="6709583372168924068">"欧拉数"</string>
<string name="piDesc" msgid="8838151606775021517">"圆周率"</string>
<string name="equalDesc" msgid="4164435100263313101">"等于"</string>
- <!-- no translation found for operatorDescs:10 (3456824579675198186) -->
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"左括号"</item>
+ <item msgid="1688156211934459752">"右括号"</item>
+ <item msgid="6664829080840305856">"阶乘"</item>
+ <item msgid="2880199289575144121">"自然对数"</item>
+ <item msgid="4398774906998694599">"对数"</item>
+ <item msgid="1791869359785943266">"平方根"</item>
+ <item msgid="6833720171974254459">"除以"</item>
+ <item msgid="2646574635189709515">"乘"</item>
+ <item msgid="3487936384379753697">"加"</item>
+ <item msgid="8608534484562258856">"减"</item>
+ <item msgid="3456824579675198186">"点"</item>
+ <item msgid="4528629783180278651">"幂"</item>
+ <item msgid="4050948027333760159">"正切"</item>
+ <item msgid="8716478860618683850">"正弦"</item>
+ <item msgid="3203211483560707480">"余弦"</item>
+ <item msgid="8587490959348493065">"圆周率"</item>
+ <item msgid="8134315487552198394">"等于"</item>
+ </string-array>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cc9c3e0..4680f31 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -41,14 +41,13 @@
<style name="display_style">
<item name="android:textSize">@dimen/display_text_size</item>
<item name="android:inputType">text|textNoSuggestions</item>
- <item name="android:gravity">right|bottom</item>
- <item name="android:layout_gravity">right|bottom</item>
+ <item name="android:gravity">right|center_vertical</item>
<item name="android:textColor">#ffffff</item>
<item name="android:maxLines">1</item>
<item name="android:scrollbars">none</item>
<item name="android:scrollHorizontally">true</item>
<item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_height">match_parent</item>
<item name="android:paddingTop">8dp</item>
<item name="android:paddingLeft">8dp</item>
<item name="android:paddingRight">8dp</item>
@@ -92,4 +91,4 @@
<item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:textSize">@dimen/btn_clear_text_size</item>
</style>
-</resources>
+</resources>
\ No newline at end of file
