Code drop from //branches/cupcake/...@124589

15 files changed, 444 insertions, 510 deletions

diff --git a/res/drawable/android.png b/res/drawable/android.png
deleted file mode 100644
index 42113e3..0000000
--- a/res/drawable/android.png
+++ /dev/null
diff --git a/res/drawable/gradient.xml b/res/drawable/gradient.xml
deleted file mode 100644
index 1ff3e72..0000000
--- a/res/drawable/gradient.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/res/drawable/list_highlight_active.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient android:startColor="#00FFFFFF" android:endColor="#11FFFFFF"
-            android:angle="270"/>
-</shape>
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
index af63b16..c116984 100644
--- a/res/layout-land/main.xml
+++ b/res/layout-land/main.xml
@@ -69,80 +69,112 @@
         <LinearLayout 
              android:layout_weight="1"
              android:layout_width="fill_parent"
-             android:layout_height="0px">    
+             android:layout_height="0px"
+             >    
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit7"
                 android:text="@string/digit7"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit8"
                 android:text="@string/digit8"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit9"
                 android:text="@string/digit9"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
-                 android:text="@string/leftParen"
-                 style="@style/button_style"
-                 />
+                android:id="@+id/leftParen"
+                android:text="@string/leftParen"
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
-                 android:text="@string/rightParen"
-                 style="@style/button_style"
-                 />
+                android:id="@+id/rightParen"
+                android:text="@string/rightParen"
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton 
+                android:id="@+id/mul"
                 android:text="@string/mul"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
         </LinearLayout>
         
         <LinearLayout 
              android:layout_weight="1"
              android:layout_width="fill_parent"
-             android:layout_height="0px">    
+             android:layout_height="0px"
+             >    
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit4"
                 android:text="@string/digit4"
-                style="@style/button_style"/>        
+                style="@style/button_style"
+                />        
             <com.android.calculator2.ColorButton 
+                android:id="@+id/digit5"
                 android:text="@string/digit5"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton 
+                android:id="@+id/digit6"
                 android:text="@string/digit6"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton 
-                 android:text="@string/dot"
-                 style="@style/button_style"
-                 />
+                android:id="@+id/dot"
+                android:text="@string/dot"
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
-                 android:text="@string/div"
-                 style="@style/button_style"
-                 />
+                android:id="@+id/div"
+                android:text="@string/div"
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/minus"
                 android:text="@string/minus"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
         </LinearLayout>
         
         <LinearLayout 
              android:layout_weight="1"
              android:layout_width="fill_parent"
-             android:layout_height="0px">            
+             android:layout_height="0px"
+             >            
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit1"
                 android:text="@string/digit1"
-                style="@style/button_style"/>        
+                style="@style/button_style"
+                />        
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit2"
                 android:text="@string/digit2"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton 
+                android:id="@+id/digit3"
                 android:text="@string/digit3"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit0"
                 android:text="@string/digit0"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
-                 android:id="@+id/equal"
-                 android:text="@string/equal"
-                 style="@style/button_style"
-                 />
+                android:id="@+id/equal"
+                android:text="@string/equal"
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
-                 android:text="@string/plus"
-                 style="@style/button_style"
-                 />
+                android:id="@+id/plus"
+                android:text="@string/plus"
+                style="@style/button_style"
+                />
         </LinearLayout>
     </LinearLayout>
 
@@ -158,55 +190,67 @@
          > 
         
         <LinearLayout 
-             android:layout_weight="1"
-             android:layout_width="fill_parent"
-             android:layout_height="0px">            
+            android:layout_weight="1"
+            android:layout_width="fill_parent"
+            android:layout_height="0px"
+            >            
             <com.android.calculator2.ColorButton 
-                 android:text="@string/sin"
-                 style="@style/button_small_style"
-                 />
+                android:id="@+id/sin"
+                android:text="@string/sin"
+                style="@style/button_small_style"
+                />
             <com.android.calculator2.ColorButton 
-                 android:text="@string/cos"
-                 style="@style/button_small_style"
-                 />
+                android:id="@+id/cos"
+                android:text="@string/cos"
+                style="@style/button_small_style"
+                />
             <com.android.calculator2.ColorButton 
-                 android:text="@string/tan"
-                 style="@style/button_small_style"
-                 />
+                android:id="@+id/tan"
+                android:text="@string/tan"
+                style="@style/button_small_style"
+                />
             <com.android.calculator2.ColorButton
-                 android:text="@string/pi"
-                 style="@style/button_style"
-                 />
+                android:id="@+id/pi"
+                android:text="@string/pi"
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
-                 android:text="@string/factorial"
-                 style="@style/button_style"
-                 />
+                android:id="@+id/factorial"
+                android:text="@string/factorial"
+                style="@style/button_style"
+                />
         </LinearLayout>
         
         <LinearLayout 
