From 0e72e04c8f08d9dcae7b19ed95ec450c05f4e2bf Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Sat, 12 Nov 2011 17:45:45 +0400
Subject: [PATCH] deg()/rad()

---
 res/layout/calc_six_digit_button.xml | 4 ++--
 res/values-ru/strings.xml            | 2 ++
 res/values/strings.xml               | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/res/layout/calc_six_digit_button.xml b/res/layout/calc_six_digit_button.xml
index 36645dcc..d2e9cc85 100644
--- a/res/layout/calc_six_digit_button.xml
+++ b/res/layout/calc_six_digit_button.xml
@@ -9,7 +9,7 @@
 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/sixDigitButton" a:text="6"
-													   calc:textUp="tanh"
-													   calc:textDown="atanh"
+													   calc:textUp="deg"
+													   calc:textDown="rad"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index aafa010d..1ccd1495 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -139,6 +139,8 @@
 	<string name="c_fun_description_ne">Не-равно - возвращает 1, если два аргумента не равны, иначе 0.</string>
 	<string name="c_fun_description_lt">Меньше - возвращает 1, если первый аргумент меньше второго, иначе 0.</string>
 	<string name="c_fun_description_gt">Больше - возвращает 1, если первый аргумент больше второго, иначе 0.</string>
+  	<string name="c_fun_description_rad">Преобразует градусы в радианы.</string>
+	<string name="c_fun_description_deg">Преобразует радианы в градусы.</string>
 
 	<string name="c_empty_var_error">Невозможно создать пустую константу!</string>
 	<string name="c_not_valid_result">Результат не допустим!</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index de54b5cd..355dc66b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -140,6 +140,8 @@
 	<string name="c_fun_description_ne">Not-equals function - gives 1 if two arguments are not equals, 0 otherwise.</string>
 	<string name="c_fun_description_lt">Lesser function - gives 1 if first argument is less than second, 0 otherwise.</string>
 	<string name="c_fun_description_gt">Greater function - gives 1 if first argument is greater than second, 0 otherwise.</string>
+	<string name="c_fun_description_rad">Converts degrees into radians.</string>
+	<string name="c_fun_description_deg">Converts radians into degrees.</string>
 
 	<string name="c_empty_var_error">Unable to create empty constant!</string>
 	<string name="c_not_valid_result">Current result is not valid!</string>