-             android:layout_weight="1"
-             android:layout_width="fill_parent"
-             android:layout_height="0px">            
+            android:layout_weight="1"
+            android:layout_width="fill_parent"
+            android:layout_height="0px"
+            >            
             <com.android.calculator2.ColorButton
-                 android:text="@string/ln"
-                 style="@style/button_small_style"
-                 />
+                android:id="@+id/ln"
+                android:text="@string/ln"
+                style="@style/button_small_style"
+                />
             <com.android.calculator2.ColorButton
-                 android:text="@string/lg"
-                 style="@style/button_small_style"
-                 />
+                android:id="@+id/lg"
+                android:text="@string/lg"
+                style="@style/button_small_style"
+                />
             <com.android.calculator2.ColorButton
-                 android:text="@string/e"
-                 style="@style/button_style"
-                 />
+                android:id="@+id/e"
+                android:text="@string/e"
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
-                 android:text="@string/power"
-                 style="@style/button_style"
-                 />
+                android:id="@+id/power"
+                android:text="@string/power"
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
-                 android:text="@string/sqrt"
-                 style="@style/button_style"
-                 />
+                android:id="@+id/sqrt"
+                android:text="@string/sqrt"
+                style="@style/button_style"
+                />
         </LinearLayout>
     </LinearLayout>
     </com.android.calculator2.PanelSwitcher>
diff --git a/res/layout-port/main.xml b/res/layout-port/main.xml
index 9243901..b115e53 100644
--- a/res/layout-port/main.xml
+++ b/res/layout-port/main.xml
@@ -97,72 +97,106 @@
              android:layout_width="fill_parent"
              android:layout_height="0px">
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit7"
                 android:text="@string/digit7"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit8"
                 android:text="@string/digit8"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit9"
                 android:text="@string/digit9"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/div"
                 android:text="@string/div"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
         </LinearLayout>
 
         <LinearLayout
              android:layout_weight="1"
              android:layout_width="fill_parent"
-             android:layout_height="0px">
+             android:layout_height="0px"
+             >
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit4"
                 android:text="@string/digit4"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit5"
                 android:text="@string/digit5"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit6"
                 android:text="@string/digit6"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/mul"
                 android:text="@string/mul"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
         </LinearLayout>
 
         <LinearLayout
              android:layout_weight="1"
              android:layout_width="fill_parent"
-             android:layout_height="0px">
+             android:layout_height="0px"
+             >
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit1"
                 android:text="@string/digit1"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit2"
                 android:text="@string/digit2"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit3"
                 android:text="@string/digit3"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/minus"
                 android:text="@string/minus"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
         </LinearLayout>
 
         <LinearLayout
              android:layout_weight="1"
              android:layout_width="fill_parent"
-             android:layout_height="0px">
+             android:layout_height="0px"
+             >
             <com.android.calculator2.ColorButton
+                android:id="@+id/dot"
                 android:text="@string/dot"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/digit0"
                 android:text="@string/digit0"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
                 android:id="@+id/equal"
                 android:text="@string/equal"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/plus"
                 android:text="@string/plus"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
         </LinearLayout>
     </LinearLayout>
 
@@ -176,61 +210,89 @@
         <LinearLayout
              android:layout_weight="1"
              android:layout_width="fill_parent"
-             android:layout_height="0px">
+             android:layout_height="0px"
+             >
             <com.android.calculator2.ColorButton
+                android:id="@+id/sin"
                 android:text="@string/sin"
-                style="@style/button_small_style"/>
+                style="@style/button_small_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/cos"
                 android:text="@string/cos"
-                style="@style/button_small_style"/>
+                style="@style/button_small_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/tan"
                 android:text="@string/tan"
-                style="@style/button_small_style"/>
+                style="@style/button_small_style"
+                />
         </LinearLayout>
 
         <LinearLayout
              android:layout_weight="1"
              android:layout_width="fill_parent"
-             android:layout_height="0px">
+             android:layout_height="0px"
+             >
             <com.android.calculator2.ColorButton
+                android:id="@+id/ln"
                 android:text="@string/ln"
-                style="@style/button_small_style"/>
+                style="@style/button_small_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/lg"
                 android:text="@string/lg"
-                style="@style/button_small_style"/>
+                style="@style/button_small_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/factorial"
                 android:text="@string/factorial"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
         </LinearLayout>
 
         <LinearLayout
              android:layout_weight="1"
              android:layout_width="fill_parent"
-             android:layout_height="0px">
+             android:layout_height="0px"
+             >
             <com.android.calculator2.ColorButton
+                android:id="@+id/pi"
                 android:text="@string/pi"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/e"
                 android:text="@string/e"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/power"
                 android:text="@string/power"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
         </LinearLayout>
 
         <LinearLayout
              android:layout_weight="1"
              android:layout_width="fill_parent"
-             android:layout_height="0px">
+             android:layout_height="0px"
+             >
             <com.android.calculator2.ColorButton
+                android:id="@+id/leftParen"
                 android:text="@string/leftParen"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/rightParen"
                 android:text="@string/rightParen"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
             <com.android.calculator2.ColorButton
+                android:id="@+id/sqrt"
                 android:text="@string/sqrt"
-                style="@style/button_style"/>
+                style="@style/button_style"
+                />
         </LinearLayout>
     </LinearLayout>
     </com.android.calculator2.PanelSwitcher>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1aeac5e..f396a03 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1,46 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="acos">acos</string>
-  <string name="advanced">Rozšířený panel</string>
-  <string name="app_name">Kalkulačka</string>
-  <string name="asin">asin</string>
-  <string name="atan">atan</string>
-  <string name="basic">Základní panel</string>
-  <string name="clear">VYMAZAT</string>
-  <string name="clear_history">Vymazat historii</string>
-  <string name="cos">cos</string>
-  <string name="del">ODSTRANIT</string>
-  <string name="digit0">0</string>
-  <string name="digit1">1</string>
-  <string name="digit2">2</string>
-  <string name="digit3">3</string>
-  <string name="digit4">4</string>
-  <string name="digit5">5</string>
-  <string name="digit6">6</string>
-  <string name="digit7">7</string>
-  <string name="digit8">8</string>
-  <string name="digit9">9</string>
-  <string name="div">\u00f7</string>
-  <string name="dot">.</string>
-  <string name="e">e</string>
-  <string name="enter">\u2193</string>
-  <string name="equal">=</string>
-  <string name="error">Chyba</string>
-  <string name="factorial">!</string>
-  <string name="leftParen">(</string>
-  <string name="lg">log</string>
-  <string name="ln">ln</string>
-  <string name="minus">\u2212</string>
-  <string name="mul">\u00d7</string>
-  <string name="ok">OK</string>
-  <string name="pi">\u03c0</string>
-  <string name="plus">+</string>
-  <string name="power">^</string>
-  <string name="rightParen">)</string>
-  <string name="sin">sin</string>
-  <string name="sqrt">\u221a</string>
-  <string name="syntax_error">Chyba syntaxe</string>
-  <string name="tan">tan</string>
-  <string name="version_mismatch">Neplatná verze</string>
+    <string name="app_name">"Kalkulačka"</string>
+    <string name="error">"Chyba"</string>
+    <string name="syntax_error">"Chyba syntaxe"</string>
+    <string name="ok">"OK"</string>
+    <string name="digit0">"0"</string>
+    <string name="digit1">"1"</string>
+    <string name="digit2">"2"</string>
+    <string name="digit3">"3"</string>
+    <string name="digit4">"4"</string>
+    <string name="digit5">"5"</string>
+    <string name="digit6">"6"</string>
+    <string name="digit7">"7"</string>
+    <string name="digit8">"8"</string>
+    <string name="digit9">"9"</string>
+    <string name="del">"ODSTRANIT"</string>
+    <string name="clear">"VYMAZAT"</string>
+    <string name="sin">"sin"</string>
+    <string name="cos">"cos"</string>
+    <string name="tan">"tan"</string>
+    <string name="asin">"asin"</string>
+    <string name="acos">"acos"</string>
+    <string name="atan">"atan"</string>
+    <string name="e">"e"</string>
+    <string name="ln">"ln"</string>
+    <string name="lg">"log"</string>
+    <string name="leftParen">"("</string>
+    <string name="rightParen">")"</string>
+    <string name="basic">"Základní panel"</string>
+    <string name="advanced">"Rozšířený panel"</string>
+    <string name="clear_history">"Vymazat historii"</string>
+    <string name="version_mismatch">"Neplatná verze"</string>
 </resources>
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
deleted file mode 100644
index bf9352f..0000000
--- a/res/values-de-rDE/strings.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="acos">acos</string>
-  <string name="advanced">Erweitertes Feld</string>
-  <string name="app_name">Rechner</string>
-  <string name="asin">asin</string>
-  <string name="atan">atan</string>
-  <string name="basic">Grundsätzliches Feld</string>
-  <string name="clear">LÖSCHEN</string>
-  <string name="clear_history">Verlauf löschen</string>
-  <string name="cos">cos</string>
-  <string name="del">LÖSCHEN</string>
-  <string name="digit0">0</string>
-  <string name="digit1">1</string>
-  <string name="digit2">2</string>
-  <string name="digit3">3</string>
-  <string name="digit4">4</string>
-  <string name="digit5">5</string>
-  <string name="digit6">6</string>
-  <string name="digit7">7</string>
-  <string name="digit8">8</string>
-  <string name="digit9">9</string>
-  <string name="div">\u00f7</string>
-  <string name="dot">.</string>
-  <string name="e">e</string>
-  <string name="enter">\u2193</string>
-  <string name="equal">=</string>
-  <string name="error">Fehler</string>
-  <string name="factorial">!</string>
-  <string name="leftParen">(</string>
-  <string name="lg">log</string>
-  <string name="ln">ln</string>
-  <string name="minus">\u2212</string>
-  <string name="mul">\u00d7</string>
-  <string name="ok">OK</string>
-  <string name="pi">\u03c0</string>
-  <string name="plus">+</string>
-  <string name="power">^</string>
-  <string name="rightParen">)</string>
-  <string name="sin">sin</string>
-  <string name="sqrt">\u221a</string>
-  <string name="syntax_error">Syntaxfehler</string>
-  <string name="tan">tan</string>
-  <string name="version_mismatch">Ungültige Version</string>
-</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
new file mode 100644
index 0000000..3e23ac3
--- /dev/null
+++ b/res/values-de/strings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">"Rechner"</string>
+    <string name="error">"Fehler"</string>
+    <string name="syntax_error">"Syntaxfehler"</string>
+    <string name="ok">"OK"</string>
+    <string name="digit0">"0"</string>
+    <string name="digit1">"1"</string>
+    <string name="digit2">"2"</string>
+    <string name="digit3">"3"</string>
+    <string name="digit4">"4"</string>
+    <string name="digit5">"5"</string>
+    <string name="digit6">"6"</string>
+    <string name="digit7">"7"</string>
+    <string name="digit8">"8"</string>
+    <string name="digit9">"9"</string>
+    <string name="del">"C"</string>
+    <string name="clear">"AC"</string>
+    <string name="sin">"sin"</string>
+    <string name="cos">"cos"</string>
+    <string name="tan">"tan"</string>
+    <string name="asin">"asin"</string>
+    <string name="acos">"acos"</string>
+    <string name="atan">"atan"</string>
+    <string name="e">"e"</string>
+    <string name="ln">"ln"</string>
+    <string name="lg">"log"</string>
+    <string name="leftParen">"("</string>
+    <string name="rightParen">")"</string>
+    <string name="basic">"Grundfunktionen"</string>
+    <string name="advanced">"Erweiterte Funktionen"</string>
+    <string name="clear_history">"Verlauf löschen"</string>
+    <string name="version_mismatch">"Ungültige Version"</string>
+</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 3e21737..afaed05 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1,46 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="acos">acos</string>
-  <string name="advanced">Advanced panel</string>
-  <string name="app_name">Calculator</string>
-  <string name="asin">asin</string>
-  <string name="atan">atan</string>
-  <string name="basic">Basic panel</string>
-  <string name="clear">CLEAR</string>
-  <string name="clear_history">Clear history</string>
-  <string name="cos">cos</string>
-  <string name="del">DELETE</string>
-  <string name="digit0">0</string>
-  <string name="digit1">1</string>
-  <string name="digit2">2</string>
-  <string name="digit3">3</string>
-  <string name="digit4">4</string>
-  <string name="digit5">5</string>
-  <string name="digit6">6</string>
-  <string name="digit7">7</string>
-  <string name="digit8">8</string>
-  <string name="digit9">9</string>
-  <string name="div">\u00f7</string>
-  <string name="dot">.</string>
-  <string name="e">e</string>
-  <string name="enter">\u2193</string>
-  <string name="equal">=</string>
-  <string name="error">Error</string>
-  <string name="factorial">!</string>
-  <string name="leftParen">(</string>
-  <string name="lg">log</string>
-  <string name="ln">ln</string>
-  <string name="minus">\u2212</string>
-  <string name="mul">\u00d7</string>
-  <string name="ok">OK</string>
-  <string name="pi">\u03c0</string>
-  <string name="plus">+</string>
-  <string name="power">^</string>
-  <string name="rightParen">)</string>
-  <string name="sin">sin</string>
-  <string name="sqrt">\u221a</string>
-  <string name="syntax_error">Syntax error</string>
-  <string name="tan">tan</string>
-  <string name="version_mismatch">Invalid version</string>
+    <string name="app_name">"Calculator"</string>
+    <string name="error">"Error"</string>
+    <string name="syntax_error">"Syntax error"</string>
+    <string name="ok">"OK"</string>
+    <string name="digit0">"0"</string>
+    <string name="digit1">"1"</string>
+    <string name="digit2">"2"</string>
+    <string name="digit3">"3"</string>
+    <string name="digit4">"4"</string>
+    <string name="digit5">"5"</string>
+    <string name="digit6">"6"</string>
+    <string name="digit7">"7"</string>
+    <string name="digit8">"8"</string>
+    <string name="digit9">"9"</string>
+    <string name="del">"DELETE"</string>
+    <string name="clear">"CLEAR"</string>
+    <string name="sin">"sin"</string>
+    <string name="cos">"cos"</string>
+    <string name="tan">"tan"</string>
+    <string name="asin">"asin"</string>
+    <string name="acos">"acos"</string>
+    <string name="atan">"atan"</string>
+    <string name="e">"e"</string>
+    <string name="ln">"ln"</string>
+    <string name="lg">"log"</string>
+    <string name="leftParen">"("</string>
+    <string name="rightParen">")"</string>
+    <string name="basic">"Basic panel"</string>
+    <string name="advanced">"Advanced panel"</string>
+    <string name="clear_history">"Clear history"</string>
+    <string name="version_mismatch">"Invalid version"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index fbc26cc..39e95f0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1,46 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="acos">acos</string>
-  <string name="advanced">Panel avanzado</string>
-  <string name="app_name">Calculadora</string>
-  <string name="asin">asin</string>
-  <string name="atan">atan</string>
-  <string name="basic">Panel básico</string>
-  <string name="clear">BORRAR</string>
-  <string name="clear_history">Borrar historial</string>
-  <string name="cos">cos</string>
-  <string name="del">ELIMINAR</string>
-  <string name="digit0">0</string>
-  <string name="digit1">1</string>
-  <string name="digit2">2</string>
-  <string name="digit3">3</string>
-  <string name="digit4">4</string>
-  <string name="digit5">5</string>
-  <string name="digit6">6</string>
-  <string name="digit7">7</string>
-  <string name="digit8">8</string>
-  <string name="digit9">9</string>
-  <string name="div">\u00f7</string>
-  <string name="dot">.</string>
-  <string name="e">e</string>
-  <string name="enter">\u2193</string>
-  <string name="equal">=</string>
-  <string name="error">Error</string>
-  <string name="factorial">!</string>
-  <string name="leftParen">(</string>
-  <string name="lg">log</string>
-  <string name="ln">En</string>
-  <string name="minus">\u2212</string>
-  <string name="mul">\u00d7</string>
-  <string name="ok">Aceptar</string>
-  <string name="pi">\u03c0</string>
-  <string name="plus">+</string>
-  <string name="power">^</string>
-  <string name="rightParen">)</string>
-  <string name="sin">sin</string>
-  <string name="sqrt">\u221a</string>
-  <string name="syntax_error">Error de sintaxis</string>
-  <string name="tan">tan</string>
-  <string name="version_mismatch">Versión no válida</string>
+    <string name="app_name">"Calculadora"</string>
+    <string name="error">"Error"</string>
+    <string name="syntax_error">"Error de sintaxis"</string>
+    <string name="ok">"Aceptar"</string>
+    <string name="digit0">"0"</string>
+    <string name="digit1">"1"</string>
+    <string name="digit2">"2"</string>
+    <string name="digit3">"3"</string>
+    <string name="digit4">"4"</string>
+    <string name="digit5">"5"</string>
+    <string name="digit6">"6"</string>
+    <string name="digit7">"7"</string>
+    <string name="digit8">"8"</string>
+    <string name="digit9">"9"</string>
+    <string name="del">"ELIMINAR"</string>
+    <string name="clear">"BORRAR"</string>
+    <string name="sin">"sin"</string>
+    <string name="cos">"cos"</string>
+    <string name="tan">"tan"</string>
+    <string name="asin">"asin"</string>
+    <string name="acos">"acos"</string>
+    <string name="atan">"atan"</string>
+    <string name="e">"e"</string>
+    <string name="ln">"En"</string>
+    <string name="lg">"log"</string>
+    <string name="leftParen">"("</string>
+    <string name="rightParen">")"</string>
+    <string name="basic">"Panel básico"</string>
+    <string name="advanced">"Panel avanzado"</string>
+    <string name="clear_history">"Borrar historial"</string>
+    <string name="version_mismatch">"Versión no válida"</string>
 </resources>
diff --git a/res/values-fr-rFR/strings.xml b/res/values-fr-rFR/strings.xml
deleted file mode 100644
index 683f85f..0000000
--- a/res/values-fr-rFR/strings.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="acos">acos</string>
-  <string name="advanced">Panneau avancé</string>
-  <string name="app_name">Calculatrice</string>
-  <string name="asin">asin</string>
-  <string name="atan">atan</string>
-  <string name="basic">Panneau de base</string>
-  <string name="clear">CLEAR</string>
-  <string name="clear_history">Effacer l\'historique</string>
-  <string name="cos">cos</string>
-  <string name="del">DELETE</string>
-  <string name="digit0">0</string>
-  <string name="digit1">1</string>
-  <string name="digit2">2</string>
-  <string name="digit3">3</string>
-  <string name="digit4">4</string>
-  <string name="digit5">5</string>
-  <string name="digit6">6</string>
-  <string name="digit7">7</string>
-  <string name="digit8">8</string>
-  <string name="digit9">9</string>
-  <string name="div">\u00f7</string>
-  <string name="dot">.</string>
-  <string name="e">e</string>
-  <string name="enter">\u2193</string>
-  <string name="equal">=</string>
-  <string name="error">Error</string>
-  <string name="factorial">!</string>
-  <string name="leftParen">(</string>
-  <string name="lg">log</string>
-  <string name="ln">ln</string>
-  <string name="minus">\u2212</string>
-  <string name="mul">\u00d7</string>
-  <string name="ok">OK</string>
-  <string name="pi">\u03c0</string>
-  <string name="plus">+</string>
-  <string name="power">^</string>
-  <string name="rightParen">)</string>
-  <string name="sin">sin</string>
-  <string name="sqrt">\u221a</string>
-  <string name="syntax_error">Syntax error</string>
-  <string name="tan">tan</string>
-  <string name="version_mismatch">Version non valide</string>
-</resources>
diff --git a/res/values-it-rIT/strings.xml b/res/values-it-rIT/strings.xml
deleted file mode 100644
index 3311e4f..0000000
--- a/res/values-it-rIT/strings.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="acos">acos</string>
-  <string name="advanced">Pannello Avanzate</string>
-  <string name="app_name">Calcolatore</string>
-  <string name="asin">asin</string>
-  <string name="atan">atan</string>
-  <string name="basic">Pannello base</string>
-  <string name="clear">CANCELLA</string>
-  <string name="clear_history">Cancella cronologia</string>
-  <string name="cos">cos</string>
-  <string name="del">ELIMINA</string>
-  <string name="digit0">0</string>
-  <string name="digit1">1</string>
-  <string name="digit2">2</string>
-  <string name="digit3">3</string>
-  <string name="digit4">4</string>
-  <string name="digit5">5</string>
-  <string name="digit6">6</string>
-  <string name="digit7">7</string>
-  <string name="digit8">8</string>
-  <string name="digit9">9</string>
-  <string name="div">\u00f7</string>
-  <string name="dot">.</string>
-  <string name="e">e</string>
-  <string name="enter">\u2193</string>
-  <string name="equal">=</string>
-  <string name="error">Errore</string>
-  <string name="factorial">!</string>
-  <string name="leftParen">(</string>
-  <string name="lg">log</string>
-  <string name="ln">ln</string>
-  <string name="minus">\u2212</string>
-  <string name="mul">\u00d7</string>
-  <string name="ok">OK</string>
-  <string name="pi">\u03c0</string>
-  <string name="plus">+</string>
-  <string name="power">^</string>
-  <string name="rightParen">)</string>
-  <string name="sin">sin</string>
-  <string name="sqrt">\u221a</string>
-  <string name="syntax_error">Errore di sintassi</string>
-  <string name="tan">tan</string>
-  <string name="version_mismatch">Versione non valida</string>
-</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
new file mode 100644
index 0000000..bf35bdc
--- /dev/null
+++ b/res/values-ja/strings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">"電卓"</string>
+    <string name="error">"エラー"</string>
+    <string name="syntax_error">"シンタックスエラー。"</string>
+    <string name="ok">"OK"</string>
+    <string name="digit0">"0"</string>
+    <string name="digit1">"1"</string>
+    <string name="digit2">"2"</string>
+    <string name="digit3">"3"</string>
+    <string name="digit4">"4"</string>
+    <string name="digit5">"5"</string>
+    <string name="digit6">"6"</string>
+    <string name="digit7">"7"</string>
+    <string name="digit8">"8"</string>
+    <string name="digit9">"9"</string>
+    <string name="del">"削除"</string>
+    <string name="clear">"クリア"</string>
+    <string name="sin">"sin"</string>
+    <string name="cos">"cos"</string>
+    <string name="tan">"tan"</string>
+    <string name="asin">"asin"</string>
+    <string name="acos">"acos"</string>
+    <string name="atan">"atan"</string>
+    <string name="e">"e"</string>
+    <string name="ln">"ln"</string>
+    <string name="lg">"log"</string>
+    <string name="leftParen">"("</string>
+    <string name="rightParen">")"</string>
+    <string name="basic">"普通の電卓"</string>
+    <string name="advanced">"関数電卓"</string>
+    <string name="clear_history">"履歴をクリア"</string>
+    <string name="version_mismatch">"無効なバージョンです"</string>
+</resources>
diff --git a/res/values-nl-rNL/strings.xml b/res/values-nl-rNL/strings.xml
index 7093d40..c5da34a 100644
--- a/res/values-nl-rNL/strings.xml
+++ b/res/values-nl-rNL/strings.xml
@@ -1,46 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="acos">acos</string>
-  <string name="advanced">Geavanceerd paneel</string>
-  <string name="app_name">Rekenmachine</string>
-  <string name="asin">asin</string>
-  <string name="atan">atan</string>
-  <string name="basic">Basispaneel</string>
-  <string name="clear">WISSEN</string>
-  <string name="clear_history">Geschiedenis wissen</string>
-  <string name="cos">cos</string>
-  <string name="del">VERWIJDEREN</string>
-  <string name="digit0">0</string>
-  <string name="digit1">1</string>
-  <string name="digit2">2</string>
-  <string name="digit3">3</string>
-  <string name="digit4">4</string>
-  <string name="digit5">5</string>
-  <string name="digit6">6</string>
-  <string name="digit7">7</string>
-  <string name="digit8">8</string>
-  <string name="digit9">9</string>
-  <string name="div">\u00f7</string>
-  <string name="dot">.</string>
-  <string name="e">e</string>
-  <string name="enter">\u2193</string>
-  <string name="equal">=</string>
-  <string name="error">Fout</string>
-  <string name="factorial">!</string>
-  <string name="leftParen">(</string>
-  <string name="lg">log</string>
-  <string name="ln">ln</string>
-  <string name="minus">\u2212</string>
-  <string name="mul">\u00d7</string>
-  <string name="ok">OK</string>
-  <string name="pi">\u03c0</string>
-  <string name="plus">+</string>
-  <string name="power">^</string>
-  <string name="rightParen">)</string>
-  <string name="sin">sin</string>
-  <string name="sqrt">\u221a</string>
-  <string name="syntax_error">Syntaxisfout</string>
-  <string name="tan">tan</string>
-  <string name="version_mismatch">Ongeldige versie</string>
+    <string name="app_name">"Rekenmachine"</string>
+    <string name="error">"Fout"</string>
+    <string name="syntax_error">"Syntaxisfout"</string>
+    <string name="ok">"OK"</string>
+    <string name="digit0">"0"</string>
+    <string name="digit1">"1"</string>
+    <string name="digit2">"2"</string>
+    <string name="digit3">"3"</string>
+    <string name="digit4">"4"</string>
+    <string name="digit5">"5"</string>
+    <string name="digit6">"6"</string>
+    <string name="digit7">"7"</string>
+    <string name="digit8">"8"</string>
+    <string name="digit9">"9"</string>
+    <string name="del">"VERWIJDEREN"</string>
+    <string name="clear">"WISSEN"</string>
+    <string name="sin">"sin"</string>
+    <string name="cos">"cos"</string>
+    <string name="tan">"tan"</string>
+    <string name="asin">"asin"</string>
+    <string name="acos">"acos"</string>
+    <string name="atan">"atan"</string>
+    <string name="e">"e"</string>
+    <string name="ln">"ln"</string>
+    <string name="lg">"log"</string>
+    <string name="leftParen">"("</string>
+    <string name="rightParen">")"</string>
+    <string name="basic">"Basispaneel"</string>
+    <string name="advanced">"Geavanceerd paneel"</string>
+    <string name="clear_history">"Geschiedenis wissen"</string>
+    <string name="version_mismatch">"Ongeldige versie"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 958ddeb..0000000
--- a/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="acos">acos</string>
-  <string name="advanced">進階面板</string>
-  <string name="app_name">小算盤</string>
-  <string name="asin">asin</string>
-  <string name="atan">atan</string>
-  <string name="basic">基本面板</string>
-  <string name="clear">CLEAR</string>
-  <string name="clear_history">清除記錄</string>
-  <string name="cos">cos</string>
-  <string name="del">DELETE</string>
-  <string name="digit0">0</string>
-  <string name="digit1">1</string>
-  <string name="digit2">2</string>
-  <string name="digit3">3</string>
-  <string name="digit4">4</string>
-  <string name="digit5">5</string>
-  <string name="digit6">6</string>
-  <string name="digit7">7</string>
-  <string name="digit8">8</string>
-  <string name="digit9">9</string>
-  <string name="div">\u00f7</string>
-  <string name="dot">.</string>
-  <string name="e">e</string>
-  <string name="enter">\u2193</string>
-  <string name="equal">=</string>
-  <string name="error">Error</string>
-  <string name="factorial">!</string>
-  <string name="leftParen">(</string>
-  <string name="lg">log</string>
-  <string name="ln">ln</string>
-  <string name="minus">\u2212</string>
-  <string name="mul">\u00d7</string>
-  <string name="ok">OK</string>
-  <string name="pi">\u03c0</string>
-  <string name="plus">+</string>
-  <string name="power">^</string>
-  <string name="rightParen">)</string>
-  <string name="sin">sin</string>
-  <string name="sqrt">\u221a</string>
-  <string name="syntax_error">Syntax Error</string>
-  <string name="tan">tan</string>
-  <string name="version_mismatch">無效的版本</string>
-</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a3d0c18..817dedf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,65 +2,75 @@
 <resources>
     <!-- Application name -->
     <string name="app_name">Calculator</string>
-    <!-- Error dialog title -->
+    <!-- If there is a syntax error in the user entered calculation, an error dialog will appear.  This is the title. -->
     <string name="error">Error</string>
-    <!-- Error dialog message -->
-    <string name="syntax_error">Syntax error.</string>
-    <!-- Error dialog button -->
-    <string name="ok">OK</string>
-    <!-- Displayed numbers -->
+    <!-- Displayed numbers for the digit buttons -->
     <string name="digit0">0</string>
+    <!-- Displayed numbers for the digit buttons -->
     <string name="digit1">1</string>
+    <!-- Displayed numbers for the digit buttons -->
     <string name="digit2">2</string>
+    <!-- Displayed numbers for the digit buttons -->
     <string name="digit3">3</string>
+    <!-- Displayed numbers for the digit buttons -->
     <string name="digit4">4</string>
+    <!-- Displayed numbers for the digit buttons -->
     <string name="digit5">5</string>
+    <!-- Displayed numbers for the digit buttons -->
     <string name="digit6">6</string>
+    <!-- Displayed numbers for the digit buttons -->
     <string name="digit7">7</string>
+    <!-- Displayed numbers for the digit buttons -->
     <string name="digit8">8</string>
+    <!-- Displayed numbers for the digit buttons -->
     <string name="digit9">9</string>
-    <!-- Button name on screen -->
+    <!-- Button name on screen to delete the last entered digit or operator -->
     <string name="del">DELETE</string>
-    <!-- Button name on screen -->
+    <!-- Button name on screen to clear the entire calculation field -->
     <string name="clear">CLEAR</string>
-    <!-- Unicode division sign; don't translate. Displayed as button on screen. -->
+    <!-- Do not translate. Unicode division sign; don't translate. Displayed as button on screen. -->
     <string name="div">\u00f7</string>
-    <!-- Unicode multiplication sign; don't translate. Displayed as button on screen. -->
+    <!-- Do not translate. Unicode multiplication sign; don't translate. Displayed as button on screen. -->
     <string name="mul">\u00d7</string>
-    <!-- Plus sign, displayed as button on screen -->
+    <!-- Do not translate. Plus sign, displayed as button on screen -->
     <string name="plus">+</string>
-    <!-- Unicode minus sign; don't translate. Displayed as button on screen. -->
+    <!-- Do not translate. Unicode minus sign; don't translate. Displayed as button on screen. -->
     <string name="minus">\u2212</string>
-    <!-- Decimal point; don't translate. Displayed as button on screen. -->
+    <!-- Do not translate. Decimal point; don't translate. Displayed as button on screen. -->
     <string name="dot">.</string>
-    <!-- Equal sign; don't translate. Displayed as button on screen. -->
+    <!-- Do not translate. Equal sign; don't translate. Displayed as button on screen. -->
     <string name="equal">=</string>
-    <!-- Down arrow; don't translate. Displayed as button on screen. -->
+    <!-- Do not translate. Down arrow; don't translate. Displayed as button on screen. -->
     <string name="enter">\u2193</string>
-    <!-- Displayed on buttons on screen. -->
+    <!-- Displayed on buttons on screen for the sin function. -->
     <string name="sin">sin</string>
+    <!-- Displayed on buttons on screen for the cos function. -->
     <string name="cos">cos</string>
+    <!-- Displayed on buttons on screen for the tan function. -->
     <string name="tan">tan</string>
-    <string name="asin">asin</string>
-    <string name="acos">acos</string>
-    <string name="atan">atan</string> 
        
-    <!-- Unicode pi sign; don't translate. Displayed as button on screen. -->
+    <!-- Do not translate. Unicode pi sign; don't translate. Displayed as button on screen. -->
     <string name="pi">\u03c0</string>
-    <!-- Displayed on buttons on screen. -->
+    <!-- Displayed on buttons on screen for the e function. -->
     <string name="e">e</string>
+    <!-- Displayed on buttons on screen for the ln function. -->
     <string name="ln">ln</string>
+    <!-- Displayed on buttons on screen for the log function. -->
     <string name="lg">log</string>
+    <!-- Displayed on buttons on screen for a left parenthesis. -->
     <string name="leftParen">(</string>
+    <!-- Displayed on buttons on screen for a right parenthesis. -->
     <string name="rightParen">)</string>
-    <!-- Unicode square root sign; don't translate. Displayed on button on screen. -->
+    <!-- Do not translate. Unicode square root sign; don't translate. Displayed on button on screen. -->
     <string name="sqrt">\u221a</string>
-    <!-- Displayed on buttons on screen. -->
+    <!-- Do not translate. Displayed on buttons on screen. -->
     <string name="power">^</string>
+    <!-- Do not translate. -->
     <string name="factorial">!</string>
-    <!-- Menu items -->
+    <!-- Menu item text to take user to the screen with the basic digits and operators. -->
     <string name="basic">Basic panel</string>
+    <!-- Menu item text to take user to the screen with the advanced functions, such as sin, cos, ln, log, etc. -->
     <string name="advanced">Advanced panel</string>
+    <!-- Menu item text to clear the calculation history. -->
     <string name="clear_history">Clear history</string>
-    <string name="version_mismatch">Invalid version</string>
 </resources>