Merge branch 'master' into dev

Conflicts:
	android-app-core/res/values-de/text_vars.xml
	android-app-core/res/values-es/text_about.xml
	android-app-core/res/values-es/text_functions.xml
	android-app-core/res/values-es/text_operators.xml
	android-app-core/res/values-es/text_strings.xml
	android-app-core/res/values-es/text_vars.xml
	android-app-core/res/values-it/text_about.xml
	android-app-core/res/values-it/text_functions.xml
	android-app-core/res/values-it/text_operators.xml
	android-app-core/res/values-it/text_strings.xml
	android-app-core/res/values-it/text_vars.xml
	android-app-core/res/values-pl/text_about.xml
	android-app-core/res/values-pl/text_operators.xml
	android-app-core/res/values-pl/text_preferences.xml
	android-app-core/res/values-pl/text_strings.xml
	android-app-core/res/values-pl/text_vars.xml
	android-app-core/res/values-ru/text_about.xml
	android-app-core/res/values-uk/text_about.xml
	android-app-core/res/values-uk/text_functions.xml
	android-app-core/res/values-uk/text_operators.xml
	android-app-core/res/values-uk/text_preferences.xml
	android-app-core/res/values-uk/text_strings.xml
	android-app-core/res/values-uk/text_vars.xml
	android-app-core/res/values-zh-rtw/text_about.xml
	android-app-core/res/values-zh-rtw/text_functions.xml
	android-app-core/res/values-zh-rtw/text_operators.xml
	android-app-core/res/values-zh-rtw/text_preferences.xml
	android-app-core/res/values-zh-rtw/text_strings.xml
	android-app-core/res/values-zh-rtw/text_vars.xml
	android-app/project.properties
	pom.xml

android-app-core/pom.xml

@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.solovyev.android</groupId>
 		<artifactId>calculatorpp-parent</artifactId>
-		<version>1.6.3-b-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.solovyev.android</groupId>
 	<artifactId>calculatorpp-android-app-core</artifactId>
-	<version>1.6.3-b-SNAPSHOT</version>
+	<version>2.0.1-SNAPSHOT</version>
 	<name>Calculator++ Application Core</name>
 	<packaging>apklib</packaging>
 

android-app-core/res/layout/cpp_simple_button_like.xml

@@ -24,6 +24,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 a:id="@id/cpp_button_like"
-			 a:src="@drawable/kb_facebook"
+			 a:src="@drawable/kb_share"
 			 style="@style/cpp_simple_metro_control_image_button_style"
 			 a:contentDescription="Like"/>

android-app-core/res/layout/cpp_simple_button_operators.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ 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.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<Button xmlns:a="http://schemas.android.com/apk/res/android"
+		a:id="@id/cpp_button_operators"
+		a:text="∂,…"
+		a:textStyle="italic"
+		style="@style/cpp_simple_metro_control_button_style"/>

android-app-core/res/layout/cpp_simple_keyboard.xml

@@ -78,7 +78,7 @@
 
 		<include layout="@layout/cpp_simple_button_plus"/>
 
-		<include layout="@layout/cpp_simple_button_like"/>
+		<include layout="@layout/cpp_simple_button_settings"/>
 
 		<include layout="@layout/cpp_simple_button_copy"/>
 
@@ -97,7 +97,7 @@
 
 		<include layout="@layout/cpp_simple_button_subtraction"/>
 
-		<include layout="@layout/cpp_simple_button_settings"/>
+		<include layout="@layout/cpp_simple_button_app"/>
 
 		<include layout="@layout/cpp_simple_button_paste"/>
 
@@ -117,7 +117,7 @@
 
 		<include layout="@layout/cpp_simple_button_functions"/>
 
-		<include layout="@layout/cpp_simple_button_app"/>
+		<include layout="@layout/cpp_simple_button_operators"/>
 
 		<include layout="@layout/cpp_simple_button_history"/>
 

android-app-core/res/values-de/text_vars.xml

@@ -5,7 +5,7 @@
   <string name="c_var_description_pi">Das Verhältnis von Kreisumfang zu Durchmesser. Hinweis: diese Konstante ist gradunabhängig = &gt; rad: 3,14, deg: 3.14</string>
   <string name="c_var_description_e">Besondere reelle Zahl, so dass der Wert der Ableitung (die Steigung der Tangente) der Funktion f(x) = e ^ X an der Stelle X = 0 gleich 1 ist</string>
   <string name="c_var_description_i">Imaginäre Einheit, die definiert ist, so dass i ^ 2 =-1</string>
-  <string name="c_var_description_c">Lichtgeschwindigkeit im Vakuum, M·s</string>
+  <string name="c_var_description_c">Lichtgeschwindigkeit im Vakuum, M·s ^-1</string>
   <string name="c_var_description_G">Die Gravitationskonstante ist eine empirische physikalische Konstante, die bei der Berechnung der Massenanziehung zwischen Objekten mit Masse, m ^ 3·kg ^ −1·s ^ −2  gilt</string>
   <string name="c_var_description_h">Physikalische Konstante gibt die Größe der Energie Quanten in der Quantenmechanik an, J·s</string>
   <string name="c_var_description_h_reduced">Verringerte Planck Konstante, J·s</string>

android-app-core/res/values-es/text_about.xml

@@ -2,23 +2,23 @@
 <!--Generated by crowdin.net-->
 <resources>
   <string name="c_about">Acerca de</string>
-  <string name="c_about_content">Copyright © 2009–2013\n\n<b>Creado por serso "aka" se.solovyev</b>\n\n
+  <string name="c_about_content">Copyright © 2009–2013\n\n<b>Created by serso aka se.solovyev</b>\n\n
-		Visítanos en Facebook: <a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n
+		We are on Facebook: <a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n
-		Este programa está distribuido bajo licencia Apache 2.0:\nPuede encontrar el código fuente en\n
+		This program is distributed under Apache 2.0 License:\nsource code can be found on\n
 		<a href="https://github.com/serso/android-calculatorpp">http://github.com</a>\n\n
-		Para más información, por favor,\ncontacte con el autor mediante correo electrónico\n
+		For more information please\ncontact the author by email\n
 		<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>
-		\no visite\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n
+		\nor visit\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n
-		Si deseas apoyar el proyecto\npuedes donar desde las preferencias de la aplicación, en la opción especial habilitada para ello\n\n
+		If you want to support the project\nyou can buy a special option from application preferences\n\n
-		Si te gusta la aplicación\nValórala con 5 estrellas en\n
+		If you like the application\nrate it with 5 stars on\n
 		<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n
-		Ésta aplicación utiliza las siguientes librerías de código abierto:\n
+		This application uses next open source libraries:\n
 		<a href="http://simple.sourceforge.net">Simple (XML serialization)</a>\n
 		<a href="http://meditorworld.appspot.com/meditor.txt">JSCL</a>
 	</string>
-  <string name="cpp_translators_text">Está aplicación ha sido traducida al español por: </string>
+  <string name="cpp_translators_text">This app is translated to Spanish by: </string>
-  <string name="cpp_translators_list">Enrique Menéndez</string>
+  <string name="cpp_translators_list"></string>
-  <string name="c_release_notes">Notas de la versión</string>
+  <string name="c_release_notes">Release notes</string>
-  <string name="c_release_notes_for_title">"Notas para la versión "</string>
+  <string name="c_release_notes_for_title">"Release notes for version "</string>
   <string name="cpp_share_link">http://www.facebook.com/calculatorpp</string>
 </resources>

android-app-core/res/values-es/text_functions.xml

@@ -6,29 +6,44 @@
   <string name="c_fun_description_cos">Función trigonométrica coseno</string>
   <string name="c_fun_description_tan">Función trigonométrica tangente</string>
   <string name="c_fun_description_cot">Función trigonométrica cotangente</string>
-  <string name="c_fun_description_asin">Arcoseno - función inversa del seno</string>
+  <string name="c_fun_description_asin">Arcsine - inverse sine function</string>
-  <string name="c_fun_description_acos">Arcocoseno - función inversa del coseno</string>
+  <string name="c_fun_description_acos">Arccosine - inverse cosine function</string>
-  <string name="c_fun_description_atan">Arcotangente - función inversa de la tangente</string>
+  <string name="c_fun_description_atan">Arctangent - inverse tangent function</string>
-  <string name="c_fun_description_acot">Arcocotangente - función inversa de la cotangente</string>
+  <string name="c_fun_description_acot">Arccotangent - inverse cotangent function</string>
-  <string name="c_fun_description_ln">Logaritmo neperiano - logaritmo en base \"e\"</string>
+  <string name="c_fun_description_ln">Logaritmo neperiano - logaritmo de base e</string>
-  <string name="c_fun_description_lg">Logaritmo decimal - logaritmo en base 10</string>
+  <string name="c_fun_description_lg">Decadic logaritmo - logaritmo de base 10</string>
-  <string name="c_fun_description_log">Logaritmo - logaritmo con la base especificada</string>
+  <string name="c_fun_description_log">Logaritmo - logaritmo de la base especificada</string>
   <string name="c_fun_description_exp">Función exponencial</string>
-  <string name="c_fun_description_sqrt">Función Raíz cuadrada</string>
+  <string name="c_fun_description_sqrt">Función Raíz cuadrado</string>
-  <string name="c_fun_description_cubic">Función raíz cúbica</string>
+  <string name="c_fun_description_cubic">Cubic root function</string>
-  <string name="c_fun_description_abs">Devuelve el valor absoluto de un argumento</string>
+  <string name="c_fun_description_abs">Gives absolute value of an argument</string>
-  <string name="c_fun_description_sgn">Devuelve el signo de un argumento: -1 si el argumento es menor que 0, 0 si es igual a 0, y 1 si es mayor que 0</string>
+  <string name="c_fun_description_sgn">Gives the sign of an argument: -1 if argument is less than 0, 0
-  <string name="c_fun_description_eq">Función Igual - Devuelve 1 si dos argumentos son iguales, y 0 si no lo son</string>
+		if equals to 0, 1 if more than 0
-  <string name="c_fun_description_le">Función Menor o Igual que - Devuelve 1 si dos argumentos son iguales o si el primero es menor que el segundo. Devuelve 0 si el primer argumento es mayor</string>
-  <string name="c_fun_description_ge">Función Mayor o Igual que - Devuelve 1 si dos argumentos son iguales o si el primero es mayor que el segundo. Devuelve 0 si el primer argumento es menor</string>
-  <string name="c_fun_description_ne">Función Distinto - Devuelve 1 si dos argumentos no son idénticos, y 0 en caso contrario</string>
-  <string name="c_fun_description_lt">Función Menor que - Devuelve 1 si el primer argumento es menor que el segundo. Devuelve 0 en caso contrario</string>
-  <string name="c_fun_description_gt">Función Mayor que - Devuelve 1 si el primer argumento es mayor que el segundo. Devuelve 0 en caso contrario</string>
-  <string name="c_fun_description_rad">Convierte grados a radianes: º - grados, min - minutos (por defecto = 0), s - segundos (por defecto = 0)
 	</string>
-  <string name="c_fun_description_dms">Convierte grados de notación DMS a notación decimal: º - grados, min - minutos (por defecto = 0), s - segundos (por defecto = 0)
+  <string name="c_fun_description_eq">Función Igual - Devuelve 1 si dos argumentos son iguales, 0 si no lo son
 	</string>
-  <string name="c_fun_description_deg">Convierte de radianes a grados</string>
+  <string name="c_fun_description_le">Función Menor o igual - Devuelve 1 si dos argumentos son iguales o el primero es
+		menor que el segundo, 0 si el primero es mayor
+	</string>
+  <string name="c_fun_description_ge">Función Mayor o igual - Devuelve 1 si dos argumentos son iguales o si el primero
+		es mayor que el segundo, 0 si el primero es menor
+	</string>
+  <string name="c_fun_description_ne">Función Distinto - Devuelve 1 si dos argumentos no son iguales, 0 si son
+		idénticos
+	</string>
+  <string name="c_fun_description_lt">Función Menor - Devuelve 1 si el primer argumento es menor que el segundo, 0 si
+		no lo es
+	</string>
+  <string name="c_fun_description_gt">Función Mayor - Devuelve 1 si el primer argumento es mayor que el segundo, 0 si
+		no lo es
+	</string>
+  <string name="c_fun_description_rad">Convierte grados a radianes: d - grados, m - minutos (por defecto = 0), s -
+		segundos (por defecto = 0)
+	</string>
+  <string name="c_fun_description_dms">Convierte grados de notación DMS a notación decimal: d - grados, m - minutos
+		(por defecto = 0), s - segundos (por defecto = 0)
+	</string>
+  <string name="c_fun_description_deg">Convierte radianes a grados</string>
   <string name="c_fun_category_trig">Trigonométrico</string>
   <string name="c_fun_category_hyper_trig">Hiperbólicas trigonométricas</string>
   <string name="c_fun_category_comparison">Comparación</string>

android-app-core/res/values-es/text_operators.xml

@@ -2,21 +2,27 @@
 <!--Generated by crowdin.net-->
 <resources>
   <string name="c_operators">Operadores</string>
-  <string name="c_op_description_mod">El módulo de operación encuentra el resto de la división de \"x\" por \"y\"</string>
+  <string name="c_op_description_mod">Modulo operation finds the remainder of division of \'x\' by \'y\'</string>
-  <string name="c_op_description_sum">Suma las funciones \"f(i)\", iterativamente en el intervalo \"i\", desde \"inicio\" hasta \"fin\"</string>
+  <string name="c_op_description_sum">Sums functions \'f(i)\', iterating through \'i\' from \'from\' to \'to\'
-  <string name="c_op_description_product">Devuelve el producto de las funciones \"f(i)\", iterativamente en el intervalo \"i\", desde \"inicio\" hasta \"fin\"</string>
+	</string>
-  <string name="c_op_description_derivative">Devuelve la derivada de la orden \"orden\" (por defecto = 1) para las funciones \"f(x)\", en base a la variable \"x\" y calcula en el punto \"punto_x\" (por defecto = mismo valor que \"x\")</string>
+  <string name="c_op_description_product">Gives product of functions \'f(i)\', iterating through \'i\' from \'from\'
-  <string name="c_op_description_integral">Devuelve la integral para la función \"f(x)\" en base a la variable \"x\"</string>
+		to \'to\'
-  <string name="c_op_description_integral_ab">Integra la función \"f(x)\" en base a la variable \"x\" desde \"a\" hasta \"b\"</string>
+	</string>
-  <string name="c_pf_description_factorial">Devuelve el factorial de la expresión anterior</string>
+  <string name="c_op_description_derivative">Gives derivative of order \'order\' (default = 1) of functions \'f(x)\'
-  <string name="c_pf_description_double_factorial">Devuelve el factorial doble de la expresión anterior</string>
+		by \'x\' variable and calculates at point \'x_point\' (default = same as \'x\')
-  <string name="c_pf_description_percent" formatted="false">Devuelve el valor porcentual de la expresión
+	</string>
-		anterior.\nEjemplos:\n
+  <string name="c_op_description_integral">Gives integral of function \'f(x)\' by \'x\' variable</string>
+  <string name="c_op_description_integral_ab">Integrates function \'f(x)\' by \'x\' variable from \'a\' to \'b\'
+	</string>
+  <string name="c_pf_description_factorial">Gives the factorial of the expression before</string>
+  <string name="c_pf_description_double_factorial">Gives the double factorial of the expression before</string>
+  <string name="c_pf_description_percent" formatted="false">Devuelve el valor porcentaje de la expresión
+		antes.\nEjemplos:\n
 		100 + 50% = 150\n
 		100 * 50% = 50\n
 		100 + 100 * 50% * 50% = 125
 	</string>
-  <string name="c_pf_description_degree">Convierte de Grados a Radianes.\n
+  <string name="c_pf_description_degree">Convierte Grados a Radianes.\n
 		Ejemplos:\n
 		268° = 4.67748\n
 		30.21° = 0.52726

android-app-core/res/values-es/text_strings.xml

@@ -2,19 +2,19 @@
 <!--Generated by crowdin.net-->
 <resources>
   <string name="c_app_name">Calculadora++</string>
-  <string name="c_app_name_on_screen">Calculadora++ (Modo ventana)</string>
+  <string name="c_app_name_on_screen">Calculator++ (Window mode)</string>
   <string name="c_app_name_free">Calculadora++ Free</string>
   <string name="c_app_icon_name">Calc++</string>
-  <string name="c_app_settings">Ajustes</string>
+  <string name="c_app_settings">Configuración</string>
   <string name="c_syntax_error">Error</string>
-  <string name="c_result_copied">¡El resultado se ha copiado en el portapapeles!</string>
+  <string name="c_result_copied">Result has been copied to the clipboard!</string>
   <string name="c_settings">Configuración</string>
   <string name="c_help">Ayuda</string>
   <string name="c_vars_and_constants">Variables y Constantes</string>
   <string name="c_prefs_main_category">Ajustes principales</string>
   <string name="c_prefs_calculations_category">Ajustes de Cálculo</string>
   <string name="c_prefs_appearance_category">Ajustes de apariencia</string>
-  <string name="c_prefs_other_category">Otros ajustes</string>
+  <string name="c_prefs_other_category">Other settings</string>
   <string name="c_prefs_drag_button_category">Configuración del deslizamiento de los botones</string>
   <string name="c_down">Abajo</string>
   <string name="c_up">Arriba</string>
@@ -22,21 +22,24 @@
   <string name="c_undo">deshacer</string>
   <string name="c_redo">rehacer</string>
   <string name="c_clear">C</string>
-  <string name="c_erase"></string>
+  <string name="c_erase">borrar</string>
   <string name="c_paste">pegar</string>
-  <string name="c_vars">variables</string>
+  <string name="c_vars">vars</string>
   <string name="c_copy">Copiar</string>
-  <string name="c_plot">Trazar gráfico</string>
+  <string name="c_plot">Parcela gráfico</string>
   <string name="c_graph">Gráfico</string>
   <string name="c_calc_color_display_title">Resaltar expresiones</string>
   <string name="c_calc_round_result_title">Redondear resultado</string>
-  <string name="c_calc_round_result_summary">Activar/desactivar el redondeo del resultado</string>
+  <string name="c_calc_round_result_summary">Activar redondeo del resultado</string>
-  <string name="c_calc_science_notation_title">Notación científica permanente</string>
+  <string name="c_calc_science_notation_title">Always scientific notation</string>
-  <string name="c_calc_science_notation_summary">Si está activado, se fuerza el uso de la notación científica para mostrar el resultado.
+  <string name="c_calc_science_notation_summary">If turned on forces to use only scientific notation of output
-(12.34E-12)</string>
+		(12.34E-12)
+	</string>
   <string name="p_calc_result_precision_title">Precisión del resultado</string>
-  <string name="p_calc_max_calculation_time_title">Tiempo máximo de cálculo</string>
+  <string name="p_calc_max_calculation_time_title">Maximum calculation time</string>
-  <string name="p_calc_max_calculation_time_summary">Si los cálculos superan el límite establecido - la calculadora muestra un error y se detiene</string>
+  <string name="p_calc_max_calculation_time_summary">If calculations exceed specified limit - calculator halts with
+		error
+	</string>
   <string name="c_exit">Salir</string>
   <string name="c_add">Añadir</string>
   <string name="c_cancel">Cancelar</string>
@@ -51,10 +54,11 @@
   <string name="c_var_description">Descripción</string>
   <string name="c_var_create_var">Crear variable</string>
   <string name="c_var_edit_var">Editar variable</string>
-  <string name="c_value_is_not_a_number">¡El valor debe ser numérico o estar vacío: Si tienes parámetros - crea un a función en su lugar!</string>
+  <string name="c_value_is_not_a_number">¡El valor debe ser numérico o estar vacío!</string>
   <string name="c_var_name_clashes">La variable name entra en conflicto con la función name!</string>
   <string name="c_var_already_exists">¡Ya existe una variable con el mismo nombre!</string>
-  <string name="c_name_is_not_valid">El nombre de la constante no es válido: el nombre debe comenzar con una letra, y puede contener letras, dígitos y líneas.
+  <string name="c_name_is_not_valid">El nombre de la Constante no es válido: el nombre debe comenzar con una
+		letra,puede contener letras, dígitos y líneas.
 	</string>
   <string name="c_sys_var_cannot_be_changed">¡Una Variable de Sistema no puede ser cambiada!</string>
   <string name="c_calc_editor_hint">Introducir nuevo cálculo</string>
@@ -80,17 +84,19 @@
   <string name="p_oct">Octal</string>
   <string name="p_bin">Binario</string>
   <string name="c_calc_theme">Tema</string>
-  <string name="p_default_theme">Gris</string>
+  <string name="p_default_theme">Predeterminado</string>
   <string name="p_violet_theme">Violeta</string>
   <string name="p_light_blue_theme">Azul claro</string>
-  <string name="p_metro_blue_theme">Metro Azul (Predeterminado)</string>
+  <string name="p_metro_blue_theme">Metro Blue (Default)</string>
-  <string name="p_metro_green_theme">Metro Verde</string>
+  <string name="p_metro_green_theme">Metro Green</string>
-  <string name="p_metro_purple_theme">Metro Morado</string>
+  <string name="p_metro_purple_theme">Metro Purple</string>
-  <string name="c_calc_result_precision_summary">Precisión en el valor del resultado (todos los cálculos se realizan con la máxima precisión, independientemente del valor de esta opción)</string>
+  <string name="c_calc_result_precision_summary">Precisión del resultado (todos los cálculos se realizar con la máxima
-  <string name="c_calc_color_display_summary">Activa o desactiva los colores y estilos en el editor de la calculadora</string>
+		precisión a pesar del valor de esta opción)
+	</string>
+  <string name="c_calc_color_display_summary">Ajustar colores y estilo en el editor de la calculadora</string>
   <string name="c_calc_theme_summary">Establecer el tema para la Calculadora</string>
   <string name="c_clear_history">Limpiar historial</string>
-  <string name="c_toggle_datetime">Mostrar/Ocultar fecha</string>
+  <string name="c_toggle_datetime">Show/hide date</string>
   <string name="c_simplify_instead_of_numeric">Las constantes siguientes no están definidas: {0}!</string>
   <string name="p_grouping_separator_no">No usar separador de Grupos</string>
   <string name="p_grouping_separator_apostrophe">Apóstrofe (\')</string>
@@ -102,9 +108,9 @@
   <string name="c_calc_layout">Plantilla</string>
   <string name="p_layout_cellphone">Teléfono</string>
   <string name="p_layout_calculator">Calculadora</string>
-  <string name="p_layout_calculator_mobile">Científica (Botones grandes)</string>
+  <string name="p_layout_calculator_mobile">Scientific (Big buttons)</string>
-  <string name="p_layout_simple">Sencilla</string>
+  <string name="p_layout_simple">Simple</string>
-  <string name="p_layout_simple_mobile">Sencilla (Botones grandes)</string>
+  <string name="p_layout_simple_mobile">Simple (Big buttons)</string>
   <string name="c_calc_layout_summary">Establecer la plantilla de los botones</string>
   <string name="c_calc_haptic_feedback_title">Configurar vibración</string>
   <string name="c_calc_haptic_feedback_summary">Vibrar al pulsar un botón</string>
@@ -116,18 +122,19 @@
   <string name="empty_var_error">No se puede crear una constante vacía!</string>
   <string name="not_valid_result">El resultado actual no es válido!</string>
   <string name="c_plot_graph">Gráfico</string>
-  <string name="c_min_x_value">Desde</string>
+  <string name="c_min_x_value">From</string>
-  <string name="c_max_x_value">Hasta</string>
+  <string name="c_max_x_value">To</string>
-  <string name="c_swipe_distance">Distancia de deslizado para los botones</string>
+  <string name="c_swipe_distance">Swipe distance for buttons</string>
-  <string name="c_swipe_distance_summary">Establece la distancia de deslizado para los botones que admiten acciones adicionales de deslizado</string>
+  <string name="c_swipe_distance_summary">Sets swipe distance for buttons that support additional swipe actions
-  <string name="c_comment">Comentario</string>
+	</string>
+  <string name="c_comment">Comment</string>
   <string name="c_history_item_saved">Guardado</string>
   <string name="c_history_item_not_saved">No se guarda</string>
   <string name="c_expression_copied">Expresión copiada en el portapapeles!</string>
   <string name="c_history_item_status">Estado:</string>
   <string name="c_history_item_comment">Comentario:</string>
   <string name="c_use">Utilizar</string>
-  <string name="c_use_short">Uso</string>
+  <string name="c_use_short">Use</string>
   <string name="c_copy_expression">Copia de la expresión</string>
   <string name="c_copy_result">Copia resultado</string>
   <string name="c_history_expression">Valor</string>
@@ -139,134 +146,179 @@
   <string name="c_saved_history">La historia guardada</string>
   <string name="c_history_already_saved">La historia se salvó ya!</string>
   <string name="c_history_must_be_saved">La historia debe ser salvado antes de editar!</string>
-  <string name="c_history_was_removed">¡El historial se ha eliminado satisfactoriamente!</string>
+  <string name="c_history_was_removed">La historia se ha eliminado correctamente!</string>
-  <string name="c_history_saved">¡El historial se ha guardado satisfactoriamente!</string>
+  <string name="c_history_saved">La historia se ha guardado correctamente!</string>
   <string name="c_copy_description">Сopia de la descripción</string>
   <string name="c_copy_value">Сopia el valor</string>
-  <string name="c_first_start_text">¡Gracias por elegir Calculadora++!\n\nCalculadora++ es una potente herramienta para realizar sus cálculos cotidianos.</string>
+  <string name="c_first_start_text">Thank you for choosing Calculator++!\n\nCalculator++ is a powerful tool for making
-  <string name="c_first_start_text_title">Bienvenido</string>
+		everyday calculations.
-  <string name="c_calc_show_release_notes_title">Mostrar notas de la versión</string>
-  <string name="c_calc_show_release_notes_summary">Establece si la ventana emergente de las notas de versión debe aparecer tras actualizar a una nueva versión</string>
-  <string name="c_calc_use_back_button_as_prev_summary">Establece el comportamiento del botón \"Atrás\"</string>
-  <string name="c_calc_use_back_button_as_prev_title">Utilice el botón \"Atrás\" para volver al historial</string>
-  <string name="c_clear_billing_info_summary">Se volverá a cargar la información de compra desde el servidor</string>
-  <string name="c_clear_billing_info_title">Actualizar la información de compra</string>
-  <string name="c_warning">Advertencia</string>
-  <string name="c_error">Error</string>
-  <string name="c_billing_error">No se admite el método de pago: debes disponer de una cuenta de Google Checkout asociada a tu cuenta de Google, y debes estar conectado a internet.</string>
-  <string name="c_calc_ad_free_title">Apoyar el proyecto</string>
-  <string name="c_calc_ad_free_summary">Y eliminar los anuncios</string>
-  <string name="c_calc_already_purchased">¡La opción sin publicidad ya ha sido comprada previamente!</string>
-  <string name="c_calc_purchasing">Realizando compra...</string>
-  <string name="c_calc_clearing">Realizando limpieza...</string>
-  <string name="c_feedback_title">Críticas y comentarios</string>
-  <string name="c_feedback_text">Has usado calculadora ++ y es importante para nosotros saber tu opinión sobre application.\n\n por favor vota calculadora ++ en: \non <a href="https://market.android.com/details?id=org.solovyev.android.calculator"> Google Play</a>, \n deja un comentario o \ndiscuss la \non aplicación <a href="\nhttp://facebook.com/calculatorpp"> Facebook</a>  </string>
-  <string name="c_notespp_announce_text">Buenas noticias - acabo de lanzar una nueva aplicación para Android llamada <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes"> notas ++</a>. \n si usted está interesado en una manera rápida y fácil de hacer notas por favor siga el <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes"> enlace</a> y pruebe de notas ++!  </string>
-  <string name="c_angle_units_changed_to">Las unidades de los ángulos han sido cambiados a \'%s\'!</string>
-  <string name="c_numeral_base_changed_to">Se ha cambiado la base del numeral a \'%s\'!</string>
-  <string name="c_conversion_tool">Herramienta de conversión</string>
-  <string name="c_convert">Convertir a…</string>
-  <string name="convert_to_hex">Convertir a hexagonal</string>
-  <string name="convert_to_bin">Convertir a binario</string>
-  <string name="convert_to_dec">Convertir a numero decimal</string>
-  <string name="editor">Editor</string>
-  <string name="result">Resultado</string>
-  <string name="other">Otro</string>
-  <string name="derivatives">Derivadas/Integrales</string>
-  <string name="crashed">Calculator++ se ha detenido…</string>
-  <string name="crash_dialog_title">Calculator++ reporte de error</string>
-  <string name="crash_dialog_text">  Desafortunadamanete, Calculator++ se ha parado.\n\n
-Para poder arreglar el problema necesitamos información acerca de el error. Es muy recomendable mandar un informe de error, vía email (después de presionar el botón de \'Ok\' verá toda la información que se enviará en una nueva ventana),\n\n
-¿Quiere mandara un reporte de error?</string>
-  <string name="prefs_graph_screen_title">Ajustes de gráfica</string>
-  <string name="prefs_graph_interpolate_function">Gráfico de la función de interpolación</string>
-  <string name="prefs_graph_interpolate_function_summary">Si está marcado, se empleará la interpolación cúbica para dibujar la gráfica de función</string>
-  <string name="prefs_graph_real_color_title">Color de la parte real del gráfico de funciones</string>
-  <string name="prefs_graph_real_color_summary">Establece el color del gráfico de funciones de parte real</string>
-  <string name="prefs_graph_imag_color_title">Color de la parte imaginaria del gráfico de funciones</string>
-  <string name="prefs_graph_imag_color_summary">Establece el color del gráfico de funciones de parte imaginaria</string>
-  <string name="p_white_line_color">Blanco</string>
-  <string name="p_grey_line_color">Gris</string>
-  <string name="p_red_line_color">Rojo</string>
-  <string name="p_blue_line_color">Azul</string>
-  <string name="p_green_line_color">Verde</string>
-  <string name="c_function_name">Nombre</string>
-  <string name="c_function_value">Valor</string>
-  <string name="c_function_description">Descripción</string>
-  <string name="c_function_parameters">Parámetros</string>
-  <string name="function_create_function">Crear función</string>
-  <string name="function_edit_function">Editar función</string>
-  <string name="function_name_is_not_valid">El nombre de la función no es válido: El nombre debe comenzar con una letra, y puede contener letras, dígitos y líneas.</string>
-  <string name="function_already_exists">¡Ya existe una función con el mismo nombre!</string>
-  <string name="function_is_empty">¡El cuerpo de la función no puede estar vacío!</string>
-  <string name="function_param_not_empty">¡El parámetro de la función no puede estar vacío!</string>
-  <string name="function_removal_confirmation_question">¿Estás seguro de que quieres eliminar la función \'%s\'?</string>
-  <string name="empty_function_error">¡No se puede crear una función vacía!</string>
-  <string name="do_not_show_messages_in_session">No mostrar este mensaje hasta la próxima sesión</string>
-  <string name="calculation_messages_dialog_title">Advertencia de Calculadora++</string>
-  <string name="arithmetic_error_while_plot">Se ha producido un error aritmético al trazar: %s</string>
-  <string name="ok">De acuerdo</string>
-  <string name="p_show_calculation_messages_dialog_title">Mostrar mensajes de cálculo en el cuadro de diálogo</string>
-  <string name="p_show_calculation_messages_dialog_summary">Si está activado, se mostrará un cuadro de diálogo especial si se produjera algún mensaje durante los cálculos</string>
-  <string name="fix">Arreglar</string>
-  <string name="p_preferred_numeral_base_title">Sistema de numeración predeterminado</string>
-  <string name="p_preferred_numeral_base_summary">Establece el sistema de numeración predeterminado</string>
-  <string name="preferred_numeral_base_message">El sistema de numeración predeterminado \'%1$s\' difiere del actual \'%2$s\'. ¿Olvidaste deshacer el cambio?</string>
-  <string name="p_preferred_angle_units_title">Unidades de ángulo predeterminadas</string>
-  <string name="p_preferred_angle_units_summary">Establece las unidades de ángulo predeterminadas</string>
-  <string name="preferred_angle_units_message">Las unidades de ángulo predeterminadas \'%1$s\' difieren de las actuales \'%2$s\'. ¿Olvidaste deshacer el cambio?
 	</string>
-  <string name="close">Cerrar</string>
+  <string name="c_first_start_text_title">Welcome</string>
-  <string name="c_app_widget_3x3_name">Calculadora++ Widget (3x3)</string>
+  <string name="c_calc_show_release_notes_title">Show release notes</string>
-  <string name="c_app_widget_3x4_name">Calculadora++ Widget (3x4)</string>
+  <string name="c_calc_show_release_notes_summary">Defines if release notes popup window should appear after update to
-  <string name="c_app_widget_4x4_name">Calculadora++ Widget (4x4)</string>
+		the new version
-  <string name="c_app_widget_4x5_name">Calculadora++ Widget (4x5)</string>
+	</string>
-  <string name="open_onscreen_calculator">Haga clic para abrir la calculadora en modo ventana</string>
+  <string name="c_calc_use_back_button_as_prev_summary">Defines the behaviour of the Back button</string>
-  <string name="prefs_onscreen_title">Ajustes de la calculadora (en ventana separada)</string>
+  <string name="c_calc_use_back_button_as_prev_title">Use Back button as history prev</string>
-  <string name="prefs_onscreen_start_on_boot_title">Iniciar al arrancar</string>
+  <string name="c_clear_billing_info_summary">Purchase information will be reloaded from the server</string>
-  <string name="prefs_onscreen_start_on_boot_summary">Si está activado, Calculadora++ aparecerá en la barra de notificaciones tras el arranque del sistema</string>
+  <string name="c_clear_billing_info_title">Update purchase information</string>
-  <string name="prefs_onscreen_show_app_icon_title">Mostrar icono separado (requiere reiniciar)</string>
+  <string name="c_warning">Warning</string>
-  <string name="prefs_onscreen_show_app_icon_summary">Si está activado, aparecerá un segundo icono en la lista de aplicaciones</string>
+  <string name="c_error">Error</string>
-  <string name="cpp_onscreen_remove_icon_message">Puedes quitar el segundo icono de la lista de aplicaciones desde los ajustes de la aplicación, o pulsando el botón siguiente</string>
+  <string name="c_billing_error">Billing is not supported: you must have Google Checkout account linked to your Google
-  <string name="cpp_this_change_may_require_reboot">Después de realizar este cambio, es posible que tenga que reiniciar</string>
+		account and must be connected to the internet.
-  <string name="cpp_plot_2d">Trazado 2D</string>
+	</string>
-  <string name="cpp_plot_3d">Trazado 3D</string>
+  <string name="c_calc_ad_free_title">Support the project</string>
-  <string name="cpp_plot_functions">Funciones gráficas</string>
+  <string name="c_calc_ad_free_summary">And remove the advertisement</string>
-  <string name="cpp_prefs_graph_plot_imag_title">Trazar la parte imaginaria de la función</string>
+  <string name="c_calc_already_purchased">Ad free option has been already purchased!</string>
-  <string name="cpp_prefs_graph_plot_imag_summary">Si está activado, se trazará la parte imaginaria de la función</string>
+  <string name="c_calc_purchasing">Purchasing…</string>
-  <string name="cpp_monochrome_line_color_type">Monocromo</string>
+  <string name="c_calc_clearing">Clearing…</string>
-  <string name="cpp_color_map_line_color_type">Mapa de color (sólo 3D)</string>
+  <string name="c_feedback_title">Feedback</string>
-  <string name="cpp_solid_line_style">Solido (-----)</string>
+  <string name="c_feedback_text">You have been using Calculator++ for some time \n
-  <string name="cpp_dashed_line_style">Discontinuo (- - -)</string>
+		and it\'s important for us to know your opinion about application.\n\n
-  <string name="cpp_dotted_line_style">Punteado (. . .)</string>
+		Please rate Calculator++ \non<a href="https://market.android.com/details?id=org.solovyev.android.calculator">
-  <string name="cpp_dash_dotted_line_style">Punteado-guionado (-.-.-)</string>
+			Google Play</a>,\n leave a comment or \ndiscuss application \non
-  <string name="cpp_plotter">Trazador de funciones</string>
+		<a href="http://facebook.com/calculatorpp">Facebook</a>
-  <string name="cpp_plot_screenshot">Tomar captura de pantalla</string>
+	</string>
-  <string name="cpp_plot_screenshot_saved">¡La captura de pantalla se ha guardado satisfacoriamente:  %1$s!</string>
+  <string name="c_notespp_announce_text">Good news - I just released new application for Android called
-  <string name="cpp_plot_unable_to_save_screenshot">¡No se ha podido guardar la captura de pantalla porque la tarjeta SD no está montada. Monte la tarjeta SD e inténtelo de nuevo!</string>
+		<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>.\n
-  <string name="cpp_plot_function_line_color_type">Tipo de color de línea</string>
+		If you\'re interesting in fast and easy way of making notes please follow the
-  <string name="cpp_plot_function_line_color">Color de línea</string>
+		<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">link</a>
-  <string name="cpp_plot_function_line_style">Estilo de línea</string>
+		and try Notes++!
-  <string name="cpp_plot_function_line_width">Ancho de línea</string>
+	</string>
-  <string name="cpp_plot_function_settings">Ajustes de la función</string>
+  <string name="c_angle_units_changed_to">Angle units changed to \'%s\'!</string>
-  <string name="cpp_function">Función</string>
+  <string name="c_numeral_base_changed_to">Numeral base changed to \'%s\'!</string>
-  <string name="cpp_pinned">Anclado</string>
+  <string name="c_conversion_tool">Conversion tool</string>
+  <string name="c_convert">Convert to…</string>
+  <string name="convert_to_hex">Convert to hex</string>
+  <string name="convert_to_bin">Convert to bin</string>
+  <string name="convert_to_dec">Convert to dec</string>
+  <string name="editor">Editor</string>
+  <string name="result">Result</string>
+  <string name="other">Other</string>
+  <string name="derivatives">Derivatives/Integrals</string>
+  <string name="crashed">Calculator++ has crashed…</string>
+  <string name="crash_dialog_title">Calculator++ crash report</string>
+  <string name="crash_dialog_text">
+		Unfortunately, Calculator++ has crashed.\n\n
+		In order to fix the problem we need some information about it. It\'s highly recommended to send crash report via
+		email (after pressing \'Ok\' button you will see all sent data in the new window).\n\n
+		Do you want to send crash report?
+	</string>
+  <string name="prefs_graph_screen_title">Graph settings</string>
+  <string name="prefs_graph_interpolate_function">Interpolate function\'s graph</string>
+  <string name="prefs_graph_interpolate_function_summary">If checked cubic interpolation will be used in function
+		graph drawing
+	</string>
+  <string name="prefs_graph_real_color_title">Color of real part of functions graph</string>
+  <string name="prefs_graph_real_color_summary">Sets color of real part functions graph</string>
+  <string name="prefs_graph_imag_color_title">Color of imaginary part of functions graph</string>
+  <string name="prefs_graph_imag_color_summary">Sets color of imaginary part functions graph</string>
+  <string name="p_white_line_color">White</string>
+  <string name="p_grey_line_color">Grey</string>
+  <string name="p_red_line_color">Red</string>
+  <string name="p_blue_line_color">Blue</string>
+  <string name="p_green_line_color">Green</string>
+  <string name="c_function_name">Name</string>
+  <string name="c_function_value">Value</string>
+  <string name="c_function_description">Description</string>
+  <string name="c_function_parameters">Parameters</string>
+  <string name="function_create_function">Create function</string>
+  <string name="function_edit_function">Edit function</string>
+  <string name="function_name_is_not_valid">Name of function is not valid: name must start with letter, can contain
+		letters, digits and underscore.
+	</string>
+  <string name="function_already_exists">Function with same name already exists!</string>
+  <string name="function_is_empty">Function body could not be empty!</string>
+  <string name="function_param_not_empty">Function parameter should not be empty!</string>
+  <string name="function_removal_confirmation_question">Do you really want to delete \'%s\' function?</string>
+  <string name="empty_function_error">Unable to create empty function!</string>
+  <string name="do_not_show_messages_in_session">Do not show this message until next session</string>
+  <string name="calculation_messages_dialog_title">Calculator++ warning</string>
+  <string name="arithmetic_error_while_plot">Arithmetic error occurred while plotting: %s</string>
+  <string name="ok">OK</string>
+  <string name="p_show_calculation_messages_dialog_title">Show calculation messages in dialog</string>
+  <string name="p_show_calculation_messages_dialog_summary">If turned on if any message occurred while calculations
+		special dialog will be shown
+	</string>
+  <string name="fix">Fix</string>
+  <string name="p_preferred_numeral_base_title">Default numeral system</string>
+  <string name="p_preferred_numeral_base_summary">Defines the default numeral system</string>
+  <string name="preferred_numeral_base_message">Default numeral system \'%1$s\' differs from current \'%2$s\'. Forgot
+		to change back?
+	</string>
+  <string name="p_preferred_angle_units_title">Default angle units</string>
+  <string name="p_preferred_angle_units_summary">Defines the default angle units</string>
+  <string name="preferred_angle_units_message">Default angle units \'%1$s\' differs from current \'%2$s\'. Forgot to
+		change back?
+	</string>
+  <string name="close">Close</string>
+  <string name="c_app_widget_3x3_name">Calculator++ Widget (3x3)</string>
+  <string name="c_app_widget_3x4_name">Calculator++ Widget (3x4)</string>
+  <string name="c_app_widget_4x4_name">Calculator++ Widget (4x4)</string>
+  <string name="c_app_widget_4x5_name">Calculator++ Widget (4x5)</string>
+  <string name="open_onscreen_calculator">Click to open calculator in window mode</string>
+  <string name="prefs_onscreen_title">Calculator (in separate window) settings</string>
+  <string name="prefs_onscreen_start_on_boot_title">Start on boot</string>
+  <string name="prefs_onscreen_start_on_boot_summary">If turned on Calculator++ will appear in notification bar after
+		device boot
+	</string>
+  <string name="prefs_onscreen_show_app_icon_title">Show separate icon (require reboot)</string>
+  <string name="prefs_onscreen_show_app_icon_summary">If turned on second icon will be shown in applications\' list
+	</string>
+  <string name="cpp_onscreen_remove_icon_message">You can remove second icon in applications\' list from application
+		settings or by pressing next button
+	</string>
+  <string name="cpp_this_change_may_require_reboot">This change may require reboot</string>
+  <string name="cpp_plot_2d">2D plot</string>
+  <string name="cpp_plot_3d">3D plot</string>
+  <string name="cpp_plot_functions">Graph functions</string>
+  <string name="cpp_prefs_graph_plot_imag_title">Plot imaginary part of function</string>
+  <string name="cpp_prefs_graph_plot_imag_summary">If checked imaginary part of function will be plotted</string>
+  <string name="cpp_monochrome_line_color_type">Monochrome</string>
+  <string name="cpp_color_map_line_color_type">Color map (only 3D)</string>
+  <string name="cpp_solid_line_style">Solid (-----)</string>
+  <string name="cpp_dashed_line_style">Dashed (- - -)</string>
+  <string name="cpp_dotted_line_style">Dotted (. . .)</string>
+  <string name="cpp_dash_dotted_line_style">Dot-dashed (-.-.-)</string>
+  <string name="cpp_plotter">Function plotter</string>
+  <string name="cpp_plot_screenshot">Capture screenshot</string>
+  <string name="cpp_plot_screenshot_saved">Screenshot successfully saved: %1$s!</string>
+  <string name="cpp_plot_unable_to_save_screenshot">Screenshot cannot be saved as SD card is not mounted. Mount SD
+		card and try again!
+	</string>
+  <string name="cpp_plot_function_line_color_type">Line color type</string>
+  <string name="cpp_plot_function_line_color">Line color</string>
+  <string name="cpp_plot_function_line_style">Line style</string>
+  <string name="cpp_plot_function_line_width">Line width</string>
+  <string name="cpp_plot_function_settings">Function settings</string>
+  <string name="cpp_function">Function</string>
+  <string name="cpp_pinned">Pinned</string>
   <string name="cpp_visible">Visible</string>
-  <string name="cpp_plot_button_text">+trazar</string>
+  <string name="cpp_plot_button_text">+plot</string>
-  <string name="cpp_plot_empty_function_error">¡No se puede trazar una función vacía!</string>
+  <string name="cpp_plot_empty_function_error">Unable to plot empty function!</string>
-  <string name="cpp_plot_too_many_variables">¡Imposible trazar: demasiadas variables!</string>
+  <string name="cpp_plot_too_many_variables">Unable to plot: too many variables!</string>
-  <string name="cpp_plot_range">Intervalo gráfico</string>
+  <string name="cpp_plot_range">Graph range</string>
-  <string name="cpp_fullscreen">Pantalla completa</string>
+  <string name="cpp_fullscreen">Fullscreen</string>
-  <string name="cpp_plot_range_x_min">X Mín.</string>
+  <string name="cpp_plot_range_x_min">X Min</string>
-  <string name="cpp_plot_range_x_max">X Máx.</string>
+  <string name="cpp_plot_range_x_max">X Max</string>
-  <string name="cpp_plot_range_y_min">Y Mín.</string>
+  <string name="cpp_plot_range_y_min">Y Min</string>
-  <string name="cpp_plot_range_y_max">Y Máx.</string>
+  <string name="cpp_plot_range_y_max">Y Max</string>
-  <string name="cpp_invalid_number">¡Número no válido!</string>
+  <string name="cpp_invalid_number">Invalid number!</string>
-  <string name="cpp_plot_boundaries_should_differ">¡Los límites del gráfico no deben ser idénticos!</string>
+  <string name="cpp_plot_boundaries_should_differ">Graph boundaries should not be the same!</string>
-  <string name="cpp_apply">Aplicar</string>
+  <string name="cpp_apply">Apply</string>
-  <string name="cpp_message">Mensaje</string>
+  <string name="cpp_message">Message</string>
-  <string name="cpp_continue">Continuar</string>
+  <string name="cpp_continue">Continue</string>
-  <string name="cpp_purchase_text">Apoyar el proyecto es fácil y seguro: Google proporciona el proceso de compra y todo lo que necesitas es una cuenta de Google correctamente configurada.\n\n La información de pago se almacena en los servidores de Google con tu cuenta de Google, y puedes utilizar esta aplicación en varios dispositivos de manera sencilla.\n\n Al pulsar el botón \'Continuar\', se le redireccionará a Google Play para hacer el pago.</string>
+  <string name="cpp_purchase_text">Supporting the project is easy and secure: purchase process is provided by Google
-  <string name="cpp_purchase_title">Comprar</string>
+		and all you need is a properly configured Google account.\n\n
-  <string name="cpp_purchase_thank_you_text">¡Gracias por apoyar esta aplicación! \n\n Pueden pasar varios minutos hasta que la aplicación actualice la información de compra. Puedes revisar la información de compra en tu cuenta de Google siempre que lo desees. \n Ante cualquier problema o pregunta sobre la aplicación, no dudes en contactarme directamente (los datos de contacto están disponibles en Principal-&gt;Menú-&gt;Acerca de)</string>
+		Payment information is stored in Google servers with your Google account and you can easily use application on
+		several devices.\n\n
+		By clicking \'Continue\' button you will be redirected to the Google Play app to make the payment.
+	</string>
+  <string name="cpp_purchase_title">Purchase</string>
+  <string name="cpp_purchase_thank_you_text">Thank you for supporting the application!\n\n It might take several
+		minutes until app will be informed about the purchase. You always can check information about the purchase in
+		your Google Account.\n
+		If you have any problems or questions feel free to contact me directly (contacts are available in
+		Main-&gt;Menu-&gt;About)
+	</string>
 </resources>

android-app-core/res/values-es/text_vars.xml

@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="c_var_description_PI">Relación de la circunferencia del círculo con respecto a su diámetro. Nota: esta constante es dependiente de la unidad de grado=&gt; rad: 3,14, deg: 180,0
+  <string name="c_var_description_PI">Ratio de la circunferencia del círculo a su diámetro. Nota: esta constante es la
+		unidad de medida dependiente =&gt; rad: 3,14, deg: 180,0
 	</string>
-  <string name="c_var_description_pi">Relación de la circunferencia del círculo con respecto a su diámetro. Nota: esta constante es independiente de la unidad de grado=&gt; rad: 3,14, deg: 3,14
+  <string name="c_var_description_pi">Ratio de la circunferencia del círculo a su diámetro. Nota: esta constante es la
+		unidad de medida independientes =&gt; rad: 3.14, deg: 3.14
 	</string>
-  <string name="c_var_description_e">Número real único tal que el valor de la derivada (pendiente de la recta tangente)
+  <string name="c_var_description_e">Número real único como el valor de la derivada (pendiente de la línea tangente)
 		de la función f(x) = e^x en el punto x = 0 es igual a 1
 	</string>
   <string name="c_var_description_i">Unidad imaginaria, definida como i^2 = −1</string>
-  <string name="c_var_description_c">Velocidad de la luz en el vacío, m·s</string>
+  <string name="c_var_description_c">Velocidad de la luz en vacío, m·s^-1</string>
-  <string name="c_var_description_G">La constante gravitatoria es una constante física empírica implicada en el
+  <string name="c_var_description_G">La constante gravitatoria es una constante física empírica consistente en el
-cálculo de la atracción gravitatoria entre objetos con masa, m^3·kg^−1·s^−2
+		cálculo de la atracción gravitatoria entre objetos con masa, m^3·kg^−1·s^−2
 	</string>
-  <string name="c_var_description_h">Constante física que refleja los tamaños de energía cuántica en mecánica cuántica, J·s
+  <string name="c_var_description_h">Constante física que refleja los tamaños de energía cuántica en mecánica
+		cuántica, J·s
 	</string>
-  <string name="c_var_description_h_reduced">Constante de Planck reducida, J·s</string>
+  <string name="c_var_description_h_reduced">Constante Planck reducida, J·s</string>
   <string name="c_var_description_nan">No es un número</string>
   <string name="c_var_description_inf">Infinito</string>
-  <string name="c_var_system">Integrado</string>
+  <string name="c_var_system">Incorporado</string>
   <string name="c_var_my">Mis</string>
 </resources>

android-app-core/res/values-it/text_about.xml

@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="c_about">Info</string>
+  <string name="c_about">About</string>
-  <string name="c_about_content">Copyright © 2009–2013\n\n<b>Created by serso aka se.solovyev</b>\n\n Siamo su Facebook: <a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n Questo programma è distribuito con Licenza Apache 2.0:\nIl codice sorgente si trova su\n<a href="https://github.com/serso/android-calculatorpp">http://github.com</a>\n\n per maggiori informazioni\ncontatta l\'autore via email\n<a href="mailto:se.solovyev@gmail.com"> se.solovyev@gmail.com</a>\no visita il sito\n<a href="http://se.solovyev.org"> http://se.solovyev.org</a>\n\nSe desideri supportare il progetto\npuoi acquistare un\'opzione speciale dalle preferenze dell\'applicazione\n\n
+  <string name="c_about_content">Copyright © 2009–2013\n\n<b>Created by serso aka se.solovyev</b>\n\n
-Se ti piace la applizione\n valutala con 5 stelle su\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n
+		We are on Facebook: <a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n
-Questa applicazione utilizza le seguenti libreria open source:\n
+		This program is distributed under Apache 2.0 License:\nsource code can be found on\n
-<a href="http://simple.sourceforge.net">Simple (serializzazione XML)</a>\n
+		<a href="https://github.com/serso/android-calculatorpp">http://github.com</a>\n\n
-<a href="http://meditorworld.appspot.com/meditor.txt">JSCL</a></string>
+		For more information please\ncontact the author by email\n
-  <string name="cpp_translators_text">Questa app è stata tradotta in Italiano da: </string>
+		<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>
-  <string name="cpp_translators_list"> </string>
+		\nor visit\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n
-  <string name="c_release_notes">Note di versione</string>
+		If you want to support the project\nyou can buy a special option from application preferences\n\n
-  <string name="c_release_notes_for_title">"Novità nella versione "</string>
+		If you like the application\nrate it with 5 stars on\n
+		<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n
+		This application uses next open source libraries:\n
+		<a href="http://simple.sourceforge.net">Simple (XML serialization)</a>\n
+		<a href="http://meditorworld.appspot.com/meditor.txt">JSCL</a>
+	</string>
+  <string name="cpp_translators_text">This app is translated to Italian by: </string>
+  <string name="cpp_translators_list"></string>
+  <string name="c_release_notes">Release notes</string>
+  <string name="c_release_notes_for_title">"Release notes for version "</string>
   <string name="cpp_share_link">http://www.facebook.com/calculatorpp</string>
 </resources>

android-app-core/res/values-it/text_functions.xml

@@ -2,36 +2,45 @@
 <!--Generated by crowdin.net-->
 <resources>
   <string name="c_functions">Funzioni</string>
-  <string name="c_fun_description_sin">Funzione trigonometrica seno</string>
+  <string name="c_fun_description_sin">Trigonometric sine function</string>
-  <string name="c_fun_description_cos">Funzione trigonometrica coseno</string>
+  <string name="c_fun_description_cos">Trigonometric cosine function</string>
-  <string name="c_fun_description_tan">Funzione trigonometrica tangente</string>
+  <string name="c_fun_description_tan">Trigonometric tangent function</string>
-  <string name="c_fun_description_cot">Funzione trigonometrica cotangente</string>
+  <string name="c_fun_description_cot">Trigonometric cotangent function</string>
-  <string name="c_fun_description_asin">Arcoseno - funzione inversa del seno</string>
+  <string name="c_fun_description_asin">Arcsine - inverse sine function</string>
-  <string name="c_fun_description_acos">Arcocoseno - funzione inversa del coseno</string>
+  <string name="c_fun_description_acos">Arccosine - inverse cosine function</string>
-  <string name="c_fun_description_atan">Arcotangente - funzione inversa della tangente</string>
+  <string name="c_fun_description_atan">Arctangent - inverse tangent function</string>
-  <string name="c_fun_description_acot">Arcocotangente - Funzione inversa della cotangente</string>
+  <string name="c_fun_description_acot">Arccotangent - inverse cotangent function</string>
-  <string name="c_fun_description_ln">Logaritmo naturale - Logaritmo in base e</string>
+  <string name="c_fun_description_ln">Natural logarithm - logarithm to base e</string>
-  <string name="c_fun_description_lg">Logaritmo decimale - logaritmo in base 10</string>
+  <string name="c_fun_description_lg">Decadic logarithm - logarithm to base 10</string>
-  <string name="c_fun_description_log">Logaritmo - logaritmo nella base specificata</string>
+  <string name="c_fun_description_log">Logarithm - logarithm the specified base</string>
-  <string name="c_fun_description_exp">Funzione esponenziale</string>
+  <string name="c_fun_description_exp">Exponential function</string>
-  <string name="c_fun_description_sqrt">Funzione radice quadrata</string>
+  <string name="c_fun_description_sqrt">Square root function</string>
-  <string name="c_fun_description_cubic">Funzione radice cubica</string>
+  <string name="c_fun_description_cubic">Cubic root function</string>
-  <string name="c_fun_description_abs">Dà il valore assoluto di un argomento</string>
+  <string name="c_fun_description_abs">Gives absolute value of an argument</string>
-  <string name="c_fun_description_sgn">Dà il segno di un argomento: -1 se l\'argomento è minore di 0, 0 se è uguale a 0, 1 se è più di 0</string>
+  <string name="c_fun_description_sgn">Gives the sign of an argument: -1 if argument is less than 0, 0
-  <string name="c_fun_description_eq">Funzione uguaglianza - restituisce 1 se i due argomenti sono uguali, 0 altrimenti
+		if equals to 0, 1 if more than 0
 	</string>
-  <string name="c_fun_description_le">Funzione minore o uguale - restituisce 1 se due argomenti sono uguali o il primo è minore del secondo, 0 altrimenti</string>
+  <string name="c_fun_description_eq">Equals function - gives 1 if two arguments are equals, 0 otherwise</string>
-  <string name="c_fun_description_ge">Funzione maggiore-o-uguale - restituisce 1 se i due argomenti sono uguali o il primo è maggiore del secondo, 0 altrimenti
+  <string name="c_fun_description_le">Lesser-or-equals function - gives 1 if two arguments are equals or first is less
+		than second, 0 otherwise
 	</string>
-  <string name="c_fun_description_ne">Funzione disuguaglianza - restituisce 1 se i due argomenti non sono uguali, 0 altrimenti
+  <string name="c_fun_description_ge">Greater-or-equals function - gives 1 if two arguments are equals or first is
+		greater than second, 0 otherwise
 	</string>
-  <string name="c_fun_description_lt">Funzione minore - restituisce 1 se il primo argomento è minore del secondo, 0 altrimenti</string>
+  <string name="c_fun_description_ne">Not-equals function - gives 1 if two arguments are not equals, 0 otherwise
-  <string name="c_fun_description_gt">Funzione maggiore - restituisce 1 se il primo argomento è maggiore del secondo, 0 altrimenti</string>
-  <string name="c_fun_description_rad">Converte gradi in radianti: d - gradi, m - minuti (predefinito = 0), s - secondi (predefinito = 0)
 	</string>
-  <string name="c_fun_description_dms">Converte gradi dalla notazione DMS in notazione decimale: d - gradi, m - minuti (predefinito = 0), s - secondi (predefinito = 0)
+  <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_deg">Converte radianti in gradi</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: d - degrees, m - minutes (default = 0), s -
+		seconds (default = 0)
+	</string>
+  <string name="c_fun_description_dms">Converts degrees from DMS notation to decimal notation: d - degrees, m -
+		minutes (default = 0), s - seconds (default = 0)
+	</string>
+  <string name="c_fun_description_deg">Converts radians into degrees</string>
   <string name="c_fun_category_trig">Trigonometriche</string>
   <string name="c_fun_category_hyper_trig">Trigonometriche iperboliche</string>
   <string name="c_fun_category_comparison">Comparazione</string>

android-app-core/res/values-it/text_operators.xml

@@ -2,14 +2,20 @@
 <!--Generated by crowdin.net-->
 <resources>
   <string name="c_operators">Operatori</string>
-  <string name="c_op_description_mod">L\'operatore modulo trova il resto della divisione di \'x\' per \'y\'</string>
+  <string name="c_op_description_mod">Modulo operation finds the remainder of division of \'x\' by \'y\'</string>
-  <string name="c_op_description_sum">Somma le funzioni \'f(i)\', iterando su \'i\' da \'from\' a \'to\'</string>
+  <string name="c_op_description_sum">Sums functions \'f(i)\', iterating through \'i\' from \'from\' to \'to\'
-  <string name="c_op_description_product">Restituisce il prodotto delle funzioni \'f(i)\', iterando su \'i\' da \'from\' a \'to\'</string>
+	</string>
-  <string name="c_op_description_derivative">Restituisce la derivata do ordine \'order\' (predefinito = 1) della funzione \'f(x)\' nella variabile \'x\' e calcolata nel punto \'x_point\' (predefinito = lo stesso di \'x\')</string>
+  <string name="c_op_description_product">Gives product of functions \'f(i)\', iterating through \'i\' from \'from\'
-  <string name="c_op_description_integral">Restituisce l\'integrale della funzione f(x) nella variabile \'x\'</string>
+		to \'to\'
-  <string name="c_op_description_integral_ab">Integra la funzione \'f(x)\' Nella variabile \'x\' tra \'a\' e \'b\'</string>
+	</string>
-  <string name="c_pf_description_factorial">Restituisce il fattoriale della precedente espressione</string>
+  <string name="c_op_description_derivative">Gives derivative of order \'order\' (default = 1) of functions \'f(x)\'
-  <string name="c_pf_description_double_factorial">Restituisce il doppio fattoriale della precedente espressione</string>
+		by \'x\' variable and calculates at point \'x_point\' (default = same as \'x\')
+	</string>
+  <string name="c_op_description_integral">Gives integral of function \'f(x)\' by \'x\' variable</string>
+  <string name="c_op_description_integral_ab">Integrates function \'f(x)\' by \'x\' variable from \'a\' to \'b\'
+	</string>
+  <string name="c_pf_description_factorial">Gives the factorial of the expression before</string>
+  <string name="c_pf_description_double_factorial">Gives the double factorial of the expression before</string>
   <string name="c_pf_description_percent" formatted="false">Restituisce la percentuale dell\'espressione
 		precedente.\nEsempi:\n
 		100 + 50% = 150\n

android-app-core/res/values-it/text_strings.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="c_app_name">Calcolatrice++</string>
+  <string name="c_app_name">Calculator++</string>
-  <string name="c_app_name_on_screen">Calcolatrice++ (Modalità finestra)</string>
+  <string name="c_app_name_on_screen">Calculator++ (Window mode)</string>
-  <string name="c_app_name_free">Calcolatrice++ Free</string>
+  <string name="c_app_name_free">Calculator++ Free</string>
   <string name="c_app_icon_name">Calc++</string>
   <string name="c_app_settings">Impostazioni</string>
   <string name="c_syntax_error">Errore</string>
-  <string name="c_result_copied">Il risultato è stato copiato negli appunti!</string>
+  <string name="c_result_copied">Result has been copied to the clipboard!</string>
   <string name="c_settings">Impostazioni</string>
   <string name="c_help">Aiuto</string>
   <string name="c_vars_and_constants">Variabili e costanti</string>
   <string name="c_prefs_main_category">Impostazioni principali</string>
   <string name="c_prefs_calculations_category">Impostazioni calcolo</string>
   <string name="c_prefs_appearance_category">Impostazioni aspetto</string>
-  <string name="c_prefs_other_category">Altre impostazioni</string>
+  <string name="c_prefs_other_category">Other settings</string>
   <string name="c_prefs_drag_button_category">Impostazioni trascinamento tasti</string>
   <string name="c_down">Giù</string>
   <string name="c_up">Su</string>
@@ -22,20 +22,24 @@
   <string name="c_undo">annulla</string>
   <string name="c_redo">rifai</string>
   <string name="c_clear">C</string>
-  <string name="c_erase"></string>
+  <string name="c_erase">cancella</string>
   <string name="c_paste">incolla</string>
-  <string name="c_vars">variabili</string>
+  <string name="c_vars">vars</string>
   <string name="c_copy">Copiare</string>
   <string name="c_plot">Plot grafico</string>
   <string name="c_graph">Grafico</string>
   <string name="c_calc_color_display_title">Evidenzia espressioni</string>
   <string name="c_calc_round_result_title">Arrotonda risultato</string>
   <string name="c_calc_round_result_summary">Attiva/disattiva arrotondamento dei risultati</string>
-  <string name="c_calc_science_notation_title">Sempre la notazione scientifica</string>
+  <string name="c_calc_science_notation_title">Always scientific notation</string>
-  <string name="c_calc_science_notation_summary">Se attivo, forza ad usare solo la notazione scientifica di output (12.34E-12)</string>
+  <string name="c_calc_science_notation_summary">If turned on forces to use only scientific notation of output
+		(12.34E-12)
+	</string>
   <string name="p_calc_result_precision_title">Precisione del risultato</string>
-  <string name="p_calc_max_calculation_time_title">Tempo massimo di calcolo</string>
+  <string name="p_calc_max_calculation_time_title">Maximum calculation time</string>
-  <string name="p_calc_max_calculation_time_summary">Se i calcoli superano il limite specificato - la calcolatrice si ferma con un errore</string>
+  <string name="p_calc_max_calculation_time_summary">If calculations exceed specified limit - calculator halts with
+		error
+	</string>
   <string name="c_exit">Esci</string>
   <string name="c_add">Aggiungi</string>
   <string name="c_cancel">Annulla</string>
@@ -50,9 +54,9 @@
   <string name="c_var_description">Descrizione</string>
   <string name="c_var_create_var">Crea variabile</string>
   <string name="c_var_edit_var">Modifica variabile</string>
-  <string name="c_value_is_not_a_number">Il valore deve essere un numero o lasciato vuoto: se disponi di parametri, crea invece una funzione!</string>
+  <string name="c_value_is_not_a_number">Il valore deve essere un numero o vuoto!</string>
   <string name="c_var_name_clashes">Il nome della variabile entra in conflitto col nome della funzione!</string>
-  <string name="c_var_already_exists">Esiste già una variabile con lo stesso nome!</string>
+  <string name="c_var_already_exists">Una variabile con lo stesso nome esiste già!</string>
   <string name="c_name_is_not_valid">Il nome della costante non è valido: il nome deve iniziare con una lettera, può
 		contenere lettere, cifre e underscore.
 	</string>
@@ -88,12 +92,12 @@
   <string name="c_calc_result_precision_summary">Precisione del risultato (tutti i calcoli sono fatti con la massima
 		precisione, indipendentemente dal valore di questa opzione)
 	</string>
-  <string name="c_calc_color_display_summary">Attiva o disattiva la colorazione e lo styling dell\'editor
+  <string name="c_calc_color_display_summary">Attiva o disattiva la colorazione e lo styling dell\' editor
 		calcolatrice
 	</string>
   <string name="c_calc_theme_summary">Imposta il tema per la calcolatrice</string>
   <string name="c_clear_history">Cancella cronologia</string>
-  <string name="c_toggle_datetime">Mostra/nascondi data</string>
+  <string name="c_toggle_datetime">Show/hide date</string>
   <string name="c_simplify_instead_of_numeric">Le prossime costanti sono indefinite: {0}!</string>
   <string name="p_grouping_separator_no">Nessun separatore</string>
   <string name="p_grouping_separator_apostrophe">Apostrofo (\')</string>
@@ -105,9 +109,9 @@
   <string name="c_calc_layout">Layout</string>
   <string name="p_layout_cellphone">Cellulare</string>
   <string name="p_layout_calculator">Calcolatrice</string>
-  <string name="p_layout_calculator_mobile">Scientifico (tasti grandi)</string>
+  <string name="p_layout_calculator_mobile">Scientific (Big buttons)</string>
-  <string name="p_layout_simple">Semplice</string>
+  <string name="p_layout_simple">Simple</string>
-  <string name="p_layout_simple_mobile">Semplice (tasti grandi)</string>
+  <string name="p_layout_simple_mobile">Simple (Big buttons)</string>
   <string name="c_calc_layout_summary">Imposta layout per i pulsanti</string>
   <string name="c_calc_haptic_feedback_title">Feedback tattile</string>
   <string name="c_calc_haptic_feedback_summary">Attiva o disattiva la vibrazione su click dei pulsanti</string>
@@ -122,7 +126,8 @@
   <string name="c_min_x_value">Da</string>
   <string name="c_max_x_value">A</string>
   <string name="c_swipe_distance">Swipe distanza per i pulsanti</string>
-  <string name="c_swipe_distance_summary">Imposta distanza swipe per i pulsanti che supportano azioni swipe supplementari
+  <string name="c_swipe_distance_summary">Imposta distanza swipe per i pulsanti che supportano le azioni swipe
+		supplementare
 	</string>
   <string name="c_comment">Commento</string>
   <string name="c_history_item_saved">Salvato</string>
@@ -131,7 +136,7 @@
   <string name="c_history_item_status">Stato:</string>
   <string name="c_history_item_comment">Commento:</string>
   <string name="c_use">Uso</string>
-  <string name="c_use_short">Uso</string>
+  <string name="c_use_short">Use</string>
   <string name="c_copy_expression">Copia espressione</string>
   <string name="c_copy_result">Copia risultato</string>
   <string name="c_history_expression">Valore</string>
@@ -143,139 +148,179 @@
   <string name="c_saved_history">Storia salvati</string>
   <string name="c_history_already_saved">La storia era già salvato!</string>
   <string name="c_history_must_be_saved">La storia deve essere salvato prima di modificare!</string>
-  <string name="c_history_was_removed">La cronologia è stata rimossa con successo!</string>
+  <string name="c_history_was_removed">La storia è stata rimossa con successo!</string>
-  <string name="c_history_saved">La cronologia è stata salvata correttamente!</string>
+  <string name="c_history_saved">La storia è stata salvata correttamente!</string>
   <string name="c_copy_description">Сopia descrizione</string>
   <string name="c_copy_value">Сopia il valore</string>
-  <string name="c_first_start_text">Grazie per aver scelto Calculator++!\n\nCalculator++ è un potente strumento per fare calcoli ogni giorno.</string>
+  <string name="c_first_start_text">Thank you for choosing Calculator++!\n\nCalculator++ is a powerful tool for making
-  <string name="c_first_start_text_title">Benvenuti</string>
+		everyday calculations.
-  <string name="c_calc_show_release_notes_title">Visualizza le note di versione</string>
+	</string>
-  <string name="c_calc_show_release_notes_summary">Definisce se la finestra popup delle note di versione debba comparire dopo l\'aggiornamento alla nuova versione</string>
+  <string name="c_first_start_text_title">Welcome</string>
-  <string name="c_calc_use_back_button_as_prev_summary">Definisce il comportamento del pulsante Indietro</string>
+  <string name="c_calc_show_release_notes_title">Show release notes</string>
-  <string name="c_calc_use_back_button_as_prev_title">Usa il pulsante indietro per la cronologia precedente</string>
+  <string name="c_calc_show_release_notes_summary">Defines if release notes popup window should appear after update to
-  <string name="c_clear_billing_info_summary">Le Informazioni sugli acquisti verranno scaricate nuovamente dal server</string>
+		the new version
-  <string name="c_clear_billing_info_title">Aggiornare le informazioni di acquisto</string>
+	</string>
-  <string name="c_warning">Attenzione</string>
+  <string name="c_calc_use_back_button_as_prev_summary">Defines the behaviour of the Back button</string>
-  <string name="c_error">Errore</string>
+  <string name="c_calc_use_back_button_as_prev_title">Use Back button as history prev</string>
-  <string name="c_billing_error">La fatturazione non è supportata: si deve avere un account Google Checkout collegato all\'account Google e si deve essere collegati ad internet.</string>
+  <string name="c_clear_billing_info_summary">Purchase information will be reloaded from the server</string>
-  <string name="c_calc_ad_free_title">Supportare il progetto</string>
+  <string name="c_clear_billing_info_title">Update purchase information</string>
-  <string name="c_calc_ad_free_summary">E rimuovere la pubblicità</string>
+  <string name="c_warning">Warning</string>
-  <string name="c_calc_already_purchased">L\'opzione di rimozione annunci pubblicitari è stata già acquistata!</string>
+  <string name="c_error">Error</string>
-  <string name="c_calc_purchasing">Acquisto in corso…</string>
+  <string name="c_billing_error">Billing is not supported: you must have Google Checkout account linked to your Google
-  <string name="c_calc_clearing">Pulizia in corso…</string>
+		account and must be connected to the internet.
-  <string name="c_feedback_title">Commenti</string>
+	</string>
-  <string name="c_feedback_text">State usando Calculator++ da un po\' di tempo\n
+  <string name="c_calc_ad_free_title">Support the project</string>
-ed è importante per noi conoscere la vostra opinione sull\'applicazione.\n\n
+  <string name="c_calc_ad_free_summary">And remove the advertisement</string>
-Per favore valutate Calculator++ \nsu <a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>,\n lasciate un commento o \npartecipate alla discussione sull\'applicazione \nsu <a href="http://facebook.com/calculatorpp"> Facebook</a></string>
+  <string name="c_calc_already_purchased">Ad free option has been already purchased!</string>
-  <string name="c_notespp_announce_text">Buone notizie - ho appena rilasciato una nuova applicazione per Android chiamata <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>.\nSe siete interessati ad un modo facile e veloce per prendere note e appunti per favore seguite il  <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">collegamento</a> e provate Notes++!</string>
+  <string name="c_calc_purchasing">Purchasing…</string>
-  <string name="c_angle_units_changed_to">Le unità di misura per gli angoli sono state impostate su \'%s\'!</string>
+  <string name="c_calc_clearing">Clearing…</string>
-  <string name="c_numeral_base_changed_to">La base per i numeri è stata impostata su \'%s\'!</string>
+  <string name="c_feedback_title">Feedback</string>
-  <string name="c_conversion_tool">Strumenti di conversione</string>
+  <string name="c_feedback_text">You have been using Calculator++ for some time \n
-  <string name="c_convert">Converti in…</string>
+		and it\'s important for us to know your opinion about application.\n\n
-  <string name="convert_to_hex">Converti in esadecimale (hex)</string>
+		Please rate Calculator++ \non<a href="https://market.android.com/details?id=org.solovyev.android.calculator">
-  <string name="convert_to_bin">Converti in binario (bin)</string>
+			Google Play</a>,\n leave a comment or \ndiscuss application \non
-  <string name="convert_to_dec">Converti in decimale (dec)</string>
+		<a href="http://facebook.com/calculatorpp">Facebook</a>
+	</string>
+  <string name="c_notespp_announce_text">Good news - I just released new application for Android called
+		<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>.\n
+		If you\'re interesting in fast and easy way of making notes please follow the
+		<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">link</a>
+		and try Notes++!
+	</string>
+  <string name="c_angle_units_changed_to">Angle units changed to \'%s\'!</string>
+  <string name="c_numeral_base_changed_to">Numeral base changed to \'%s\'!</string>
+  <string name="c_conversion_tool">Conversion tool</string>
+  <string name="c_convert">Convert to…</string>
+  <string name="convert_to_hex">Convert to hex</string>
+  <string name="convert_to_bin">Convert to bin</string>
+  <string name="convert_to_dec">Convert to dec</string>
   <string name="editor">Editor</string>
-  <string name="result">Risultato</string>
+  <string name="result">Result</string>
-  <string name="other">Altri</string>
+  <string name="other">Other</string>
-  <string name="derivatives">Derivate/Integrali</string>
+  <string name="derivatives">Derivatives/Integrals</string>
-  <string name="crashed">Calculator++ è andato in crash…</string>
+  <string name="crashed">Calculator++ has crashed…</string>
-  <string name="crash_dialog_title">Rapporto crash di Calculator++</string>
+  <string name="crash_dialog_title">Calculator++ crash report</string>
-  <string name="crash_dialog_text">  Sfortunatamente, Calculator + + si è chiuso.\n\n
+  <string name="crash_dialog_text">
-Per risolvere il problema, abbiamo bisogno di alcune informazioni. E\' altamente consigliato inviare un report via e-mail (dopo aver premuto il tasto \'Ok\' vedrete tutti inviati dati in una nuova finestra).\n\n 
+		Unfortunately, Calculator++ has crashed.\n\n
-Vuoi inviare un report? </string>
+		In order to fix the problem we need some information about it. It\'s highly recommended to send crash report via
-  <string name="prefs_graph_screen_title">impostazioni grafici</string>
+		email (after pressing \'Ok\' button you will see all sent data in the new window).\n\n
-  <string name="prefs_graph_interpolate_function">Grafico della funzione interpolata</string>
+		Do you want to send crash report?
-  <string name="prefs_graph_interpolate_function_summary">Se selezionata,  l\'interpolazione cubica verrà usata nel disegno del grafico</string>
+	</string>
-  <string name="prefs_graph_real_color_title">Colore della parte reale del grafico della funzione</string>
+  <string name="prefs_graph_screen_title">Graph settings</string>
-  <string name="prefs_graph_real_color_summary">Imposta i colori della parte reale del grafico della funzione</string>
+  <string name="prefs_graph_interpolate_function">Interpolate function\'s graph</string>
-  <string name="prefs_graph_imag_color_title">Colore della parte immaginaria del grafico della funzione</string>
+  <string name="prefs_graph_interpolate_function_summary">If checked cubic interpolation will be used in function
-  <string name="prefs_graph_imag_color_summary">Imposta il colore della parte immaginaria del grafico della funzione</string>
+		graph drawing
-  <string name="p_white_line_color">Bianco</string>
+	</string>
-  <string name="p_grey_line_color">Grigio</string>
+  <string name="prefs_graph_real_color_title">Color of real part of functions graph</string>
-  <string name="p_red_line_color">Rosso</string>
+  <string name="prefs_graph_real_color_summary">Sets color of real part functions graph</string>
-  <string name="p_blue_line_color">Blu</string>
+  <string name="prefs_graph_imag_color_title">Color of imaginary part of functions graph</string>
-  <string name="p_green_line_color">Verde</string>
+  <string name="prefs_graph_imag_color_summary">Sets color of imaginary part functions graph</string>
-  <string name="c_function_name">Nome</string>
+  <string name="p_white_line_color">White</string>
-  <string name="c_function_value">Valore</string>
+  <string name="p_grey_line_color">Grey</string>
-  <string name="c_function_description">Descrizione</string>
+  <string name="p_red_line_color">Red</string>
-  <string name="c_function_parameters">Parametri</string>
+  <string name="p_blue_line_color">Blue</string>
-  <string name="function_create_function">Crea la funzione</string>
+  <string name="p_green_line_color">Green</string>
-  <string name="function_edit_function">Modifica funzione</string>
+  <string name="c_function_name">Name</string>
-  <string name="function_name_is_not_valid">Il nome della funzione non è valido: deve iniziare con una lettera, può contenere lettere, cifre e la sottolineatura. </string>
+  <string name="c_function_value">Value</string>
-  <string name="function_already_exists">Funzione con lo stesso nome esiste già!</string>
+  <string name="c_function_description">Description</string>
-  <string name="function_is_empty">Il corpo della funzione non può essere vuoto!</string>
+  <string name="c_function_parameters">Parameters</string>
-  <string name="function_param_not_empty">I parametri della funzione non possono essere vuoti!</string>
+  <string name="function_create_function">Create function</string>
-  <string name="function_removal_confirmation_question">Vuoi veramente eliminare la funzione \'%s\'?</string>
+  <string name="function_edit_function">Edit function</string>
-  <string name="empty_function_error"> Impassibile creare funzioni con argomento nullo!</string>
+  <string name="function_name_is_not_valid">Name of function is not valid: name must start with letter, can contain
-  <string name="do_not_show_messages_in_session">Non mostrare questo messaggio fino alla prossima sessione</string>
+		letters, digits and underscore.
-  <string name="calculation_messages_dialog_title">Avvertimento di calculator++</string>
+	</string>
-  <string name="arithmetic_error_while_plot">Un errore  aritmetico è avvenuto nel rappresentare il grafico di: %s</string>
+  <string name="function_already_exists">Function with same name already exists!</string>
-  <string name="ok">Ok</string>
+  <string name="function_is_empty">Function body could not be empty!</string>
-  <string name="p_show_calculation_messages_dialog_title">Mostra i messaggi del calcolo nella finestra</string>
+  <string name="function_param_not_empty">Function parameter should not be empty!</string>
-  <string name="p_show_calculation_messages_dialog_summary">Se attivato, qualsiasi messaggio relativo ai calcoli sarà mostrato in una finestra apposita</string>
+  <string name="function_removal_confirmation_question">Do you really want to delete \'%s\' function?</string>
-  <string name="fix">Sistemare</string>
+  <string name="empty_function_error">Unable to create empty function!</string>
-  <string name="p_preferred_numeral_base_title">Sistema numerico predefinito</string>
+  <string name="do_not_show_messages_in_session">Do not show this message until next session</string>
-  <string name="p_preferred_numeral_base_summary">Imposta il sistema numerico predefinito</string>
+  <string name="calculation_messages_dialog_title">Calculator++ warning</string>
-  <string name="preferred_numeral_base_message">Il sistema numerico predefinito \'%1$s\' differisce da quello corrente \'%2$s\'. Dimenticato di cambiarlo?</string>
+  <string name="arithmetic_error_while_plot">Arithmetic error occurred while plotting: %s</string>
-  <string name="p_preferred_angle_units_title">Unità di misura predefinita per gli angoli</string>
+  <string name="ok">OK</string>
-  <string name="p_preferred_angle_units_summary">Imposta l\'unità di misura predefinita  degli angoli</string>
+  <string name="p_show_calculation_messages_dialog_title">Show calculation messages in dialog</string>
-  <string name="preferred_angle_units_message">Unita di misura predefinita per gli angoli \'%1$s\' differisce da quella attuale \'%2$s\'. Dimenticato di cambiarla?</string>
+  <string name="p_show_calculation_messages_dialog_summary">If turned on if any message occurred while calculations
-  <string name="close">Chiudi</string>
+		special dialog will be shown
+	</string>
+  <string name="fix">Fix</string>
+  <string name="p_preferred_numeral_base_title">Default numeral system</string>
+  <string name="p_preferred_numeral_base_summary">Defines the default numeral system</string>
+  <string name="preferred_numeral_base_message">Default numeral system \'%1$s\' differs from current \'%2$s\'. Forgot
+		to change back?
+	</string>
+  <string name="p_preferred_angle_units_title">Default angle units</string>
+  <string name="p_preferred_angle_units_summary">Defines the default angle units</string>
+  <string name="preferred_angle_units_message">Default angle units \'%1$s\' differs from current \'%2$s\'. Forgot to
+		change back?
+	</string>
+  <string name="close">Close</string>
   <string name="c_app_widget_3x3_name">Calculator++ Widget (3x3)</string>
   <string name="c_app_widget_3x4_name">Calculator++ Widget (3x4)</string>
   <string name="c_app_widget_4x4_name">Calculator++ Widget (4x4)</string>
   <string name="c_app_widget_4x5_name">Calculator++ Widget (4x5)</string>
-  <string name="open_onscreen_calculator">Clicca per aprire la calcolatrice in modalità finestra</string>
+  <string name="open_onscreen_calculator">Click to open calculator in window mode</string>
-  <string name="prefs_onscreen_title">Impostazioni Calculator (in finestra separata)</string>
+  <string name="prefs_onscreen_title">Calculator (in separate window) settings</string>
-  <string name="prefs_onscreen_start_on_boot_title">Apri all\'avvio</string>
+  <string name="prefs_onscreen_start_on_boot_title">Start on boot</string>
-  <string name="prefs_onscreen_start_on_boot_summary">Se selezionato, Calculator + + apparirà nella barra di notifica dopo l\'avvio del dispositivo</string>
+  <string name="prefs_onscreen_start_on_boot_summary">If turned on Calculator++ will appear in notification bar after
-  <string name="prefs_onscreen_show_app_icon_title">Visualizza icona separata (richiede riavvio)</string>
+		device boot
-  <string name="prefs_onscreen_show_app_icon_summary">Se selezionato, la seconda icona apparirà nella lista delle applicazioni</string>
+	</string>
-  <string name="cpp_onscreen_remove_icon_message">È possibile rimuovere la seconda icona nella lista delle applicazioni, nelle impostazioni dell\'applicazione o premendo il pulsante avanti</string>
+  <string name="prefs_onscreen_show_app_icon_title">Show separate icon (require reboot)</string>
-  <string name="cpp_this_change_may_require_reboot">Questo cambiamento potrebbe richiedere il riavvio</string>
+  <string name="prefs_onscreen_show_app_icon_summary">If turned on second icon will be shown in applications\' list
-  <string name="cpp_plot_2d">Grafico 2D</string>
+	</string>
-  <string name="cpp_plot_3d">Grafico 3D</string>
+  <string name="cpp_onscreen_remove_icon_message">You can remove second icon in applications\' list from application
-  <string name="cpp_plot_functions">Funzioni del grafico</string>
+		settings or by pressing next button
-  <string name="cpp_prefs_graph_plot_imag_title">Rappresenta la parte immaginaria della funzione</string>
+	</string>
-  <string name="cpp_prefs_graph_plot_imag_summary">Se selezionato, la parte immaginaria della funzione sarà rappresentata</string>
+  <string name="cpp_this_change_may_require_reboot">This change may require reboot</string>
-  <string name="cpp_monochrome_line_color_type">Monocromo</string>
+  <string name="cpp_plot_2d">2D plot</string>
-  <string name="cpp_color_map_line_color_type">Colore mappa (solo 3D)</string>
+  <string name="cpp_plot_3d">3D plot</string>
-  <string name="cpp_solid_line_style">Solido (-----)</string>
+  <string name="cpp_plot_functions">Graph functions</string>
-  <string name="cpp_dashed_line_style">Tratteggiato (- - -)</string>
+  <string name="cpp_prefs_graph_plot_imag_title">Plot imaginary part of function</string>
-  <string name="cpp_dotted_line_style">A puntini (. . .)</string>
+  <string name="cpp_prefs_graph_plot_imag_summary">If checked imaginary part of function will be plotted</string>
-  <string name="cpp_dash_dotted_line_style">Punto-linea (-.-.-)</string>
+  <string name="cpp_monochrome_line_color_type">Monochrome</string>
-  <string name="cpp_plotter">Rappresenta la funzione</string>
+  <string name="cpp_color_map_line_color_type">Color map (only 3D)</string>
-  <string name="cpp_plot_screenshot">cattura la schermata</string>
+  <string name="cpp_solid_line_style">Solid (-----)</string>
-  <string name="cpp_plot_screenshot_saved">La schermata è stata salvata con successo: \'%1$s\'!</string>
+  <string name="cpp_dashed_line_style">Dashed (- - -)</string>
-  <string name="cpp_plot_unable_to_save_screenshot">La schermata non può essere salvata perché la scheda SD non è inserita. Inserire la scheda e provare ancora!</string>
+  <string name="cpp_dotted_line_style">Dotted (. . .)</string>
-  <string name="cpp_plot_function_line_color_type">Tipo del colore della linea</string>
+  <string name="cpp_dash_dotted_line_style">Dot-dashed (-.-.-)</string>
-  <string name="cpp_plot_function_line_color">Colore linea</string>
+  <string name="cpp_plotter">Function plotter</string>
-  <string name="cpp_plot_function_line_style">Stile linea</string>
+  <string name="cpp_plot_screenshot">Capture screenshot</string>
-  <string name="cpp_plot_function_line_width">Spessore Linea</string>
+  <string name="cpp_plot_screenshot_saved">Screenshot successfully saved: %1$s!</string>
-  <string name="cpp_plot_function_settings">Impostazioni funzione</string>
+  <string name="cpp_plot_unable_to_save_screenshot">Screenshot cannot be saved as SD card is not mounted. Mount SD
-  <string name="cpp_function">Funzione</string>
+		card and try again!
-  <string name="cpp_pinned">Bloccato</string>
+	</string>
-  <string name="cpp_visible">Visibile</string>
+  <string name="cpp_plot_function_line_color_type">Line color type</string>
-  <string name="cpp_plot_button_text">Disegna</string>
+  <string name="cpp_plot_function_line_color">Line color</string>
-  <string name="cpp_plot_empty_function_error">Impassibile rappresentare funzioni vuote!</string>
+  <string name="cpp_plot_function_line_style">Line style</string>
-  <string name="cpp_plot_too_many_variables">Impassibile rappresentare: troppe variabili!</string>
+  <string name="cpp_plot_function_line_width">Line width</string>
-  <string name="cpp_plot_range">Intervallo del grafico</string>
+  <string name="cpp_plot_function_settings">Function settings</string>
-  <string name="cpp_fullscreen">Schermo intero</string>
+  <string name="cpp_function">Function</string>
-  <string name="cpp_plot_range_x_min">Minimo x</string>
+  <string name="cpp_pinned">Pinned</string>
-  <string name="cpp_plot_range_x_max">Massimo x</string>
+  <string name="cpp_visible">Visible</string>
-  <string name="cpp_plot_range_y_min">Minimo y</string>
+  <string name="cpp_plot_button_text">+plot</string>
-  <string name="cpp_plot_range_y_max">Massimo y</string>
+  <string name="cpp_plot_empty_function_error">Unable to plot empty function!</string>
-  <string name="cpp_invalid_number">Numero non valido!</string>
+  <string name="cpp_plot_too_many_variables">Unable to plot: too many variables!</string>
-  <string name="cpp_plot_boundaries_should_differ">I limiti del grafico devono essere distinti!</string>
+  <string name="cpp_plot_range">Graph range</string>
-  <string name="cpp_apply">Applica</string>
+  <string name="cpp_fullscreen">Fullscreen</string>
-  <string name="cpp_message">Messaggio</string>
+  <string name="cpp_plot_range_x_min">X Min</string>
-  <string name="cpp_continue">Continua</string>
+  <string name="cpp_plot_range_x_max">X Max</string>
-  <string name="cpp_purchase_text">Sostenere il progetto è facile e sicuro: il processo di pagamento è fornito da Google, e tutto ciò di cui hai bisogno è un account correttamente configurato. 
+  <string name="cpp_plot_range_y_min">Y Min</string>
-Le informazioni di pagamento sono memorizzate nei server di Google nel tuo account e puoi utilizzare facilmente  quest\'applicazione su svariati apparecchi.
+  <string name="cpp_plot_range_y_max">Y Max</string>
-premendo \'continua\' sarai indirizzato all\'applicazione Google play per effettuare il pagamento. </string>
+  <string name="cpp_invalid_number">Invalid number!</string>
-  <string name="cpp_purchase_title">Acquista</string>
+  <string name="cpp_plot_boundaries_should_differ">Graph boundaries should not be the same!</string>
-  <string name="cpp_purchase_thank_you_text">Grazie per il supporto a questa applicazione!
+  <string name="cpp_apply">Apply</string>
-Potrebbero servire alcuno minuti prima che l\'applicazione venga informata dell\'acquisto. Puoi sempre verificare le informazioni sul pagamento nel tuo account Google. 
+  <string name="cpp_message">Message</string>
-In caso di problemi o domande puoi contattare direttamente me(i contatto sono disponibili in main->menu->about)</string>
+  <string name="cpp_continue">Continue</string>
+  <string name="cpp_purchase_text">Supporting the project is easy and secure: purchase process is provided by Google
+		and all you need is a properly configured Google account.\n\n
+		Payment information is stored in Google servers with your Google account and you can easily use application on
+		several devices.\n\n
+		By clicking \'Continue\' button you will be redirected to the Google Play app to make the payment.
+	</string>
+  <string name="cpp_purchase_title">Purchase</string>
+  <string name="cpp_purchase_thank_you_text">Thank you for supporting the application!\n\n It might take several
+		minutes until app will be informed about the purchase. You always can check information about the purchase in
+		your Google Account.\n
+		If you have any problems or questions feel free to contact me directly (contacts are available in
+		Main-&gt;Menu-&gt;About)
+	</string>
 </resources>

android-app-core/res/values-it/text_vars.xml

@@ -11,7 +11,7 @@
 		tangente) della funzione f(x) = e^x nel punto x = 0 che è uguale a 1
 	</string>
   <string name="c_var_description_i">Unità immaginaria, definita come i^2 = -1</string>
-  <string name="c_var_description_c">Velocità della luce nel vuoto, m·s</string>
+  <string name="c_var_description_c">Velocità della luce nel vuoto, m·s^-1</string>
   <string name="c_var_description_G">La costante gravitazionale è una costante fisica empirica coinvolta nel calcolo
 		dell\' attrazione gravitazionale tra gli oggetti con massa, m^3·kg^−1·s^−2
 	</string>
@@ -21,6 +21,6 @@
   <string name="c_var_description_h_reduced">Costante di riduzione di Planck, J·s</string>
   <string name="c_var_description_nan">Non è un numero</string>
   <string name="c_var_description_inf">Infinito</string>
-  <string name="c_var_system">Integrato</string>
+  <string name="c_var_system">Built-in</string>
   <string name="c_var_my">Mie</string>
 </resources>

android-app-core/res/values-pl/text_about.xml

@@ -3,7 +3,7 @@
 <resources>
   <string name="c_about">O aplikacji</string>
   <string name="c_about_content">Copyright © 2009–2013\n\n<b>Stworzona przez serso aka se.solovyev</b>\n\n
-Jesteśmy na Facebooku: <a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n
+Jesteśmy na Facebooku:<a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n
 Program jest rozpowszechniany pod licencją Apache 2.0 License:\nkod źródłowy można znaleźć na\n
 <a href="https://github.com/serso/android-calculatorpp">http://github.com</a>\n\n
 Po więcej informacji proszę\nkontaktować się z autorem poprzez email\n
@@ -15,8 +15,8 @@ Jeżeli podoba Ci się aplikacja\noceń ją na 5 gwiazdek na\n
 Ten program używa następujących bibliotek otwartego oprogramowania:\n
 <a href="http://simple.sourceforge.net">Simple (XML serialization)</a>\n
 <a href="http://meditorworld.appspot.com/meditor.txt">JSCL</a></string>
-  <string name="cpp_translators_text">Aplikacja została przetłumaczona na język polski przez: </string>
+  <string name="cpp_translators_text">Aplikacja została przetłumaczona na język angielski przez: </string>
-  <string name="cpp_translators_list">Łukasz Witkiewicz</string>
+  <string name="cpp_translators_list">Sergey Solovyev</string>
   <string name="c_release_notes">Informacje o wydaniu</string>
   <string name="c_release_notes_for_title">"Informacje o wydaniu dla wersji "</string>
   <string name="cpp_share_link">http://www.facebook.com/calculatorpp</string>

android-app-core/res/values-pl/text_operators.xml

@@ -2,12 +2,12 @@
 <!--Generated by crowdin.net-->
 <resources>
   <string name="c_operators">Operatory</string>
-  <string name="c_op_description_mod">Operacja modulo. Wyznacza resztę z dzielenia \'x\' przez \'y\'</string>
+  <string name="c_op_description_mod">Operacja modulo wyznacza resztę z dzielenia \'x\' przez \'y\'</string>
-  <string name="c_op_description_sum">Sumuje funkcje \'f(i)\' po \'i\', zaczynając interację od \'from\', a kończąc na \'to\'</string>
+  <string name="c_op_description_sum">Sumuje funkcje \'f(i)\' po \'i\', zaczynając od \'from\', a kończąc na \'to\'</string>
-  <string name="c_op_description_product">Mnoży funkcje \'f(i)\' po \'i\', zaczynając interację od \'from\', a kończąc na \'to\'</string>
+  <string name="c_op_description_product">Mnoży funkcje \'f(i)\' po \'i\', zaczynając od \'from\', a kończąc na \'to\'</string>
   <string name="c_op_description_derivative">Oblicza pochodną stopnia \'order\' (domyślnie = 1) funkcji \'f(x)\' po zmiennej \'x\' i oblicza jej wartość w punkcie \'x_point\' (domyślnie = taki sam jak \'x\')</string>
   <string name="c_op_description_integral">Oblicza całkę nieoznaczoną z funkcji \'f(x)\' po zmiennej \'x\'</string>
-  <string name="c_op_description_integral_ab">Całkuje funkcję \'f(x)\' po zmiennej \'x\' od punktu \'a\' do punktu \'b\'</string>
+  <string name="c_op_description_integral_ab">Całkuje funkcję \'f(x)\' po zmiennej \'x\' od \'a\' do \'b\'</string>
   <string name="c_pf_description_factorial">Oblicza silnię podanego wyrażenia</string>
   <string name="c_pf_description_double_factorial">Oblicza silnię podwójną podanego wyrażenia</string>
   <string name="c_pf_description_percent" formatted="false">Oblicza wartość procentową podanego wyrażenia.\n

android-app-core/res/values-pl/text_preferences.xml

@@ -5,7 +5,7 @@
   <string name="c_auto_orientation_summary">Ekran aplikacji będzie obracał się zgodnie z położeniem urządzenia</string>
   <string name="c_show_equals_button_title">Pokaż przycisk \'=\'</string>
   <string name="c_show_equals_button_summary">Przycisk \'=\' pojawi się na ekranie</string>
-  <string name="c_hide_numeral_base_digits_title">Ukryj znaki innych systemów liczbowych</string>
+  <string name="c_hide_numeral_base_digits_title">Ukryj podstawę systemu liczbowego</string>
   <string name="c_hide_numeral_base_digits_summary">Znaki systemów liczbowych o innej podstawie nie będą wyświetlane</string>
   <string name="prefs_history_show_intermediate_calculations_title">Pokaż obliczenia pośrednie w historii</string>
   <string name="prefs_history_show_intermediate_calculations_summary">Wszystkie obliczenia będą widoczne w historii</string>

android-app-core/res/values-pl/text_strings.xml

@@ -28,7 +28,7 @@
   <string name="c_copy">Kopiuj</string>
   <string name="c_plot">Stwórz wykres</string>
   <string name="c_graph">Wykres</string>
-  <string name="c_calc_color_display_title">Wyróżnianie wyrażeń</string>
+  <string name="c_calc_color_display_title">Podświetl wyrażenia</string>
   <string name="c_calc_round_result_title">Zaokrąglanie wyniku</string>
   <string name="c_calc_round_result_summary">Włącza zaokrąglanie wyniku</string>
   <string name="c_calc_science_notation_title">Zawsze notacja naukowa</string>
@@ -48,7 +48,7 @@
   <string name="c_var_name">Nazwa</string>
   <string name="c_var_value">Wartość</string>
   <string name="c_var_description">Opis</string>
-  <string name="c_var_create_var">Stwórz zmienną</string>
+  <string name="c_var_create_var">Utwórz zmienną</string>
   <string name="c_var_edit_var">Edytuj zmienną</string>
   <string name="c_value_is_not_a_number">Wartość musi być liczbą lub być pusta: jeśli masz parametry - stwórz funkcję zamiast tego!</string>
   <string name="c_var_name_clashes">Nazwa zmiennej pokrywa się z nazwą funkcji!</string>
@@ -83,7 +83,7 @@
   <string name="p_metro_green_theme">Zielony Metro</string>
   <string name="p_metro_purple_theme">Fioletowy Metro</string>
   <string name="c_calc_result_precision_summary">Dokładność wyświetlanego wyniku (wszystkie obliczenia są wykonywane przy maksymalnej dokładności, niezależnie od tej opcji)</string>
-  <string name="c_calc_color_display_summary">Włącza cieniowanie i wyróżnianie w polu edytora (np. nazw funkcji, argumentów)</string>
+  <string name="c_calc_color_display_summary">Toggles colouring and styling in calculator editor</string>
   <string name="c_calc_theme_summary">Ustawia wygląd kalkulatora</string>
   <string name="c_clear_history">Wyczyść historię</string>
   <string name="c_toggle_datetime">Pokaż/ukryj datę</string>

android-app-core/res/values-pl/text_vars.xml

@@ -3,12 +3,12 @@
 <resources>
   <string name="c_var_description_PI">Stosunek obwodu koła do jego średnicy. Uwaga: ta stała jest zależna od jednostki =&gt; rad: 3.14, deg: 180.0</string>
   <string name="c_var_description_pi">Stosunek obwodu koła do jego średnicy. Uwaga: ta stała jest niezależna od jednostki =&gt; rad: 3.14, deg: 3.14</string>
-  <string name="c_var_description_e">Liczba rzeczywista, taka że wartość pochodnej funkcji f(x) = e^x w punkcie x = 0 wynosi 1</string>
+  <string name="c_var_description_e">Liczba rzeczywista, taka że wartość pochodnej (nachylenia stycznej) funkcji f(x) = e^x w punkcie x = 0 wynosi 1</string>
   <string name="c_var_description_i">Jednostka urojona, zdefiniowana, tak że i^2 = -1</string>
-  <string name="c_var_description_c">Prędkość światła w próżni, [m·s]</string>
+  <string name="c_var_description_c">Prędkość światła w próżni, m·s^-1</string>
-  <string name="c_var_description_G">Stała grawitacji jest empiryczną stałą fizyczną służącą do obliczeń przyciągania grawitacyjnego między obiektami posiadającymi masę, [m^3·kg^−1·s^−2]</string>
+  <string name="c_var_description_G">Stała grawitacji jest empiryczną stałą fizyczną służącą do obliczeń przyciągania grawitacyjnego między obiektami posiadającymi masę, m^3·kg^−1·s^−2</string>
-  <string name="c_var_description_h">Stała Plancka to stała fizyczna, która opisuje wielkość kwantów energii w mechanice kwantowej, [J·s]</string>
+  <string name="c_var_description_h">Stała Plancka to stała fizyczna, która opisuje wielkość kwantów energii w mechanice kwantowej, J·s</string>
-  <string name="c_var_description_h_reduced">Zredukowana stała Plancka, [J·s]</string>
+  <string name="c_var_description_h_reduced">Zredukowana stała Plancka, J·s</string>
   <string name="c_var_description_nan">Nie jest liczbą</string>
   <string name="c_var_description_inf">Nieskończoność</string>
   <string name="c_var_system">Wbudowane</string>

android-app-core/res/values-ru/text_release_notes.xml

@@ -22,9 +22,6 @@
 
 <resources>
 
-	<string name="c_release_notes">Примечания к выпуску</string>
-	<string name="c_release_notes_for_title">"Примечания к выпуску версии "</string>
-
 	<string name="c_release_notes_for_4">
 		1. Отклик на нажатие\n
 		2. Две раскладки кнопок\n
@@ -262,9 +259,18 @@
 		1. Полностью переработан графопостроитель\n
 		2. Добавлена возможность построения нескольких функций на одном графике\n
 		3. Добавлено построение в 3D\n
-		4. Добавлена возможность деать скриншоты графика\n
+		4. Добавлена возможность делать скриншоты графика\n
 		5. Исправлены проблемы с пользовательскими функциями\n
 		6. Другие исправления
 	</string>
 
+	<string name="c_release_notes_for_118">
+		1. Немецкий и польский языки\n
+		2. Визард\n
+		3. Улучшения графопостроителя\n
+		4. Исправлена пролема с Asin(i)\n
+		5. Греческие буквы для названий переменных\n
+		6. Другие исправления и улучшения
+	</string>
+
 </resources>

android-app-core/res/values-uk/text_about.xml

@@ -2,9 +2,22 @@
 <!--Generated by crowdin.net-->
 <resources>
   <string name="c_about">Про програму</string>
-  <string name="c_about_content">Авторське право © 2009–2013\n\n <b>Розроблено serso aka se.solovyev</b> \n\n Ми на Facebook:  <a href="http://facebook.com/calculatorpp"> http://facebook.com/calculatorpp</a>\n\n Ця програма розповсюджується на умовах ліцензії Apache 2.0 : \n Джерельний код програми можна знайти на\n <a href="https://github.com/serso/android-calculatorpp"> http://github.com</a> \n\n За докладнішою інформацією, будь ласка, \n зв\'яжіться з автором через електронну пошту\n <a href="mailto:se.solovyev@gmail.com"> se.solovyev@gmail.com</a>, \n або відвідайте\n <a href="http://se.solovyev.org"> http://se.solovyev.org</a> \n\n Для підтримки проекту\n ви можете придбати спеціальний пункт в налаштуваннях програми\n\n Якщо вам подобається програма,\n то оцініть її в 5 зірок на\n <a href="https://market.android.com/details?id=org.solovyev.android.calculator"> Google Play</a> \n\n Ця програма використовує такі бібліотеки з відкритим кодом: \n <a href="http://simple.sourceforge.net"> Simple (XML serialization)</a> \n <a href="http://meditorworld.appspot.com/meditor.txt"> JSCL</a></string>
+  <string name="c_about_content">Copyright © 2009–2013\n\n<b>Created by serso aka se.solovyev</b>\n\n
-  <string name="cpp_translators_text">Український переклад: </string>
+		We are on Facebook: <a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n
-  <string name="cpp_translators_list">Андрієм Бандурою  та sergniko</string>
+		This program is distributed under Apache 2.0 License:\nsource code can be found on\n
+		<a href="https://github.com/serso/android-calculatorpp">http://github.com</a>\n\n
+		For more information please\ncontact the author by email\n
+		<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>
+		\nor visit\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n
+		If you want to support the project\nyou can buy a special option from application preferences\n\n
+		If you like the application\nrate it with 5 stars on\n
+		<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n
+		This application uses next open source libraries:\n
+		<a href="http://simple.sourceforge.net">Simple (XML serialization)</a>\n
+		<a href="http://meditorworld.appspot.com/meditor.txt">JSCL</a>
+	</string>
+  <string name="cpp_translators_text">This app is translated to Ukrainian by: </string>
+  <string name="cpp_translators_list"></string>
   <string name="c_release_notes">Замітки до випуску</string>
   <string name="c_release_notes_for_title">"Замітки до випуску версії "</string>
   <string name="cpp_share_link">http://www.facebook.com/calculatorpp</string>

android-app-core/res/values-uk/text_functions.xml

@@ -2,34 +2,46 @@
 <!--Generated by crowdin.net-->
 <resources>
   <string name="c_functions">Функції</string>
-  <string name="c_fun_description_sin">Тригонометрична функція - синус</string>
+  <string name="c_fun_description_sin">Тригонометрична фунція синус</string>
-  <string name="c_fun_description_cos">Тригонометрична функція - косинус</string>
+  <string name="c_fun_description_cos">Тригонометрична функція косинус</string>
-  <string name="c_fun_description_tan">Тригонометрична функція - тангенс</string>
+  <string name="c_fun_description_tan">Тригонометрична функція тангенс</string>
-  <string name="c_fun_description_cot">Тригонометрична функція - котангенс</string>
+  <string name="c_fun_description_cot">Тригонометрична функція котангенс</string>
-  <string name="c_fun_description_asin">Арксинус - обернена до синуса функція</string>
+  <string name="c_fun_description_asin">Arcsine - inverse sine function</string>
-  <string name="c_fun_description_acos">Арккосинус - обернена до косинуса функція</string>
+  <string name="c_fun_description_acos">Arccosine - inverse cosine function</string>
-  <string name="c_fun_description_atan">Арктангенс - обернена до косинуса функція</string>
+  <string name="c_fun_description_atan">Arctangent - inverse tangent function</string>
-  <string name="c_fun_description_acot">Арккотангенс - обернена до котангенса</string>
+  <string name="c_fun_description_acot">Arccotangent - inverse cotangent function</string>
-  <string name="c_fun_description_ln">Натуральний логарифм - логарифм за основою e</string>
+  <string name="c_fun_description_ln">Натуральний логариф - логарифм за основою e</string>
   <string name="c_fun_description_lg">Десятковий логарифм - логарифм за основою 10</string>
   <string name="c_fun_description_log">Логарифм - логарифм за заданою основою</string>
   <string name="c_fun_description_exp">Експонента</string>
   <string name="c_fun_description_sqrt">Квадратний корінь</string>
   <string name="c_fun_description_cubic">Кубічний корінь</string>
-  <string name="c_fun_description_abs">Обчислює абсолютне значення (модуль) аргументу</string>
+  <string name="c_fun_description_abs">Gives absolute value of an argument</string>
-  <string name="c_fun_description_sgn">Обчислює знак аргументу: -1 - якщо аргумент менший за 0, 0 - якщо дорівнює 0, 1 -  якщо більший за 0</string>
+  <string name="c_fun_description_sgn">Gives the sign of an argument: -1 if argument is less than 0, 0
-  <string name="c_fun_description_eq">Функція рівності - дає результат 1, якщо обидва аргументи рівні, інакше 0</string>
+		if equals to 0, 1 if more than 0
-  <string name="c_fun_description_le">Функція менше або дорівнює - дає 1, якщо перший аргумент менший або дорівнює другому, 0 - в іншому випадку</string>
-  <string name="c_fun_description_ge">Функція більше або дорівнює - дає 1, якщо перший аргумент більший або дорівнює другому, 0 - в іншому випадку</string>
-  <string name="c_fun_description_ne">Функція не-дорівнює - дає 1, якщо перший аргумент не дорівнює другому, інакше - 0
 	</string>
-  <string name="c_fun_description_lt">Функція менше - дає 1, якщо перший аргумент менший другого, 0 - в іншому випадку</string>
+  <string name="c_fun_description_eq">Фунцкія рівності - дає результат 1, якщо обидва аргументи рівні, інакше 0
-  <string name="c_fun_description_gt">Функція більше - дає 1, якщо перший аргумент більший за другий, 0 - в іншому випадку</string>
-  <string name="c_fun_description_rad">Перетворює градуси у радіани: d - градуси, m - мінути (типово= 0), s - секунди (типово= 0)
 	</string>
-  <string name="c_fun_description_dms">Перетворює градуси із запису градус, мінута, секунда у десятковий запис: d - градуси, m - мінути (типово = 0), s - секунди (типово = 0)
+  <string name="c_fun_description_le">Lesser-or-equals function - gives 1 if two arguments are equals or first is less
+		than second, 0 otherwise
 	</string>
-  <string name="c_fun_description_deg">Перетворює радіани у градуси</string>
+  <string name="c_fun_description_ge">Greater-or-equals function - gives 1 if two arguments are equals or first is
+		greater than second, 0 otherwise
+	</string>
+  <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: d - degrees, m - minutes (default = 0), s -
+		seconds (default = 0)
+	</string>
+  <string name="c_fun_description_dms">Converts degrees from DMS notation to decimal notation: d - degrees, m -
+		minutes (default = 0), s - seconds (default = 0)
+	</string>
+  <string name="c_fun_description_deg">Converts radians into degrees</string>
   <string name="c_fun_category_trig">Тригонометричні</string>
   <string name="c_fun_category_hyper_trig">Гіперболічні</string>
   <string name="c_fun_category_comparison">Порівняння</string>

android-app-core/res/values-uk/text_operators.xml

@@ -2,16 +2,20 @@
 <!--Generated by crowdin.net-->
 <resources>
   <string name="c_operators">Оператори</string>
-  <string name="c_op_description_mod">Операція ділення за модулем обчислює остачу від ділення \'x\' на \'y\'</string>
+  <string name="c_op_description_mod">Modulo operation finds the remainder of division of \'x\' by \'y\'</string>
-  <string name="c_op_description_sum">Сумує функції \'f(i)\', де змінна \'i\' міняється від \'from\' до \'to\'.
+  <string name="c_op_description_sum">Sums functions \'f(i)\', iterating through \'i\' from \'from\' to \'to\'
 	</string>
-  <string name="c_op_description_product">Обчислює добуток функцій \'f(i)\', де змінна \'i\' міняється від \'from\' до \'to\'.
+  <string name="c_op_description_product">Gives product of functions \'f(i)\', iterating through \'i\' from \'from\'
+		to \'to\'
 	</string>
-  <string name="c_op_description_derivative">Повертає похідну порядку \'order\' (типово = 1) функції \'f(x)\' по змінній \'x\' та обчислює її значення у точці \'x_point\' (типово = така ж як \'x\')</string>
+  <string name="c_op_description_derivative">Gives derivative of order \'order\' (default = 1) of functions \'f(x)\'
-  <string name="c_op_description_integral">Повертає інтеграл від функції \'f(x)\' по змінній \'x\'</string>
+		by \'x\' variable and calculates at point \'x_point\' (default = same as \'x\')
-  <string name="c_op_description_integral_ab">Обчислює інтеграл від функції \'f(x)\' по змінній \'x\' від \'a\' до \'b\'</string>
+	</string>
-  <string name="c_pf_description_factorial">Обчислює факторіал попередного виразу</string>
+  <string name="c_op_description_integral">Gives integral of function \'f(x)\' by \'x\' variable</string>
-  <string name="c_pf_description_double_factorial">Обчислює подвійний факторіал попереднього виразу</string>
+  <string name="c_op_description_integral_ab">Integrates function \'f(x)\' by \'x\' variable from \'a\' to \'b\'
+	</string>
+  <string name="c_pf_description_factorial">Gives the factorial of the expression before</string>
+  <string name="c_pf_description_double_factorial">Gives the double factorial of the expression before</string>
   <string name="c_pf_description_percent" formatted="false">Обчислює відсоток від попереднього виразу.\nПриклади:\n
 		100 + 50% = 150\n
 		100 * 50% = 50\n

android-app-core/res/values-uk/text_strings.xml

@@ -2,12 +2,12 @@
 <!--Generated by crowdin.net-->
 <resources>
   <string name="c_app_name">Калькулятор++</string>
-  <string name="c_app_name_on_screen">Калькулятор + + (віконний режим)</string>
+  <string name="c_app_name_on_screen">Calculator++ (Window mode)</string>
   <string name="c_app_name_free">Калькулятор++ Free</string>
   <string name="c_app_icon_name">Кальк++</string>
   <string name="c_app_settings">Налаштування</string>
   <string name="c_syntax_error">Помилка</string>
-  <string name="c_result_copied">Результат був скопійований до буферу обміну!</string>
+  <string name="c_result_copied">Result has been copied to the clipboard!</string>
   <string name="c_settings">Налаштування</string>
   <string name="c_help">Допомога</string>
   <string name="c_vars_and_constants">Змінні та константи</string>
@@ -20,17 +20,17 @@
   <string name="c_up">Вгору</string>
   <string name="c_restart">Перезавантаження</string>
   <string name="c_undo">назад</string>
-  <string name="c_redo">повторити</string>
+  <string name="c_redo">вперед</string>
   <string name="c_clear">C</string>
-  <string name="c_erase"></string>
+  <string name="c_erase">вилучити</string>
   <string name="c_paste">вставити</string>
   <string name="c_vars">змінні</string>
   <string name="c_copy">Копіювати</string>
   <string name="c_plot">Побудувати графік</string>
   <string name="c_graph">Графік</string>
   <string name="c_calc_color_display_title">Підсвітка виразів</string>
-  <string name="c_calc_round_result_title">Округлювати результат</string>
+  <string name="c_calc_round_result_title">Заокруглювати результат</string>
-  <string name="c_calc_round_result_summary">Включити/вимкнути округлення результату</string>
+  <string name="c_calc_round_result_summary">Включити/вимкнути заокруглення результату</string>
   <string name="c_calc_science_notation_title">Завжди експоненціальна форма</string>
   <string name="c_calc_science_notation_summary">Якщо включено, то результат буде записано лише у експоненціальній
 		формі (12.34E-12)
@@ -54,23 +54,25 @@
   <string name="c_var_description">Опис</string>
   <string name="c_var_create_var">Створити змінну</string>
   <string name="c_var_edit_var">Редагувати змінну</string>
-  <string name="c_value_is_not_a_number">Значення має бути відсутнім або числом: якщо ви використовуєте параметри - визначте функцію замість цього!</string>
+  <string name="c_value_is_not_a_number">Значення може бути порожнім або числом!</string>
   <string name="c_var_name_clashes">Ім’я змінної не може бути зарезервованим системним ім’ям!</string>
   <string name="c_var_already_exists">Змінна з таким іменем вже існує!</string>
-  <string name="c_name_is_not_valid">Неприпустиме ім\'я змінної: ім\'я має починатися з літери, може містити літери, цифри та знак підкреслення(_).</string>
+  <string name="c_name_is_not_valid">Невірне ім’я змінної: воно мусить починатися з букви, може містити букви, цифри
+		та знак підкреслення (_).
+	</string>
   <string name="c_sys_var_cannot_be_changed">Системну змінну не можна змінювати!</string>
   <string name="c_calc_editor_hint">Введіть новий вираз</string>
-  <string name="c_press_to_copy">Натисніть для копіювання</string>
+  <string name="c_press_to_copy">натисніть для копіювання</string>
   <string name="c_continue">Продовжити</string>
   <string name="c_history">Історія</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">Історія порожня!</string>
+  <string name="c_history_is_empty">Іторія порожня!</string>
-  <string name="c_app_history">Історія</string>
+  <string name="c_app_history">Іторія</string>
   <string name="c_char_is_not_accepted">Символ \'%s\' не допустимий у імені змінної!</string>
   <string name="c_calc_angle_units">Одиниці виміру кутів</string>
   <string name="p_deg">Градуси</string>
   <string name="p_rad">Радіани</string>
-  <string name="p_grad">Гради</string>
+  <string name="p_grad">Градуси</string>
   <string name="p_turns">Обороти</string>
   <string name="c_angle_units_summary">Визначає типову одиницю виміру кутів.</string>
   <string name="c_calc_numeral_bases">Системи числення</string>
@@ -86,26 +88,26 @@
   <string name="p_metro_blue_theme">Метро Синя (типова)</string>
   <string name="p_metro_green_theme">Метро Зелена</string>
   <string name="p_metro_purple_theme">Метро Пурпурова</string>
-  <string name="c_calc_result_precision_summary">Точність відображення результату (усі обчислення проводяться максимально точно, незалежно від цього параметру)
+  <string name="c_calc_result_precision_summary">Точність результату (усі обчислення проводяться максимально точно)
 	</string>
-  <string name="c_calc_color_display_summary">Вмикнути/вимкнути підсвітку у редакторі калькулятора</string>
+  <string name="c_calc_color_display_summary">Включити/вимкнути підсвітку у редакторі калькулятора</string>
   <string name="c_calc_theme_summary">Встановити тему калькулятора</string>
   <string name="c_clear_history">Очистити історію</string>
-  <string name="c_toggle_datetime">Відображення дати</string>
+  <string name="c_toggle_datetime">Show/hide date</string>
-  <string name="c_simplify_instead_of_numeric">Наступні константи невизначені: {0}!</string>
+  <string name="c_simplify_instead_of_numeric">наступні сталі невизначені: {0}!</string>
-  <string name="p_grouping_separator_no">Не використовувати роздільник розрядів</string>
+  <string name="p_grouping_separator_no">Не використовувати роздільник класів</string>
   <string name="p_grouping_separator_apostrophe">Апостроф (\')</string>
-  <string name="p_grouping_separator_space">Пробіл ( )</string>
+  <string name="p_grouping_separator_space">Пропуск ( )</string>
-  <string name="c_calc_grouping_separator">Роздільник розрядів</string>
+  <string name="c_calc_grouping_separator">Роздільник класів</string>
-  <string name="c_calc_grouping_separator_summary">Задає роздільник розрядів</string>
+  <string name="c_calc_grouping_separator_summary">Задає роздільник класів</string>
   <string name="c_calc_multiplication_sign">Знак множення</string>
-  <string name="c_calc_multiplication_sign_summary">Задає вигляд знаку множення</string>
+  <string name="c_calc_multiplication_sign_summary">Задає знак множення</string>
   <string name="c_calc_layout">Розкладка</string>
   <string name="p_layout_cellphone">Наукова (телефон)</string>
   <string name="p_layout_calculator">Наукова</string>
-  <string name="p_layout_calculator_mobile">Науковий (великі кнопки)</string>
+  <string name="p_layout_calculator_mobile">Scientific (Big buttons)</string>
   <string name="p_layout_simple">Проста</string>
-  <string name="p_layout_simple_mobile">Простий (великі кнопки)</string>
+  <string name="p_layout_simple_mobile">Simple (Big buttons)</string>
   <string name="c_calc_layout_summary">Задає розкладку кнопок</string>
   <string name="c_calc_haptic_feedback_title">Вібрація при натисканні</string>
   <string name="c_calc_haptic_feedback_summary">Включити/виключити вібрацію при натисканні</string>
@@ -113,14 +115,16 @@
   <string name="p_calc_haptic_feedback_strength_middle">Середня</string>
   <string name="p_calc_haptic_feedback_strength_long">Велика</string>
   <string name="p_calc_haptic_feedback_duration_title">Тривалість вібрації</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Тривалість вібрації при натисканні</string>
+  <string name="p_calc_haptic_feedback_duration_summary">Тривалість вібрації на натискання</string>
   <string name="empty_var_error">Не можна створити порожню константу!</string>
   <string name="not_valid_result">Поточний результат не допустимий!</string>
   <string name="c_plot_graph">Графік</string>
   <string name="c_min_x_value">Від</string>
   <string name="c_max_x_value">До</string>
   <string name="c_swipe_distance">Відстань розмаху (свайпу) для кнопок</string>
-  <string name="c_swipe_distance_summary">Задає відстань розмаху для кнопок, які підтримують додаткові дії для свайпу</string>
+  <string name="c_swipe_distance_summary">Задає відстань розмаху для кнопок, які підтримують додаткові дії для
+		свайпу
+	</string>
   <string name="c_comment">Коментар</string>
   <string name="c_history_item_saved">Збережено</string>
   <string name="c_history_item_not_saved">Не збережено</string>
@@ -152,7 +156,7 @@
 		після оновлення до нової версії
 	</string>
   <string name="c_calc_use_back_button_as_prev_summary">Визначити поведінку кнопку Назад</string>
-  <string name="c_calc_use_back_button_as_prev_title">Використовувати кнопку Назад як крок назад по історії</string>
+  <string name="c_calc_use_back_button_as_prev_title">Використовувати кнопку Назад як назад по історії</string>
   <string name="c_clear_billing_info_summary">Інформація про купівлю буде оновлена із сервера</string>
   <string name="c_clear_billing_info_title">Очистити інформацію про купівлю</string>
   <string name="c_warning">Увага</string>
@@ -173,7 +177,12 @@
 		коментар або \nобговоріть програму \nна
 		<a href="http://facebook.com/calculatorpp">Facebook</a>
 	</string>
-  <string name="c_notespp_announce_text">Гарні новини - я щойно випустив нову програму для Android, яка називається <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>. \n Якщо ви зацікавлені в швидкому і простому способі створення нотатків, будь ласка, перейдіть за <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">посиланням</a> та спробуйте Notes++!</string>
+  <string name="c_notespp_announce_text">Good news - I just released new application for Android called
+		<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>.\n
+		If you\'re interesting in fast and easy way of making notes please follow the
+		<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">link</a>
+		and try Notes++!
+	</string>
   <string name="c_angle_units_changed_to">Одиниці виміру кутів змінено на \'%s\'!</string>
   <string name="c_numeral_base_changed_to">Система числення змінена на \'%s\'!</string>
   <string name="c_conversion_tool">Перетворення чисел</string>
@@ -181,101 +190,133 @@
   <string name="convert_to_hex">Перетворити в hex</string>
   <string name="convert_to_bin">Перетворити в bin</string>
   <string name="convert_to_dec">Перетворити в dec</string>
-  <string name="editor">Редактор</string>
+  <string name="editor">Editor</string>
-  <string name="result">Результат</string>
+  <string name="result">Result</string>
-  <string name="other">Інші</string>
+  <string name="other">Other</string>
-  <string name="derivatives">Похідні/Інтеграли</string>
+  <string name="derivatives">Derivatives/Integrals</string>
-  <string name="crashed">Калькулятор++ аварійно завершив роботу...</string>
+  <string name="crashed">Calculator++ has crashed…</string>
-  <string name="crash_dialog_title">Звіт Калькулятор++ про аварійне завершення роботи</string>
+  <string name="crash_dialog_title">Calculator++ crash report</string>
-  <string name="crash_dialog_text">На жаль, Калькулятор++ аварійно завершив свою роботу.\n\n Для того, щоб вирішити проблему нам необхідна деяка інформація. Наполегливо рекомендуємо відправити звіт, щодо аварійного завершення, електронною поштою (після натискання кнопки \'Ok\' , ви побачите в новому вікні всі дані, які будуть відправлені).\n\n Ви хочете надіслати звіт?</string>
+  <string name="crash_dialog_text">
-  <string name="prefs_graph_screen_title">Налаштування графіків</string>
+		Unfortunately, Calculator++ has crashed.\n\n
-  <string name="prefs_graph_interpolate_function">Інтерполювати графік функції</string>
+		In order to fix the problem we need some information about it. It\'s highly recommended to send crash report via
-  <string name="prefs_graph_interpolate_function_summary">Якщо позначено, кубічна інтерполяція буде використовуватися для побудови графіків функції</string>
+		email (after pressing \'Ok\' button you will see all sent data in the new window).\n\n
-  <string name="prefs_graph_real_color_title">Колір дійсної частини графіку функції</string>
+		Do you want to send crash report?
-  <string name="prefs_graph_real_color_summary">Встановлює колір дійсної частини графіку функції</string>
+	</string>
-  <string name="prefs_graph_imag_color_title">Колір уявної частини графіку функції</string>
+  <string name="prefs_graph_screen_title">Graph settings</string>
-  <string name="prefs_graph_imag_color_summary">Встановлює колір уявної частини графіку функції</string>
+  <string name="prefs_graph_interpolate_function">Interpolate function\'s graph</string>
-  <string name="p_white_line_color">Білий</string>
+  <string name="prefs_graph_interpolate_function_summary">If checked cubic interpolation will be used in function
-  <string name="p_grey_line_color">Сірий</string>
+		graph drawing
-  <string name="p_red_line_color">Червоний</string>
+	</string>
-  <string name="p_blue_line_color">Синій</string>
+  <string name="prefs_graph_real_color_title">Color of real part of functions graph</string>
-  <string name="p_green_line_color">Зелений</string>
+  <string name="prefs_graph_real_color_summary">Sets color of real part functions graph</string>
-  <string name="c_function_name">Ім’я</string>
+  <string name="prefs_graph_imag_color_title">Color of imaginary part of functions graph</string>
-  <string name="c_function_value">Значення</string>
+  <string name="prefs_graph_imag_color_summary">Sets color of imaginary part functions graph</string>
-  <string name="c_function_description">Опис</string>
+  <string name="p_white_line_color">White</string>
-  <string name="c_function_parameters">Параметри</string>
+  <string name="p_grey_line_color">Grey</string>
-  <string name="function_create_function">Визначити функцію</string>
+  <string name="p_red_line_color">Red</string>
-  <string name="function_edit_function">Змінити функцію</string>
+  <string name="p_blue_line_color">Blue</string>
-  <string name="function_name_is_not_valid">Неприпустиме ім\'я функції: ім\'я має починатися з літери, може містити літери, цифри та знак підкреслення (_).</string>
+  <string name="p_green_line_color">Green</string>
-  <string name="function_already_exists">Функція з таким ім\'ям вже існує!</string>
+  <string name="c_function_name">Name</string>
-  <string name="function_is_empty">Тіло функції не може бути відсутнім!</string>
+  <string name="c_function_value">Value</string>
-  <string name="function_param_not_empty">Параметр функції не може бути відсутнім!</string>
+  <string name="c_function_description">Description</string>
-  <string name="function_removal_confirmation_question">Ви дійсно хочете видалити функцію \'%s\'?</string>
+  <string name="c_function_parameters">Parameters</string>
-  <string name="empty_function_error">Не вдалося створити порожню функцію!</string>
+  <string name="function_create_function">Create function</string>
-  <string name="do_not_show_messages_in_session">Не показувати це повідомлення до наступної сесії</string>
+  <string name="function_edit_function">Edit function</string>
-  <string name="calculation_messages_dialog_title">Попередження Калькулятор++</string>
+  <string name="function_name_is_not_valid">Name of function is not valid: name must start with letter, can contain
-  <string name="arithmetic_error_while_plot">Арифметична помилка під час відображення: %s</string>
+		letters, digits and underscore.
+	</string>
+  <string name="function_already_exists">Function with same name already exists!</string>
+  <string name="function_is_empty">Function body could not be empty!</string>
+  <string name="function_param_not_empty">Function parameter should not be empty!</string>
+  <string name="function_removal_confirmation_question">Do you really want to delete \'%s\' function?</string>
+  <string name="empty_function_error">Unable to create empty function!</string>
+  <string name="do_not_show_messages_in_session">Do not show this message until next session</string>
+  <string name="calculation_messages_dialog_title">Calculator++ warning</string>
+  <string name="arithmetic_error_while_plot">Arithmetic error occurred while plotting: %s</string>
   <string name="ok">OK</string>
-  <string name="p_show_calculation_messages_dialog_title">Відображати повідомлення розрахунків у діалоговому вікні</string>
+  <string name="p_show_calculation_messages_dialog_title">Show calculation messages in dialog</string>
-  <string name="p_show_calculation_messages_dialog_summary">Якщо ввімкнуто, то будь-які повідомлення, які виникнуть під час обчислень, будуть показані у відповідному діалоговому вікні</string>
+  <string name="p_show_calculation_messages_dialog_summary">If turned on if any message occurred while calculations
-  <string name="fix">Виправити</string>
+		special dialog will be shown
-  <string name="p_preferred_numeral_base_title">Система числення за умовчанням</string>
+	</string>
-  <string name="p_preferred_numeral_base_summary">Визначає систему числення за умовчанням</string>
+  <string name="fix">Fix</string>
-  <string name="preferred_numeral_base_message">Система числення за умовчанням (\'%1$s\') відрізняється від поточної - \'%2$s\'. Забули змінити?</string>
+  <string name="p_preferred_numeral_base_title">Default numeral system</string>
-  <string name="p_preferred_angle_units_title">Типові одиниці виміру кута</string>
+  <string name="p_preferred_numeral_base_summary">Defines the default numeral system</string>
-  <string name="p_preferred_angle_units_summary">Визначає типові одиниці вимірювання кутів</string>
+  <string name="preferred_numeral_base_message">Default numeral system \'%1$s\' differs from current \'%2$s\'. Forgot
-  <string name="preferred_angle_units_message">Типова одиниця виміру кутів - \'%1$s\', що відрізняється від поточного - \'%2$s\'. Забули змінити?</string>
+		to change back?
-  <string name="close">Закрити</string>
+	</string>
-  <string name="c_app_widget_3x3_name">Калькулятор++ віджет (3х3)</string>
+  <string name="p_preferred_angle_units_title">Default angle units</string>
-  <string name="c_app_widget_3x4_name">Калькулятор++ віджет (3х4)</string>
+  <string name="p_preferred_angle_units_summary">Defines the default angle units</string>
-  <string name="c_app_widget_4x4_name">Калькулятор++ віджет (4х4)</string>
+  <string name="preferred_angle_units_message">Default angle units \'%1$s\' differs from current \'%2$s\'. Forgot to
-  <string name="c_app_widget_4x5_name">Калькулятор++ віджет (4х5)</string>
+		change back?
-  <string name="open_onscreen_calculator">Клацніть, щоб відкрити калькулятор у віконному режимі</string>
+	</string>
-  <string name="prefs_onscreen_title">Параметри Калькулятор++ (в окремому вікні)</string>
+  <string name="close">Close</string>
-  <string name="prefs_onscreen_start_on_boot_title">Запускати під час завантаження системи</string>
+  <string name="c_app_widget_3x3_name">Calculator++ Widget (3x3)</string>
-  <string name="prefs_onscreen_start_on_boot_summary">Якщо ввімкнуто, Калькулятор++ з\'явиться на панелі сповіщень після завантаження системи</string>
+  <string name="c_app_widget_3x4_name">Calculator++ Widget (3x4)</string>
-  <string name="prefs_onscreen_show_app_icon_title">Показувати окремий значок (вимагає перезавантаження)</string>
+  <string name="c_app_widget_4x4_name">Calculator++ Widget (4x4)</string>
-  <string name="prefs_onscreen_show_app_icon_summary">Якщо ввімкнено, додатковий значок буде показано у списку програм</string>
+  <string name="c_app_widget_4x5_name">Calculator++ Widget (4x5)</string>
-  <string name="cpp_onscreen_remove_icon_message">Ви можете видалити додатковий значок у списку програм в налаштуваннях або натиснувши кнопку Далі</string>
+  <string name="open_onscreen_calculator">Click to open calculator in window mode</string>
-  <string name="cpp_this_change_may_require_reboot">Ця зміна може вимагати перезавантаження</string>
+  <string name="prefs_onscreen_title">Calculator (in separate window) settings</string>
-  <string name="cpp_plot_2d">2D графік</string>
+  <string name="prefs_onscreen_start_on_boot_title">Start on boot</string>
-  <string name="cpp_plot_3d">3D графік</string>
+  <string name="prefs_onscreen_start_on_boot_summary">If turned on Calculator++ will appear in notification bar after
-  <string name="cpp_plot_functions">Функції на графіку</string>
+		device boot
-  <string name="cpp_prefs_graph_plot_imag_title">Відображати уявну частину функції на графіку</string>
+	</string>
-  <string name="cpp_prefs_graph_plot_imag_summary">Якщо позначено, то буде відображатися уявна частина функції на графіку</string>
+  <string name="prefs_onscreen_show_app_icon_title">Show separate icon (require reboot)</string>
-  <string name="cpp_monochrome_line_color_type">Монотонний</string>
+  <string name="prefs_onscreen_show_app_icon_summary">If turned on second icon will be shown in applications\' list
-  <string name="cpp_color_map_line_color_type">Карта кольорів (тільки 3D)</string>
+	</string>
-  <string name="cpp_solid_line_style">Неперервна (-----)</string>
+  <string name="cpp_onscreen_remove_icon_message">You can remove second icon in applications\' list from application
-  <string name="cpp_dashed_line_style">Штрихова (- - -)</string>
+		settings or by pressing next button
-  <string name="cpp_dotted_line_style">Пунктирна (. . .)</string>
+	</string>
-  <string name="cpp_dash_dotted_line_style">Штрих-пунктирна (-.-.-)</string>
+  <string name="cpp_this_change_may_require_reboot">This change may require reboot</string>
-  <string name="cpp_plotter">Графобудівник функцій</string>
+  <string name="cpp_plot_2d">2D plot</string>
-  <string name="cpp_plot_screenshot">Зробити знімок екрана</string>
+  <string name="cpp_plot_3d">3D plot</string>
-  <string name="cpp_plot_screenshot_saved">Знімок екрану успішно збережено: %1$s!</string>
+  <string name="cpp_plot_functions">Graph functions</string>
-  <string name="cpp_plot_unable_to_save_screenshot">Знімок екрану не може бути збережений через те, що SD-карта не змонтована. Змонтуйте SD-карту та спробуйте ще!</string>
+  <string name="cpp_prefs_graph_plot_imag_title">Plot imaginary part of function</string>
-  <string name="cpp_plot_function_line_color_type">Тип кольору лінії</string>
+  <string name="cpp_prefs_graph_plot_imag_summary">If checked imaginary part of function will be plotted</string>
-  <string name="cpp_plot_function_line_color">Колір лінії</string>
+  <string name="cpp_monochrome_line_color_type">Monochrome</string>
-  <string name="cpp_plot_function_line_style">Стиль лінії</string>
+  <string name="cpp_color_map_line_color_type">Color map (only 3D)</string>
-  <string name="cpp_plot_function_line_width">Ширина лінії</string>
+  <string name="cpp_solid_line_style">Solid (-----)</string>
-  <string name="cpp_plot_function_settings">Налаштування функцій</string>
+  <string name="cpp_dashed_line_style">Dashed (- - -)</string>
-  <string name="cpp_function">Функція</string>
+  <string name="cpp_dotted_line_style">Dotted (. . .)</string>
-  <string name="cpp_pinned">Закріплені</string>
+  <string name="cpp_dash_dotted_line_style">Dot-dashed (-.-.-)</string>
-  <string name="cpp_visible">Видима</string>
+  <string name="cpp_plotter">Function plotter</string>
-  <string name="cpp_plot_button_text">+граф</string>
+  <string name="cpp_plot_screenshot">Capture screenshot</string>
-  <string name="cpp_plot_empty_function_error">Не вдалося відобразити пусту функцію!</string>
+  <string name="cpp_plot_screenshot_saved">Screenshot successfully saved: %1$s!</string>
-  <string name="cpp_plot_too_many_variables">Не вдалося відобразити: занадто багато змінних!</string>
+  <string name="cpp_plot_unable_to_save_screenshot">Screenshot cannot be saved as SD card is not mounted. Mount SD
-  <string name="cpp_plot_range">Діапазон графіка</string>
+		card and try again!
-  <string name="cpp_fullscreen">Повноекранний режим</string>
+	</string>
-  <string name="cpp_plot_range_x_min">X мін</string>
+  <string name="cpp_plot_function_line_color_type">Line color type</string>
-  <string name="cpp_plot_range_x_max">X макс</string>
+  <string name="cpp_plot_function_line_color">Line color</string>
-  <string name="cpp_plot_range_y_min">Y мин</string>
+  <string name="cpp_plot_function_line_style">Line style</string>
-  <string name="cpp_plot_range_y_max">Y макс</string>
+  <string name="cpp_plot_function_line_width">Line width</string>
-  <string name="cpp_invalid_number">Неприпустиме значення!</string>
+  <string name="cpp_plot_function_settings">Function settings</string>
-  <string name="cpp_plot_boundaries_should_differ">Границі графіку не повинні бути однаковими!</string>
+  <string name="cpp_function">Function</string>
-  <string name="cpp_apply">Застосувати</string>
+  <string name="cpp_pinned">Pinned</string>
-  <string name="cpp_message">Повідомлення</string>
+  <string name="cpp_visible">Visible</string>
-  <string name="cpp_continue">Продовжити</string>
+  <string name="cpp_plot_button_text">+plot</string>
-  <string name="cpp_purchase_text">Підтримка проекту - це легко та безпечно: процес покупки контролюється Google і все, що вам необхідно це належним чином налаштувати профіль Google.\n\n Інформація про оплату зберігається на серверах Google з вашим обліковим записом Google і ви легко можете використовувати цю програму на кількох пристроях.\n\n Натисніть кнопку \"Продовжити\" і ви будете перенаправлені на Google Play для здійснення платежу.</string>
+  <string name="cpp_plot_empty_function_error">Unable to plot empty function!</string>
-  <string name="cpp_purchase_title">Придбати</string>
+  <string name="cpp_plot_too_many_variables">Unable to plot: too many variables!</string>
-  <string name="cpp_purchase_thank_you_text">Дякуємо вам за підтримку цієї програми! \n\n Затримка в декілька хвилин може виникнути, поки програма буде проінформована про покупку. Ви завжди можете перевірити інформацію про покупку в обліковому запису Google. \n Якщо у вас є будь які проблеми або питання, не соромтеся зв\'язатися зі мною безпосередньо (контакти доступні в Головна -&gt; Меню -&gt; Про програму)</string>
+  <string name="cpp_plot_range">Graph range</string>
+  <string name="cpp_fullscreen">Fullscreen</string>
+  <string name="cpp_plot_range_x_min">X Min</string>
+  <string name="cpp_plot_range_x_max">X Max</string>
+  <string name="cpp_plot_range_y_min">Y Min</string>
+  <string name="cpp_plot_range_y_max">Y Max</string>
+  <string name="cpp_invalid_number">Invalid number!</string>
+  <string name="cpp_plot_boundaries_should_differ">Graph boundaries should not be the same!</string>
+  <string name="cpp_apply">Apply</string>
+  <string name="cpp_message">Message</string>
+  <string name="cpp_continue">Continue</string>
+  <string name="cpp_purchase_text">Supporting the project is easy and secure: purchase process is provided by Google
+		and all you need is a properly configured Google account.\n\n
+		Payment information is stored in Google servers with your Google account and you can easily use application on
+		several devices.\n\n
+		By clicking \'Continue\' button you will be redirected to the Google Play app to make the payment.
+	</string>
+  <string name="cpp_purchase_title">Purchase</string>
+  <string name="cpp_purchase_thank_you_text">Thank you for supporting the application!\n\n It might take several
+		minutes until app will be informed about the purchase. You always can check information about the purchase in
+		your Google Account.\n
+		If you have any problems or questions feel free to contact me directly (contacts are available in
+		Main-&gt;Menu-&gt;About)
+	</string>
 </resources>

android-app-core/res/values-uk/text_vars.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="c_var_description_PI">Відношення довжини кола до його діаметру. Увага: ця константа залежить від одиниць виміру
+  <string name="c_var_description_PI">Відношення довжини кола до діаметру. Увага: ця стала залежить від одиниць виміру
 		кутів =&gt; rad: 3.14, deg: 180.0
 	</string>
-  <string name="c_var_description_pi">Відношення довжини кола до діаметру. Увага: ця константа не залежить від одиниць
+  <string name="c_var_description_pi">Відношення довжини кола до діаметру. Увага: ця стала не залежить від одиниць
 		виміру кутів =&gt; rad: 3.14, deg: 3.14
 	</string>
-  <string name="c_var_description_e">Константа e - дійсне число таке, що похідна функції (кутовий коефіцієнт дотичної)
+  <string name="c_var_description_e">стала e - дійсне число таке, що похідна функції (кутовий коефіцієнт дотичної)
 		f(x) = e^x в точці x = 0 дорівнює 1
 	</string>
   <string name="c_var_description_i">Уявна одиниця, визначається як i^2 = −1</string>
-  <string name="c_var_description_c">Швидкість світла у вакуумі, м·с</string>
+  <string name="c_var_description_c">Швидкість світла у вакуумі, м·с^-1</string>
-  <string name="c_var_description_G">Гравітаційна константа - емпірична фізична стала, необхідна для розрахунку сили
+  <string name="c_var_description_G">Гравітаційна стала - емпірична фізична стала, необхідна для розрахунку сили
 		гравітаційної взаємодії між двома об’єктами з масою, м^3·кг^−1·с^−2
 	</string>
-  <string name="c_var_description_h">Константа Планка - коефіцієнт, який пов’язує величину енергії електромагнітного
+  <string name="c_var_description_h">Стала Планка - коефіцієнт, який пов’язує величину енергії електромагнітного
 		випромінюювання з його частотою, Дж·с
 	</string>
-  <string name="c_var_description_h_reduced">Зведена константа Планка, Дж·с</string>
+  <string name="c_var_description_h_reduced">Зведена стала Планка, Дж·с</string>
   <string name="c_var_description_nan">Не число</string>
   <string name="c_var_description_inf">Нескінченність</string>
   <string name="c_var_system">Вбудовані</string>

android-app-core/res/values-zh-rtw/text_operators.xml

@@ -1,23 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="c_operators">运算符</string>
+  <string name="c_operators">運算子</string>
-  <string name="c_op_description_mod">取 \'x\' 除以 \'y\' 的余数</string>
+  <string name="c_op_description_mod">Modulo operation finds the remainder of division of \'x\' by \'y\'</string>
-  <string name="c_op_description_sum">求和函数“f(i)”，计算“i”从“from”到“to”的和</string>
+  <string name="c_op_description_sum">Sums functions \'f(i)\', iterating through \'i\' from \'from\' to \'to\'
-  <string name="c_op_description_product">求积函数“f(i)”，计算“i”从“from”到“to”的乘积</string>
+	</string>
-  <string name="c_op_description_derivative">计算针对于函数“f(x)”中变量x在给定参数（默认为1）时的导数并且计算在点“x_point”时函数的值。</string>
+  <string name="c_op_description_product">Gives product of functions \'f(i)\', iterating through \'i\' from \'from\'
-  <string name="c_op_description_integral">计算函数“f(x)”对“x”的积分。</string>
+		to \'to\'
-  <string name="c_op_description_integral_ab">计算函数“f(x)”对“x”从“a”到“b”的定积分。</string>
+	</string>
-  <string name="c_pf_description_factorial">计算前面表达式的阶乘</string>
+  <string name="c_op_description_derivative">Gives derivative of order \'order\' (default = 1) of functions \'f(x)\'
-  <string name="c_pf_description_double_factorial">计算前面表达式的二次阶乘</string>
+		by \'x\' variable and calculates at point \'x_point\' (default = same as \'x\')
-  <string name="c_pf_description_percent" formatted="false">计算前面表达式的百分比。
+	</string>
-\n例如：\n
+  <string name="c_op_description_integral">Gives integral of function \'f(x)\' by \'x\' variable</string>
-100 + 50% = 150\n
+  <string name="c_op_description_integral_ab">Integrates function \'f(x)\' by \'x\' variable from \'a\' to \'b\'
-100 * 50% = 50\n
+	</string>
-100 + 100 * 50% * 50% = 125</string>
+  <string name="c_pf_description_factorial">Gives the factorial of the expression before</string>
-  <string name="c_pf_description_degree">将度转换为弧度。\n
+  <string name="c_pf_description_double_factorial">Gives the double factorial of the expression before</string>
-例如：\n
+  <string name="c_pf_description_percent" formatted="false">百分比.\n例:\n
-268° = 4.67748\n
+		100 + 50% = 150\n
-30.21° = 0.52726
+		100 * 50% = 50\n
+		100 + 100 * 50% * 50% = 125
+	</string>
+  <string name="c_pf_description_degree">將角度轉換為弳度.\n
+		例:\n
+		268° = 4.67748\n
+		30.21° = 0.52726
 	</string>
 </resources>

android-app-core/res/values-zh-rtw/text_preferences.xml

@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="c_auto_orientation_title">自动旋转屏幕</string>
+  <string name="c_auto_orientation_title">Auto-rotate screen</string>
-  <string name="c_auto_orientation_summary">如果开启此选项，应用将随设备自动旋转屏幕。</string>
+  <string name="c_auto_orientation_summary">If turned on app will rotate screen with device</string>
-  <string name="c_show_equals_button_title">显示等于按钮</string>
+  <string name="c_show_equals_button_title">顯示「等於」按鈕</string>
-  <string name="c_show_equals_button_summary">如果开启此选项，将显示等于按钮</string>
+  <string name="c_show_equals_button_summary">是否顯示「等於」按鈕</string>
-  <string name="c_hide_numeral_base_digits_title">隐藏其他进制的数字</string>
+  <string name="c_hide_numeral_base_digits_title">隱藏其他進位的數字</string>
-  <string name="c_hide_numeral_base_digits_summary">如果开启此选项，其他进制的数字将被隐藏</string>
+  <string name="c_hide_numeral_base_digits_summary">是否隱藏目前進位制以外的數字鍵</string>
-  <string name="prefs_history_show_intermediate_calculations_title">在历史记录中显示中间计算</string>
+  <string name="prefs_history_show_intermediate_calculations_title">Show intermediate calculations in history</string>
-  <string name="prefs_history_show_intermediate_calculations_summary">如果开启此选项，所有的计算都将显示在历史记录中</string>
+  <string name="prefs_history_show_intermediate_calculations_summary">If turned on all calculations will be shown in the
-  <string name="p_calculations_calculate_on_fly_title">在输入时计算结果</string>
+		history screen
-  <string name="p_calculations_calculate_on_fly_summary">如果开启此选项，将在输入时自动完成运算</string>
+	</string>
-  <string name="prefs_prevent_screen_from_fading_title">防止屏幕变暗</string>
+  <string name="p_calculations_calculate_on_fly_title">Result is calculated while typing</string>
-  <string name="prefs_prevent_screen_from_fading_summary">如果开启此选项，在使用此应用时屏幕将不会变暗</string>
+  <string name="p_calculations_calculate_on_fly_summary">If turned on calculations are done automatically while typing</string>
+  <string name="prefs_prevent_screen_from_fading_title">Prevent screen from fading</string>
+  <string name="prefs_prevent_screen_from_fading_summary">If turned on screen will not fade while using the app
+	</string>
 </resources>

android-app-core/res/values/styles.xml

@@ -66,6 +66,7 @@
 		<item name="android:singleLine">true</item>
 		<item name="android:maxLines">1</item>
 		<item name="android:minLines">1</item>
+		<item name="android:lines">1</item>
 		<item name="android:scrollbars">horizontal</item>
 	</style>
 

android-app-core/res/values/text_release_notes.xml

@@ -22,6 +22,7 @@
 
 <resources>
 
+	<string name="c_release_notes_for_4_version" translatable="false">1.1.4</string>
 	<string name="c_release_notes_for_4">
 		1. Haptic feedback\n
 		2. Two layouts: calculator and cellphone\n
@@ -29,12 +30,14 @@
 		4. ERROR message is not so often now
 	</string>
 
+	<string name="c_release_notes_for_5_version" translatable="false">1.1.5</string>
 	<string name="c_release_notes_for_5">
 		1. Screen with all functions\n
 		2. Added support for decimal logarithm, factorial, comparison functions\n
 		3. Haptic feedback duration preference
 	</string>
 
+	<string name="c_release_notes_for_6_version" translatable="false">1.1.6</string>
 	<string name="c_release_notes_for_6">
 		1. Saving constants in two clicks (use +π button)\n
 		2. Result size is auto adjusted to fill all spare space\n
@@ -43,6 +46,7 @@
 		5. Degrees added (use °: e.g. 30° and result will be converted into radians)
 	</string>
 
+	<string name="c_release_notes_for_7_version" translatable="false">1.1.7</string>
 	<string name="c_release_notes_for_7">
 		1. Support for entering numbers in scientific notation (2.3E2)\n
 		2. Added functions: deg(), rad() to convert from radians to degrees and vice versa\n
@@ -53,11 +57,13 @@
 		6. Fixed bug with displaying result
 	</string>
 
+	<string name="c_release_notes_for_8_version" translatable="false">1.1.8</string>
 	<string name="c_release_notes_for_8">
 		1. Fixed bug with i^3\n
 		2. Fixed crash in case of many brackets
 	</string>
 
+	<string name="c_release_notes_for_9_version" translatable="false">1.1.9</string>
 	<string name="c_release_notes_for_9" formatted="false">
 		1. Percentage calculations.\n
 		Examples:\n
@@ -70,6 +76,7 @@
 		100+50%^2=2600, but 100+50^2%=101.08
 	</string>
 
+	<string name="c_release_notes_for_12_version" translatable="false">1.1.12</string>
 	<string name="c_release_notes_for_12">
 		1. Help screen added\n
 		2. Support for differentiation, integration, calculation of sum and product.\n
@@ -81,11 +88,13 @@
 		∫ab(x, x, 0, 10)=50.0
 	</string>
 
+	<string name="c_release_notes_for_13_version" translatable="false">1.1.13</string>
 	<string name="c_release_notes_for_13">
 		1. Fixed crashes\n
 		2. Added variables on the main screen
 	</string>
 
+	<string name="c_release_notes_for_14_version" translatable="false">1.1.14</string>
 	<string name="c_release_notes_for_14">
 		1. Support for different angle units: radians, degrees, gradians, turns\n
 		2. Easy toggling between radians and degrees: use the toggle switch located on the 6 button\n
@@ -93,12 +102,14 @@
 		4. Fixed bug with simplification of √(π^2)
 	</string>
 
+	<string name="c_release_notes_for_15_version" translatable="false">1.1.15</string>
 	<string name="c_release_notes_for_15">
 		1. Added functions\' plotting: type expression which contains 1 undefined variable (e.g. cos(t)) and click on
 		the result. In the context menu choose \'Plot graph\'. Supported features: zoom in/out, moving graph, plotting
 		imaginary part
 	</string>
 
+	<string name="c_release_notes_for_16_version" translatable="false">1.1.16</string>
 	<string name="c_release_notes_for_16">
 		1. Buttons swipe preference\n
 		2. Added support for different numeral bases (currently supported: dec, bin, oct). Dec and bin can be chosen
@@ -107,6 +118,7 @@
 		4. Performance improvements in functions\' plotting
 	</string>
 
+	<string name="c_release_notes_for_20_version" translatable="false">1.2.20</string>
 	<string name="c_release_notes_for_20">
 		1. New swipe actions (left, right)\n
 		2. Extended history: save, remove, copy, use from history screen (use long click for additional actions)\n
@@ -117,6 +129,7 @@
 		6. Bug fixes: correct double factorial calculation, 20x fix, e^(pi*i)+1 fix and others
 	</string>
 
+	<string name="c_release_notes_for_21_version" translatable="false">1.2.21</string>
 	<string name="c_release_notes_for_21">
 		1. Release notes screen added\n
 		2. Added categories in functions and constants screens\n
@@ -127,17 +140,20 @@
 		6. Variant of π constant independent from angle units
 	</string>
 
+	<string name="c_release_notes_for_22_version" translatable="false">1.2.22</string>
 	<string name="c_release_notes_for_22">
 		1. Fix for missing cursor in Android 3 and higher\n
 		2. Fix for substituting 3.14... with Π constant
 	</string>
 
+	<string name="c_release_notes_for_23_version" translatable="false">1.2.23</string>
 	<string name="c_release_notes_for_23">
 		1. Fix for calculating inverse trigonometric functions in complex field\n
 		2. Removed time delay for calculation\n
 		3. Fix the problem with 200 - 10% = π
 	</string>
 
+	<string name="c_release_notes_for_24_version" translatable="false">1.2.24</string>
 	<string name="c_release_notes_for_24">
 		Note from developer\n\n
 		Sorry to inform you but this version of application brings built-in ads.\n
@@ -153,6 +169,7 @@
 		or help to translate the application to your native language.
 	</string>
 
+	<string name="c_release_notes_for_25_version" translatable="false">1.2.25</string>
 	<string name="c_release_notes_for_25">
 		1. Integration of ln() and lg()\n
 		2. Last opened tab is remembered now (history, variables etc)\n
@@ -162,6 +179,7 @@
 		6. Double zero (00) key
 	</string>
 
+	<string name="c_release_notes_for_26_version" translatable="false">1.2.26</string>
 	<string name="c_release_notes_for_26">
 		1. Integration of trigonometric functions is disabled for not radian angles\n
 		2. Bug with 1/0 = -1/0 fixed\n
@@ -169,6 +187,7 @@
 		4. Other small fixes
 	</string>
 
+	<string name="c_release_notes_for_27_version" translatable="false">1.2.27</string>
 	<string name="c_release_notes_for_27">
 		Note from developer:\n\n
 		I\'m glad to inform you that I\'ve started a forum for Calculator++: http://facebook.com/calculatorpp.\n
@@ -182,6 +201,7 @@
 		5. Other small fixes
 	</string>
 
+	<string name="c_release_notes_for_29_version" translatable="false">1.2.28</string>
 	<string name="c_release_notes_for_29">
 		1. New Metro theme with 3 color variations (old themes are still available)\n
 		2. Simple layout (Default layout is still scientific)\n
@@ -195,6 +215,7 @@
 		10. Billing problems fixes
 	</string>
 
+	<string name="c_release_notes_for_34_version" translatable="false">1.2.31</string>
 	<string name="c_release_notes_for_34">
 		1. Ukrainian localization (Андрій Бандура)\n
 		2. HEX digits are not shown in not HEX mode\n
@@ -207,12 +228,14 @@
 		9. Wrong lg() integration and differentiation fixed
 	</string>
 
+	<string name="c_release_notes_for_39_version" translatable="false">1.2.34</string>
 	<string name="c_release_notes_for_39">
 		1. Virtual keyboard are now not shown on Android 4 ICS\n
 		2. Fast number conversion from display context menu\n
 		3. Minor GUI fixes
 	</string>
 
+	<string name="c_release_notes_for_93_version" translatable="false">1.4.0</string>
 	<string name="c_release_notes_for_93">
 		1. We are now on Facebook: facebook.com/calculatorpp\n
 		2. Tablet support (new awesome UI)\n
@@ -223,17 +246,20 @@
 		7. Chinese translations
 	</string>
 
+	<string name="c_release_notes_for_99_version" translatable="false">1.4.1</string>
 	<string name="c_release_notes_for_99">
 		1. UI improvements for 4-7 inches displays\n
 		2. Ans variable (last calculated value)
 	</string>
 
+	<string name="c_release_notes_for_103_version" translatable="false">1.4.2</string>
 	<string name="c_release_notes_for_103">
 		1. Calculator++ widget for home screen (works only if app installed in phone memory)\n
 		2. Mobile phone layout for tablets (Preferences->Appearance Preferences->Layout->Scientific (Mobile))\n
 		3. Manual calculations (Preferences->Calculations Preferences->Result is calculated…)
 	</string>
 
+	<string name="c_release_notes_for_107_version" translatable="false">1.4.4</string>
 	<string name="c_release_notes_for_107">
 		1. Support for user-defined functions (see +f button or + button inside functions screen)\n
 		2. Widget in different sizes: 3x3, 3x4, 4x4, 4x5\n
@@ -244,17 +270,20 @@
 		7. Bug fixes
 	</string>
 
+	<string name="c_release_notes_for_111_version" translatable="false">1.5.1</string>
 	<string name="c_release_notes_for_111">
 		1. Calculator in separate window\n
 		2. UI is fixed for some devices
 	</string>
 
+	<string name="c_release_notes_for_112_version" translatable="false">1.5.2</string>
 	<string name="c_release_notes_for_112">
 		1. Possibility to remove icon for Calculator++ in separate window\n
 		2. Fixed some crashes (editing, plotting)\n
 		3. Fixed flicker for Calculator++ in separate window
 	</string>
 
+	<string name="c_release_notes_for_115_version" translatable="false">1.6.2</string>
 	<string name="c_release_notes_for_115">
 		1. Graph plotter completely reworked\n
 		2. Added support for graphing several functions\n
@@ -264,4 +293,14 @@
 		6. Other fixes
 	</string>
 
+	<string name="c_release_notes_for_118_version" translatable="false">2.0.0</string>
+	<string name="c_release_notes_for_118">
+		1. German and Polish translations\n
+		2. Wizard\n
+		3. Graph improvements\n
+		4. Asin(i) problem fix\n
+		5. Greek letters for variable names\n
+		6. Other fixes
+	</string>
+
 </resources>

android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButton.java

@@ -32,6 +32,16 @@ import org.solovyev.android.calculator.core.R;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.solovyev.android.calculator.CalculatorSpecialButton.cursor_left;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.cursor_right;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.functions_detached;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.history_detached;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.like;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.open_app;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.operators_detached;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.settings_detached;
+import static org.solovyev.android.calculator.CalculatorSpecialButton.vars_detached;
+
 /**
  * User: serso
  * Date: 10/20/12
@@ -54,16 +64,17 @@ public enum CalculatorButton {
 	period(R.id.cpp_button_period, "."),
 	brackets(R.id.cpp_button_round_brackets, "()"),
 
-	settings(R.id.cpp_button_settings, CalculatorSpecialButton.settings_detached),
+	settings(R.id.cpp_button_settings, settings_detached),
 	like(R.id.cpp_button_like, CalculatorSpecialButton.like),
 
 	/*last row*/
-	left(R.id.cpp_button_left, CalculatorSpecialButton.cursor_left),
+	left(R.id.cpp_button_left, cursor_left),
-	right(R.id.cpp_button_right, CalculatorSpecialButton.cursor_right),
+	right(R.id.cpp_button_right, cursor_right),
-	vars(R.id.cpp_button_vars, CalculatorSpecialButton.vars_detached),
+	vars(R.id.cpp_button_vars, vars_detached),
-	functions(R.id.cpp_button_functions, CalculatorSpecialButton.functions_detached),
+	functions(R.id.cpp_button_functions, functions_detached),
-	app(R.id.cpp_button_app, CalculatorSpecialButton.open_app),
+	operators(R.id.cpp_button_operators, operators_detached),
-	history(R.id.cpp_button_history, CalculatorSpecialButton.history_detached),
+	app(R.id.cpp_button_app, open_app),
+	history(R.id.cpp_button_history, history_detached),
 
 	/*operations*/
 	multiplication(R.id.cpp_button_multiplication, "*"),

android-app-core/src/main/java/org/solovyev/android/calculator/model/AndroidCalculatorEngine.java

@@ -274,12 +274,12 @@ public class AndroidCalculatorEngine implements CalculatorEngine, SharedPreferen
 	}
 
 	@Nonnull
-	public NumeralBase getNumeralBaseFromPrefs(@Nonnull SharedPreferences preferences) {
+	public static NumeralBase getNumeralBaseFromPrefs(@Nonnull SharedPreferences preferences) {
 		return Preferences.numeralBase.getPreference(preferences);
 	}
 
 	@Nonnull
-	public AngleUnit getAngleUnitsFromPrefs(@Nonnull SharedPreferences preferences) {
+	public static AngleUnit getAngleUnitsFromPrefs(@Nonnull SharedPreferences preferences) {
 		return Preferences.angleUnit.getPreference(preferences);
 	}
 

android-app-core/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java

@@ -27,6 +27,7 @@ import android.content.res.Resources;
 import android.graphics.Paint;
 import android.text.TextPaint;
 import android.util.AttributeSet;
+import jscl.AngleUnit;
 
 import javax.annotation.Nonnull;
 
@@ -41,8 +42,12 @@ import org.solovyev.android.view.drag.DirectionDragButton;
  */
 public class AngleUnitsButton extends DirectionDragButton {
 
+	@Nonnull
+	private AngleUnit angleUnit;
+
 	public AngleUnitsButton(Context context, @Nonnull AttributeSet attrs) {
 		super(context, attrs);
+		this.angleUnit = Locator.getInstance().getEngine().getAngleUnits();
 	}
 
 	@Override
@@ -52,11 +57,32 @@ public class AngleUnitsButton extends DirectionDragButton {
 		super.initDirectionTextPaint(basePaint, directionTextData, resources);
 
 		final TextPaint directionTextPaint = directionTextData.getPaint();
-		if (Locator.getInstance().getEngine().getAngleUnits().name().equals(directionTextData.getText())) {
+		final int color = getDirectionTextColor(directionTextData.getText());
-			directionTextPaint.setColor(resources.getColor(R.color.cpp_selected_angle_unit_text_color));
+		directionTextPaint.setColor(color);
-		} else {
+		if (!isCurrentAngleUnits(directionTextData.getText())) {
-			directionTextPaint.setColor(resources.getColor(R.color.cpp_default_text_color));
 			directionTextPaint.setAlpha(getDirectionTextAlpha());
 		}
 	}
+
+	int getDirectionTextColor(@Nonnull String directionText) {
+		final int color;
+		final Resources resources = getResources();
+		if (isCurrentAngleUnits(directionText)) {
+			color = resources.getColor(R.color.cpp_selected_angle_unit_text_color);
+		} else {
+			color = resources.getColor(R.color.cpp_default_text_color);
+		}
+		return color;
+	}
+
+	boolean isCurrentAngleUnits(@Nonnull String directionText) {
+		return this.angleUnit.name().equals(directionText);
+	}
+
+	public void setAngleUnit(@Nonnull AngleUnit angleUnit) {
+		if (this.angleUnit != angleUnit) {
+			this.angleUnit = angleUnit;
+			invalidate();
+		}
+	}
 }

android-app-core/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java

@@ -27,6 +27,7 @@ import android.content.res.Resources;
 import android.graphics.Paint;
 import android.text.TextPaint;
 import android.util.AttributeSet;
+import jscl.NumeralBase;
 
 import javax.annotation.Nonnull;
 
@@ -41,8 +42,12 @@ import org.solovyev.android.view.drag.DirectionDragButton;
  */
 public class NumeralBasesButton extends DirectionDragButton {
 
+	@Nonnull
+	private NumeralBase numeralBase;
+
 	public NumeralBasesButton(Context context, @Nonnull AttributeSet attrs) {
 		super(context, attrs);
+		this.numeralBase = Locator.getInstance().getEngine().getNumeralBase();
 	}
 
 	@Override
@@ -52,11 +57,33 @@ public class NumeralBasesButton extends DirectionDragButton {
 		super.initDirectionTextPaint(basePaint, directionTextData, resources);
 
 		final TextPaint directionTextPaint = directionTextData.getPaint();
-		if (Locator.getInstance().getEngine().getNumeralBase().name().equals(directionTextData.getText())) {
+
-			directionTextPaint.setColor(resources.getColor(R.color.cpp_selected_angle_unit_text_color));
+		final int color = getDirectionTextColor(directionTextData.getText());
-		} else {
+		directionTextPaint.setColor(color);
-			directionTextPaint.setColor(resources.getColor(R.color.cpp_default_text_color));
+
+		if (!isCurrentNumberBase(directionTextData.getText())) {
 			directionTextPaint.setAlpha(getDirectionTextAlpha());
 		}
 	}
+
+	int getDirectionTextColor(@Nonnull String directionText) {
+		final int color;
+		if (isCurrentNumberBase(directionText)) {
+			color = getResources().getColor(R.color.cpp_selected_angle_unit_text_color);
+		} else {
+			color = getResources().getColor(R.color.cpp_default_text_color);
+		}
+		return color;
+	}
+
+	boolean isCurrentNumberBase(@Nonnull String directionText) {
+		return this.numeralBase.name().equals(directionText);
+	}
+
+	public void setNumeralBase(@Nonnull NumeralBase numeralBase) {
+		if (this.numeralBase != numeralBase) {
+			this.numeralBase = numeralBase;
+			invalidate();
+		}
+	}
 }

android-app-core/src/main/test/org/solovyev/android/calculator/CalculatorTestUtils.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013 serso aka se.solovyev
+ *
+ * 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.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * Contact details
+ *
+ * Email: se.solovyev@gmail.com
+ * Site:  http://se.solovyev.org
+ */
+
+package org.solovyev.android.calculator;
+
+import android.content.Context;
+import jscl.JsclMathEngine;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.mockito.Mockito;
+import org.solovyev.android.calculator.history.CalculatorHistory;
+import org.solovyev.android.calculator.plot.CalculatorPlotter;
+
+/**
+ * User: serso
+ * Date: 10/7/12
+ * Time: 8:56 PM
+ */
+public class CalculatorTestUtils {
+
+	public static void staticSetUp(@Nullable Context context) throws Exception {
+		Locator.getInstance().init(new CalculatorImpl(), newCalculatorEngine(), Mockito.mock(CalculatorClipboard.class), Mockito.mock(CalculatorNotifier.class), Mockito.mock(CalculatorHistory.class), new SystemOutCalculatorLogger(), Mockito.mock(CalculatorPreferenceService.class), Mockito.mock(CalculatorKeyboard.class), Mockito.mock(CalculatorPlotter.class), null);
+		Locator.getInstance().getEngine().init();
+
+		if (context != null) {
+			initViews(context);
+		}
+	}
+
+	public static void initViews(@Nonnull Context context) {
+		final AndroidCalculatorEditorView editor = new AndroidCalculatorEditorView(context);
+		editor.init();
+		Locator.getInstance().getEditor().setView(editor);
+
+		final AndroidCalculatorDisplayView display = new AndroidCalculatorDisplayView(context);
+		display.init(context);
+		Locator.getInstance().getDisplay().setView(display);
+	}
+
+	public static void staticSetUp() throws Exception {
+		staticSetUp(null);
+	}
+
+
+	@Nonnull
+	static CalculatorEngineImpl newCalculatorEngine() {
+		final MathEntityDao mathEntityDao = Mockito.mock(MathEntityDao.class);
+
+		final JsclMathEngine jsclEngine = JsclMathEngine.getInstance();
+
+		final CalculatorVarsRegistry varsRegistry = new CalculatorVarsRegistry(jsclEngine.getConstantsRegistry(), mathEntityDao);
+		final CalculatorFunctionsMathRegistry functionsRegistry = new CalculatorFunctionsMathRegistry(jsclEngine.getFunctionsRegistry(), mathEntityDao);
+		final CalculatorOperatorsMathRegistry operatorsRegistry = new CalculatorOperatorsMathRegistry(jsclEngine.getOperatorsRegistry(), mathEntityDao);
+		final CalculatorPostfixFunctionsRegistry postfixFunctionsRegistry = new CalculatorPostfixFunctionsRegistry(jsclEngine.getPostfixFunctionsRegistry(), mathEntityDao);
+
+		return new CalculatorEngineImpl(jsclEngine, varsRegistry, functionsRegistry, operatorsRegistry, postfixFunctionsRegistry, null);
+	}
+}

android-app-core/src/main/test/org/solovyev/android/calculator/view/AngleUnitsButtonTest.java

@@ -0,0 +1,75 @@
+package org.solovyev.android.calculator.view;
+
+import android.app.Activity;
+import jscl.AngleUnit;
+
+import java.util.ArrayList;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.res.Attribute;
+import org.robolectric.shadows.ShadowActivity;
+
+import static jscl.AngleUnit.deg;
+import static jscl.AngleUnit.grad;
+import static jscl.AngleUnit.rad;
+import static jscl.AngleUnit.turns;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.solovyev.android.calculator.CalculatorTestUtils.staticSetUp;
+
+@RunWith(RobolectricTestRunner.class)
+public class AngleUnitsButtonTest {
+
+	private AngleUnitsButton button;
+
+	@Before
+	public void setUp() throws Exception {
+		staticSetUp();
+
+		final Activity context = Robolectric.buildActivity(Activity.class).create().get();
+		final ShadowActivity activity = Robolectric.shadowOf(context);
+		button = new AngleUnitsButton(context, activity.createAttributeSet(new ArrayList<Attribute>(), AngleUnitsButton.class));
+	}
+
+	@Test
+	public void testShouldReturnDifferentColorsForDifferentAngleUnits() throws Exception {
+		button.setAngleUnit(deg);
+
+		assertEquals(button.getDirectionTextColor(deg.name()), button.getDirectionTextColor(deg.name()));
+		assertEquals(button.getDirectionTextColor(grad.name()), button.getDirectionTextColor(rad.name()));
+		assertNotSame(button.getDirectionTextColor(deg.name()), button.getDirectionTextColor(rad.name()));
+		assertNotSame(button.getDirectionTextColor(deg.name()), button.getDirectionTextColor(grad.name()));
+		assertNotSame(button.getDirectionTextColor(deg.name()), button.getDirectionTextColor(turns.name()));
+	}
+
+	@Test
+	public void testIsCurrentAngleUnits() throws Exception {
+		button.setAngleUnit(rad);
+		assertTrue(button.isCurrentAngleUnits(rad.name()));
+		assertFalse(button.isCurrentAngleUnits(deg.name()));
+		assertFalse(button.isCurrentAngleUnits(grad.name()));
+	}
+
+	@Test
+	public void testInvalidateShouldBeCalledOnlyWhenChangeIsDone() throws Exception {
+		button.setAngleUnit(rad);
+
+		button = Mockito.spy(button);
+
+		button.setAngleUnit(deg);
+		verify(button, times(1)).invalidate();
+
+		button.setAngleUnit(deg);
+		verify(button, times(1)).invalidate();
+	}
+}

android-app-core/src/main/test/org/solovyev/android/calculator/view/NumeralBasesButtonTest.java

@@ -0,0 +1,76 @@
+package org.solovyev.android.calculator.view;
+
+import android.app.Activity;
+import jscl.NumeralBase;
+
+import java.util.ArrayList;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.res.Attribute;
+import org.robolectric.shadows.ShadowActivity;
+
+import static jscl.AngleUnit.deg;
+import static jscl.AngleUnit.rad;
+import static jscl.NumeralBase.bin;
+import static jscl.NumeralBase.dec;
+import static jscl.NumeralBase.hex;
+import static jscl.NumeralBase.oct;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.solovyev.android.calculator.CalculatorTestUtils.staticSetUp;
+
+@RunWith(RobolectricTestRunner.class)
+public class NumeralBasesButtonTest {
+
+	private NumeralBasesButton button;
+
+	@Before
+	public void setUp() throws Exception {
+		staticSetUp();
+
+		final Activity context = Robolectric.buildActivity(Activity.class).create().get();
+		final ShadowActivity activity = Robolectric.shadowOf(context);
+		button = new NumeralBasesButton(context, activity.createAttributeSet(new ArrayList<Attribute>(), NumeralBasesButton.class));
+	}
+
+	@Test
+	public void testShouldReturnDifferentColorsForDifferentNumeralBase() throws Exception {
+		button.setNumeralBase(dec);
+
+		assertEquals(button.getDirectionTextColor(dec.name()), button.getDirectionTextColor(dec.name()));
+		assertEquals(button.getDirectionTextColor(hex.name()), button.getDirectionTextColor(bin.name()));
+		assertNotSame(button.getDirectionTextColor(dec.name()), button.getDirectionTextColor(bin.name()));
+		assertNotSame(button.getDirectionTextColor(dec.name()), button.getDirectionTextColor(hex.name()));
+		assertNotSame(button.getDirectionTextColor(dec.name()), button.getDirectionTextColor(oct.name()));
+	}
+
+	@Test
+	public void testIsCurrentNumeralBase() throws Exception {
+		button.setNumeralBase(dec);
+		assertTrue(button.isCurrentNumberBase(dec.name()));
+		assertFalse(button.isCurrentNumberBase(hex.name()));
+		assertFalse(button.isCurrentNumberBase(bin.name()));
+	}
+
+	@Test
+	public void testInvalidateShouldBeCalledOnlyWhenChangeIsDone() throws Exception {
+		button.setNumeralBase(dec);
+
+		button = Mockito.spy(button);
+
+		button.setNumeralBase(hex);
+		verify(button, times(1)).invalidate();
+
+		button.setNumeralBase(hex);
+		verify(button, times(1)).invalidate();
+	}
+}

android-app-onscreen/pom.xml

@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.solovyev.android</groupId>
 		<artifactId>calculatorpp-parent</artifactId>
-		<version>1.6.3-b-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.solovyev.android</groupId>
 	<artifactId>calculatorpp-android-app-onscreen</artifactId>
-	<version>1.6.3-b-SNAPSHOT</version>
+	<version>2.0.1-SNAPSHOT</version>
 	<name>Calculator++ Application Onscreen</name>
 	<packaging>apklib</packaging>
 

android-app-onscreen/res/layout/onscreen_editor.xml

@@ -16,7 +16,6 @@
 	<org.solovyev.android.calculator.AndroidCalculatorEditorView
 			a:id="@+id/calculator_editor"
 			style="@style/cpp_onscreen_editor_style"
-			a:textIsSelectable="true"
+			a:textIsSelectable="true"/>
-			a:hint="@string/c_calc_editor_hint"/>
 
 </LinearLayout>

android-app-test/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.solovyev.android</groupId>
 		<artifactId>calculatorpp-parent</artifactId>
-		<version>1.6.3-b-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

android-app-widget/pom.xml

@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.solovyev.android</groupId>
 		<artifactId>calculatorpp-parent</artifactId>
-		<version>1.6.3-b-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.solovyev.android</groupId>
 	<artifactId>calculatorpp-android-app-widget</artifactId>
-	<version>1.6.3-b-SNAPSHOT</version>
+	<version>2.0.1-SNAPSHOT</version>
 	<name>Calculator++ Application Widget</name>
 	<packaging>apklib</packaging>
 

android-app/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="118" android:versionName="1.6.3-a" package="org.solovyev.android.calculator">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="121" android:versionName="2.0.0" package="org.solovyev.android.calculator">
 
 	<uses-permission android:name="android.permission.VIBRATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
@@ -72,7 +72,11 @@
 		<activity android:name=".CalculatorDialogActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/>
 
 		<!-- todo serso: strings-->
-		<activity android:label="@string/c_plot_graph" android:name=".matrix.CalculatorMatrixActivity"/>
+		<activity android:label="@string/c_plot_graph" android:name=".matrix.CalculatorMatrixActivity">
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN"/>
+			</intent-filter>
+		</activity>
 
 		<activity android:name=".widget.CalculatorWidgetConfigurationActivity" android:theme="@style/cpp_metro_blue_theme">
 			<intent-filter>

android-app/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.solovyev.android</groupId>
 		<artifactId>calculatorpp-parent</artifactId>
-		<version>1.6.3-b-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

android-app/project.properties

@@ -13,22 +13,22 @@ target=android-17
 android.library.reference.1=../android-app-core
 android.library.reference.2=../android-app-widget
 android.library.reference.3=../android-app-onscreen
-android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-all_1.1.3-SNAPSHOT
+android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-all_1.1.2
-android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-ads_1.1.3-SNAPSHOT
+android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-ads_1.1.2
-android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-core_1.1.3-SNAPSHOT
+android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-core_1.1.2
-android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-billing_1.1.3-SNAPSHOT
+android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-billing_1.1.2
-android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-db_1.1.3-SNAPSHOT
+android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-db_1.1.2
-android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-security_1.1.3-SNAPSHOT
+android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-security_1.1.2
-android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-http_1.1.3-SNAPSHOT
+android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-http_1.1.2
-android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-lists_1.1.3-SNAPSHOT
+android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-lists_1.1.2
-android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-views_1.1.3-SNAPSHOT
+android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-views_1.1.2
-android.library.reference.13=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.1.3-SNAPSHOT
+android.library.reference.13=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.1.2
-android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-menus_1.1.3-SNAPSHOT
+android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-menus_1.1.2
-android.library.reference.15=gen-external-apklibs/org.solovyev.android_android-common-other_1.1.3-SNAPSHOT
+android.library.reference.15=gen-external-apklibs/org.solovyev.android_android-common-other_1.1.2
-android.library.reference.16=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.1.3-SNAPSHOT
+android.library.reference.16=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.1.2
 android.library.reference.17=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0
-android.library.reference.18=gen-external-apklibs/org.solovyev.android_android-common-keyboards_1.1.3-SNAPSHOT
+android.library.reference.18=gen-external-apklibs/org.solovyev.android_android-common-keyboards_1.1.2
-android.library.reference.19=gen-external-apklibs/org.solovyev.android_android-common-app_1.1.3-SNAPSHOT
+android.library.reference.19=gen-external-apklibs/org.solovyev.android_android-common-app_1.1.2
-android.library.reference.20=gen-external-apklibs/org.solovyev.android_android-common-networks_1.1.3-SNAPSHOT
+android.library.reference.20=gen-external-apklibs/org.solovyev.android_android-common-networks_1.1.2
-android.library.reference.21=gen-external-apklibs/org.solovyev.android_android-common-fragments_1.1.3-SNAPSHOT
+android.library.reference.21=gen-external-apklibs/org.solovyev.android_android-common-fragments_1.1.2
-android.library.reference.22=gen-external-apklibs/org.solovyev.android_android-common-tasks_1.1.3-SNAPSHOT
+android.library.reference.22=gen-external-apklibs/org.solovyev.android_android-common-tasks_1.1.2

android-app/res/layout/about_fragment.xml

@@ -34,31 +34,42 @@
 		a:layout_gravity="center"
 		a:layout_weight="1"
 		a:padding="6dp"
-			a:src="@drawable/logo"/>
+		a:src="@drawable/logo" />
+
+	<ScrollView
+		a:layout_width="fill_parent"
+		a:layout_height="fill_parent"
+		a:layout_weight="1">
+
+		<LinearLayout
+			a:layout_width="fill_parent"
+			a:layout_height="wrap_content"
+			a:orientation="vertical">
 
 			<TextView
-			a:id="@+id/aboutTextView"
+				a:id="@+id/cpp_about_textview"
 				a:text="@string/c_about_content"
-			a:layout_height="fill_parent"
+				a:layout_height="match_parent"
-			a:layout_width="fill_parent"
+				a:layout_width="match_parent"
-			a:layout_gravity="top|center_horizontal"
+				style="@style/cpp_about_style" />
-			a:layout_weight="1"
-			a:scrollbars="vertical"
-			style="@style/cpp_about_style"/>
 
-	<!--
-			a:scrollbarFadeDuration="0" is not support in  android_1.6_compatibility
 
 			<TextView
-			a:id="@+id/aboutTextView"
+				a:id="@+id/cpp_about_translators_text"
-			a:text="@string/c_copyright"
+				a:text="@string/cpp_translators_text"
-			a:layout_height="fill_parent"
+				a:layout_height="wrap_content"
-			a:layout_width="fill_parent"
+				a:layout_width="match_parent"
-			a:layout_gravity="top|center_horizontal"
+				a:paddingBottom="0dp"
-			a:layout_weight="1"
+				style="@style/cpp_about_style" />
-			a:scrollbars="vertical"
-			a:scrollbarFadeDuration="0"
-			style="@style/about_style"/>
-			-->
 
+			<TextView
+				a:id="@+id/cpp_about_translators"
+				a:text="@string/cpp_translators_list"
+				a:layout_height="wrap_content"
+				a:layout_width="match_parent"
+				a:paddingTop="0dp"
+				style="@style/cpp_about_style" />
+
+		</LinearLayout>
+	</ScrollView>
 </LinearLayout>

android-app/res/layout/cpp_app_button_donate.xml

@@ -24,6 +24,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 a:id="@id/cpp_button_like"
-			 a:src="@drawable/kb_facebook"
+			 a:src="@drawable/kb_share"
 			 style="?cpp_control_image_button_style"
 			 a:onClick="likeButtonClickHandler"/>

android-app/res/layout/cpp_wizard.xml

@@ -34,7 +34,7 @@
 		a:layout_height="0dp"
 		a:layout_weight="1"
 		a:padding="6dp"
-			a:gravity="center"/>
+		a:gravity="center" />
 
 	<LinearLayout
 		a:orientation="horizontal"
@@ -46,14 +46,20 @@
 			a:layout_height="wrap_content"
 			a:layout_width="0dp"
 			a:layout_weight="1"
-				a:text="@string/cpp_wizard_back"/>
+			a:singleLine="true"
+			a:lines="1"
+			a:maxLines="1"
+			a:text="@string/cpp_wizard_back" />
 
 		<Button
 			a:id="@+id/wizard_next_button"
 			a:layout_height="wrap_content"
 			a:layout_width="0dp"
 			a:layout_weight="1"
-				a:text="@string/cpp_wizard_next"/>
+			a:singleLine="true"
+			a:lines="1"
+			a:maxLines="1"
+			a:text="@string/cpp_wizard_next" />
 
 	</LinearLayout>
 

android-app/res/layout/cpp_wizard_step_drag_button.xml

@@ -29,7 +29,8 @@
 			  a:orientation="vertical">
 
 	<TextView
-			a:text="Drag button is an exclusive feature of Calculator++ which provides fast access to the secondary functions"
+			a:id="@+id/wizard_dragbutton_description_textview"
+			a:text="@string/cpp_wizard_dragbutton_description"
 			a:layout_height="wrap_content"
 			a:layout_width="match_parent"/>
 
@@ -42,7 +43,7 @@
 			a:layout_width="match_parent"/>
 
 	<org.solovyev.android.view.drag.DirectionDragButton
-			a:layout_margin="30dp"
+			a:layout_margin="10dp"
 			a:layout_height="100dp"
 			a:layout_width="100dp"
 			a:minWidth="100dp"

android-app/res/layout/cpp_wizard_step_onscreen.xml

@@ -28,7 +28,7 @@
 			  a:orientation="vertical">
 
 	<TextView
-			a:text="Calculator in separate window allows you to do calculations while using other apps on your device"
+			a:text="@string/cpp_wizard_onscreen_description"
 			a:layout_height="wrap_content"
 			a:layout_width="match_parent"/>
 
@@ -36,6 +36,6 @@
 			a:id="@+id/wizard_onscreen_app_enabled_checkbox"
 			a:layout_height="wrap_content"
 			a:layout_width="match_parent"
-			a:text="Enable calculator in separate window (second icon will appear in the apps list)"/>
+			a:text="@string/cpp_wizard_onscreen_checkbox"/>
 
 </LinearLayout>

android-app/res/layout/history_item.xml

@@ -43,7 +43,6 @@
 				a:id="@+id/history_item"
 				a:layout_width="fill_parent"
 				a:layout_height="fill_parent"
-				a:textColor="@color/cpp_button_operator_text_color"
 				style="@style/history_item"/>
 
 	</LinearLayout>

android-app/res/layout/saved_history_item.xml

@@ -36,7 +36,6 @@
 			a:id="@+id/history_item"
 			a:layout_width="fill_parent"
 			a:layout_height="fill_parent"
-			a:textColor="@color/cpp_button_operator_text_color"
 			style="@style/history_item"/>
 
 	<LinearLayout

android-app/res/layout/var_edit.xml

@@ -46,6 +46,69 @@
 				style="@style/cpp_default_text_size"
 				a:inputType="text"/>
 
+		<LinearLayout
+				a:id="@+id/var_edit_greek_buttons_1"
+				a:layout_height="wrap_content"
+				a:layout_width="match_parent"
+				a:orientation="horizontal">
+
+			<Button a:text="α"
+					a:layout_height="wrap_content"
+					a:layout_width="0dp"
+					a:layout_weight="1"/>
+
+			<Button a:text="β"
+					a:layout_height="wrap_content"
+					a:layout_width="0dp"
+					a:layout_weight="1"/>
+
+			<Button a:text="γ"
+					a:layout_height="wrap_content"
+					a:layout_width="0dp"
+					a:layout_weight="1"/>
+
+			<Button a:text="δ"
+					a:layout_height="wrap_content"
+					a:layout_width="0dp"
+					a:layout_weight="1"/>
+
+			<Button a:text="ε"
+					a:layout_height="wrap_content"
+					a:layout_width="0dp"
+					a:layout_weight="1"/>
+
+		</LinearLayout>
+
+		<LinearLayout a:id="@+id/var_edit_greek_buttons_2"
+					  a:layout_height="wrap_content"
+					  a:layout_width="match_parent"
+					  a:orientation="horizontal">
+			<Button a:text="θ"
+					a:layout_height="wrap_content"
+					a:layout_width="0dp"
+					a:layout_weight="1"/>
+
+			<Button a:text="λ"
+					a:layout_height="wrap_content"
+					a:layout_width="0dp"
+					a:layout_weight="1"/>
+
+			<Button a:text="μ"
+					a:layout_height="wrap_content"
+					a:layout_width="0dp"
+					a:layout_weight="1"/>
+
+			<Button a:text="τ"
+					a:layout_height="wrap_content"
+					a:layout_width="0dp"
+					a:layout_weight="1"/>
+
+			<Button a:text="φ"
+					a:layout_height="wrap_content"
+					a:layout_width="0dp"
+					a:layout_weight="1"/>
+		</LinearLayout>
+
 		<TextView
 				a:layout_height="wrap_content"
 				a:layout_width="match_parent"

android-app/res/menu/plot_menu.xml

@@ -33,7 +33,7 @@
 	<item
 			a:id="@+id/menu_plot_3d"
 			a:title="@string/cpp_plot_3d"
-			a:icon="@drawable/kb_stats"
+			a:icon="@drawable/kb_stats_3d"
 			a:showAsAction="always"/>
 
 	<item
@@ -45,7 +45,7 @@
 	<item
 			a:id="@+id/menu_plot_range"
 			a:title="@string/cpp_plot_range"
-			a:icon="@drawable/kb_contract"
+			a:icon="@drawable/kb_range"
 			a:showAsAction="always"/>
 
 	<item

android-app/res/xml/preferences.xml

@@ -32,4 +32,8 @@
 
 	<org.solovyev.android.ads.AdViewPreference a:layout="@layout/acl_adview_pref"/>
 
+	<Preference
+		a:key="restart_wizard"
+		a:title="@string/cpp_restart_wizard"/>
+
 </PreferenceScreen>

android-app/res/xml/preferences_other.xml

@@ -45,10 +45,6 @@
 				a:summary="@string/c_clear_billing_info_summary"
 				a:title="@string/c_clear_billing_info_title"/>
 
-		<Preference
-				a:key="restart_wizard"
-				a:title="@string/cpp_restart_wizard"/>
-
 	</PreferenceScreen>
 
 </PreferenceScreen>

android-app/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java

@@ -52,6 +52,8 @@ import java.util.List;
 
 import static org.solovyev.android.calculator.CalculatorPreferences.Gui.Layout.simple;
 import static org.solovyev.android.calculator.CalculatorPreferences.Gui.Layout.simple_mobile;
+import static org.solovyev.android.calculator.model.AndroidCalculatorEngine.Preferences.angleUnit;
+import static org.solovyev.android.calculator.model.AndroidCalculatorEngine.Preferences.numeralBase;
 
 /**
  * User: serso
@@ -75,6 +77,12 @@ public abstract class AbstractCalculatorHelper implements SharedPreferences.OnSh
 	@Nonnull
 	private String logTag = "CalculatorActivity";
 
+	@Nullable
+	private AngleUnitsButton angleUnitsButton;
+
+	@Nullable
+	private NumeralBasesButton clearButton;
+
 	protected AbstractCalculatorHelper() {
 	}
 
@@ -151,12 +159,12 @@ public abstract class AbstractCalculatorHelper implements SharedPreferences.OnSh
 			equalsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new EqualsDragProcessor(), dragPreferences), vibrator, preferences));
 		}
 
-		final AngleUnitsButton angleUnitsButton = (AngleUnitsButton) getButton(root, R.id.cpp_button_6);
+		angleUnitsButton = getButton(root, R.id.cpp_button_6);
 		if (angleUnitsButton != null) {
 			angleUnitsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.AngleUnitsChanger(activity), dragPreferences), vibrator, preferences));
 		}
 
-		final NumeralBasesButton clearButton = (NumeralBasesButton) getButton(root, R.id.cpp_button_clear);
+		clearButton = getButton(root, R.id.cpp_button_clear);
 		if (clearButton != null) {
 			clearButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.NumeralBasesChanger(activity), dragPreferences), vibrator, preferences));
 		}
@@ -266,12 +274,22 @@ public abstract class AbstractCalculatorHelper implements SharedPreferences.OnSh
 
 	@Override
 	public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-		if (key != null && key.startsWith("org.solovyev.android.calculator.DragButtonCalibrationActivity")) {
+		if (key.startsWith("org.solovyev.android.calculator.DragButtonCalibrationActivity")) {
 			final SimpleOnDragListener.Preferences dragPreferences = SimpleOnDragListener.getPreferences(preferences, CalculatorApplication.getInstance());
 			for (DragPreferencesChangeListener dragPreferencesChangeListener : dpclRegister.getListeners()) {
 				dragPreferencesChangeListener.onDragPreferencesChange(dragPreferences);
 			}
 		}
+
+		if (angleUnit.isSameKey(key) || numeralBase.isSameKey(key)) {
+			if (angleUnitsButton != null) {
+				angleUnitsButton.setAngleUnit(angleUnit.getPreference(preferences));
+			}
+
+			if (clearButton != null) {
+				clearButton.setNumeralBase(numeralBase.getPreference(preferences));
+			}
+		}
 	}
 
 	public void onDestroy(@Nonnull Activity activity) {

android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java

@@ -205,7 +205,7 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
 	}
 
 	public static void likeButtonPressed(@Nonnull final Context context) {
-		final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(CalculatorApplication.FACEBOOK_APP_URL));
+		final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.cpp_share_link)));
 		Android.addIntentFlags(intent, false, context);
 		context.startActivity(intent);
 	}

android-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java

@@ -72,7 +72,6 @@ public class CalculatorApplication extends android.app.Application implements Sh
 	*/
 
 	private static final String TAG = "Calculator++ Application";
-	public static final String FACEBOOK_APP_URL = "http://www.facebook.com/calculatorpp";
 
 	public static final String AD_FREE_PRODUCT_ID = "ad_free";
 	public static final String AD_FREE_P_KEY = "org.solovyev.android.calculator_ad_free";
@@ -243,6 +242,11 @@ public class CalculatorApplication extends android.app.Application implements Sh
 		return instance;
 	}
 
+	@Nonnull
+	public static SharedPreferences getPreferences() {
+		return PreferenceManager.getDefaultSharedPreferences(getInstance());
+	}
+
 	public static boolean isMonkeyRunner(@Nonnull Context context) {
 		// NOTE: this code is only for monkeyrunner
 		return context.checkCallingOrSelfPermission(android.Manifest.permission.DISABLE_KEYGUARD) == PackageManager.PERMISSION_GRANTED;

android-app/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java

@@ -36,6 +36,14 @@ import javax.annotation.Nullable;
 
 import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
 
+import static org.solovyev.android.calculator.CalculatorPreferences.Gui.hideNumeralBaseDigits;
+import static org.solovyev.android.calculator.CalculatorPreferences.Gui.showEqualsButton;
+import static org.solovyev.android.calculator.NumeralBaseButtons.toggleNumericDigits;
+import static org.solovyev.android.calculator.model.AndroidCalculatorEngine.Preferences;
+import static org.solovyev.android.calculator.model.AndroidCalculatorEngine.Preferences.angleUnit;
+import static org.solovyev.android.calculator.model.AndroidCalculatorEngine.Preferences.multiplicationSign;
+import static org.solovyev.android.calculator.model.AndroidCalculatorEngine.Preferences.numeralBase;
+
 /**
  * User: Solovyev_S
  * Date: 25.09.12
@@ -108,21 +116,6 @@ public class CalculatorKeyboardFragment extends SherlockFragment implements Shar
 
 	}
 
-	/*    private static void setMarginsForView(@Nullable View view, int marginLeft, int marginBottom, @Nonnull Context context) {
-		// IMPORTANT: this is workaround for probably android bug
-    	// currently margin values set in styles are not applied for some reasons to the views (using include tag) => set them manually
-
-        if (view != null) {
-            final DisplayMetrics dm = context.getResources().getDisplayMetrics();
-            if (view.getLayoutParams() instanceof LinearLayout.LayoutParams) {
-                final LinearLayout.LayoutParams oldParams = (LinearLayout.LayoutParams) view.getLayoutParams();
-                final LinearLayout.LayoutParams newParams = new LinearLayout.LayoutParams(oldParams.width, oldParams.height, oldParams.weight);
-                newParams.setMargins(AndroidUtils.toPixels(dm, marginLeft), 0, 0, AndroidUtils.toPixels(dm, marginBottom));
-                view.setLayoutParams(newParams);
-            }
-        }
-    }*/
-
 	@Override
 	public void onActivityCreated(Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
@@ -130,25 +123,15 @@ public class CalculatorKeyboardFragment extends SherlockFragment implements Shar
 
 	@Override
 	public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-		if (AndroidCalculatorEngine.Preferences.numeralBase.getKey().equals(key) ||
+		if (numeralBase.isSameKey(key) || hideNumeralBaseDigits.isSameKey(key)) {
-				CalculatorPreferences.Gui.hideNumeralBaseDigits.getKey().equals(key)) {
+			toggleNumericDigits(this.getActivity(), preferences);
-			NumeralBaseButtons.toggleNumericDigits(this.getActivity(), preferences);
 		}
 
-		if (AndroidCalculatorEngine.Preferences.angleUnit.getKey().equals(key) ||
+		if (showEqualsButton.isSameKey(key)) {
-				AndroidCalculatorEngine.Preferences.numeralBase.getKey().equals(key)) {
-			View view = getView();
-			if (view != null) {
-				// we should update state of angle units/numeral base button => we can achieve it by invalidating the whole view
-				view.invalidate();
-			}
-		}
-
-		if (CalculatorPreferences.Gui.showEqualsButton.getKey().equals(key)) {
 			CalculatorButtons.toggleEqualsButton(preferences, this.getActivity());
 		}
 
-		if (AndroidCalculatorEngine.Preferences.multiplicationSign.getKey().equals(key)) {
+		if (multiplicationSign.isSameKey(key)) {
 			CalculatorButtons.initMultiplicationButton(getView());
 		}
 	}

android-app/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java

@@ -30,6 +30,10 @@ import javax.annotation.Nonnull;
 
 import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
 
+import static jscl.NumeralBase.hex;
+import static org.solovyev.android.calculator.CalculatorPreferences.Gui.hideNumeralBaseDigits;
+import static org.solovyev.android.calculator.model.AndroidCalculatorEngine.Preferences.numeralBase;
+
 /**
  * User: serso
  * Date: 4/20/12
@@ -48,12 +52,12 @@ public class NumeralBaseButtons {
 	}
 
 	public static void toggleNumericDigits(@Nonnull Activity activity, @Nonnull SharedPreferences preferences) {
-		if (CalculatorPreferences.Gui.hideNumeralBaseDigits.getPreference(preferences)) {
+		if (hideNumeralBaseDigits.getPreference(preferences)) {
-			final NumeralBase nb = AndroidCalculatorEngine.Preferences.numeralBase.getPreference(preferences);
+			final NumeralBase nb = numeralBase.getPreference(preferences);
 			toggleNumericDigits(activity, nb);
 		} else {
 			// set HEX to show all digits
-			AndroidNumeralBase.valueOf(NumeralBase.hex).toggleButtons(true, activity);
+			AndroidNumeralBase.valueOf(hex).toggleButtons(true, activity);
 		}
 	}
 }

android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutFragment.java

@@ -26,11 +26,13 @@ import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
 import android.widget.TextView;
-
 import org.solovyev.android.calculator.CalculatorFragment;
 import org.solovyev.android.calculator.CalculatorFragmentType;
 import org.solovyev.android.calculator.R;
 
+import static android.view.View.GONE;
+import static org.solovyev.common.text.Strings.isEmpty;
+
 /**
  * User: serso
  * Date: 12/24/11
@@ -46,7 +48,14 @@ public class CalculatorAboutFragment extends CalculatorFragment {
 	public void onViewCreated(View root, Bundle savedInstanceState) {
 		super.onViewCreated(root, savedInstanceState);
 
-		final TextView about = (TextView) root.findViewById(R.id.aboutTextView);
+		final TextView aboutTextView = (TextView) root.findViewById(R.id.cpp_about_textview);
-		about.setMovementMethod(LinkMovementMethod.getInstance());
+		aboutTextView.setMovementMethod(LinkMovementMethod.getInstance());
+
+		final TextView translatorsTextTextView = (TextView) root.findViewById(R.id.cpp_about_translators_text);
+		final TextView translatorsTextView = (TextView) root.findViewById(R.id.cpp_about_translators);
+		if(isEmpty(translatorsTextView.getText())) {
+			translatorsTextTextView.setVisibility(GONE);
+			translatorsTextView.setVisibility(GONE);
+		}
 	}
 }

android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesFragment.java

@@ -28,16 +28,16 @@ import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
 import android.widget.TextView;
-
-import javax.annotation.Nonnull;
-
-import org.solovyev.android.Android;
 import org.solovyev.android.calculator.CalculatorApplication;
 import org.solovyev.android.calculator.CalculatorFragment;
 import org.solovyev.android.calculator.CalculatorFragmentType;
 import org.solovyev.android.calculator.R;
 import org.solovyev.common.text.Strings;
 
+import javax.annotation.Nonnull;
+
+import static org.solovyev.android.Android.getAppVersionCode;
+
 /**
  * User: serso
  * Date: 12/25/11
@@ -69,13 +69,14 @@ public class CalculatorReleaseNotesFragment extends CalculatorFragment {
 		final StringBuilder result = new StringBuilder();
 
 		final String releaseNotesForTitle = context.getString(R.string.c_release_notes_for_title);
-		final int version = Android.getAppVersionCode(context);
+		final int currentVersionCode = getAppVersionCode(context);
 
 		final TextHelper textHelper = new TextHelper(context.getResources(), CalculatorApplication.class.getPackage().getName());
 
 		boolean first = true;
-		for (int i = version; i >= minVersion; i--) {
+		for (int versionCode = currentVersionCode; versionCode >= minVersion; versionCode--) {
-			String releaseNotesForVersion = textHelper.getText("c_release_notes_for_" + i);
+			final String versionName = getVersionName(textHelper, versionCode);
+			String releaseNotesForVersion = textHelper.getText(makeReleaseNotesResourceId(versionCode));
 			if (!Strings.isEmpty(releaseNotesForVersion)) {
 				assert releaseNotesForVersion != null;
 				if (!first) {
@@ -84,11 +85,29 @@ public class CalculatorReleaseNotesFragment extends CalculatorFragment {
 					first = false;
 				}
 				releaseNotesForVersion = releaseNotesForVersion.replace("\n", "<br/>");
-				result.append("<b>").append(releaseNotesForTitle).append(i).append("</b><br/><br/>");
+				result.append("<b>").append(releaseNotesForTitle).append(versionName).append("</b><br/><br/>");
 				result.append(releaseNotesForVersion);
 			}
 		}
 
 		return result.toString();
 	}
+
+	@Nonnull
+	private static String getVersionName(@Nonnull TextHelper textHelper, int versionCode) {
+		final String versionName = textHelper.getText(makeVersionResourceId(versionCode));
+		if (versionName != null) {
+			return versionName;
+		} else {
+			return String.valueOf(versionCode);
+		}
+	}
+
+	private static String makeReleaseNotesResourceId(int versionCode) {
+		return "c_release_notes_for_" + versionCode;
+	}
+
+	private static String makeVersionResourceId(int versionCode) {
+		return "c_release_notes_for_" + versionCode + "_version";
+	}
 }

android-app/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListFragment.java

@@ -80,8 +80,6 @@ public abstract class AbstractMathEntityListFragment<T extends MathEntity> exten
 
 	public static final String MATH_ENTITY_CATEGORY_EXTRA_STRING = "org.solovyev.android.calculator.CalculatorVarsActivity_math_entity_category";
 
-	protected final static List<Character> acceptableChars = Arrays.asList(Strings.toObjects("1234567890abcdefghijklmnopqrstuvwxyzйцукенгшщзхъфывапролджэячсмитьбюё_".toCharArray()));
-
 
 	/*
 	**********************************************************************

android-app/src/main/java/org/solovyev/android/calculator/math/edit/VarEditDialogFragment.java

@@ -22,6 +22,7 @@
 
 package org.solovyev.android.calculator.math.edit;
 
+import android.app.Dialog;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentManager;
@@ -30,17 +31,24 @@ import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 import jscl.math.function.IConstant;
 
+import java.util.Arrays;
+import java.util.List;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import org.solovyev.android.Views;
 import org.solovyev.android.calculator.*;
 import org.solovyev.android.calculator.model.Var;
 import org.solovyev.android.sherlock.AndroidSherlockUtils;
+import org.solovyev.common.text.Strings;
+
+import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE;
 
 /**
  * User: Solovyev_S
@@ -49,6 +57,8 @@ import org.solovyev.android.sherlock.AndroidSherlockUtils;
  */
 public class VarEditDialogFragment extends DialogFragment implements CalculatorEventListener {
 
+	private final static List<Character> acceptableChars = Arrays.asList(Strings.toObjects("1234567890abcdefghijklmnopqrstuvwxyzйцукенгшщзхъфывапролджэячсмитьбюёαβγδεζηθικλμνξοπρστυφχψω_".toCharArray()));
+
 	@Nonnull
 	private final Input input;
 
@@ -101,7 +111,7 @@ public class VarEditDialogFragment extends DialogFragment implements CalculatorE
 			public void afterTextChanged(Editable s) {
 				for (int i = 0; i < s.length(); i++) {
 					char c = s.charAt(i);
-					if (!AbstractMathEntityListFragment.acceptableChars.contains(c)) {
+					if (!acceptableChars.contains(c)) {
 						s.delete(i, i + 1);
 						Toast.makeText(getActivity(), String.format(errorMsg, c), Toast.LENGTH_SHORT).show();
 					}
@@ -109,9 +119,12 @@ public class VarEditDialogFragment extends DialogFragment implements CalculatorE
 			}
 		});
 
+		processGreekButtons(root, editName, R.id.var_edit_greek_buttons_1);
+		processGreekButtons(root, editName, R.id.var_edit_greek_buttons_2);
+
 		// show soft keyboard automatically
 		editName.requestFocus();
-		getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+		getDialog().getWindow().setSoftInputMode(SOFT_INPUT_STATE_VISIBLE);
 
 		final EditText editValue = (EditText) root.findViewById(R.id.var_edit_value);
 		editValue.setText(input.getValue());
@@ -149,6 +162,21 @@ public class VarEditDialogFragment extends DialogFragment implements CalculatorE
 		}
 	}
 
+	private void processGreekButtons(@Nonnull View root, @Nonnull final EditText editName, int greekButtonsViewId) {
+		final ViewGroup greekButtons = (ViewGroup) root.findViewById(greekButtonsViewId);
+		Views.processViewsOfType(greekButtons, Button.class, new Views.ViewProcessor<Button>() {
+			@Override
+			public void process(@Nonnull final Button greekButton) {
+				greekButton.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						editName.append(greekButton.getText());
+					}
+				});
+			}
+		});
+	}
+
 	@Override
 	public void onCalculatorEvent(@Nonnull CalculatorEventData calculatorEventData, @Nonnull CalculatorEventType calculatorEventType, @Nullable Object data) {
 		switch (calculatorEventType) {

android-app/src/main/java/org/solovyev/android/calculator/matrix/CalculatorMatrixEditFragment.java

@@ -24,17 +24,14 @@ package org.solovyev.android.calculator.matrix;
 
 import android.os.Bundle;
 import android.view.View;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import org.solovyev.android.calculator.CalculatorFragment;
 import org.solovyev.android.calculator.CalculatorFragmentType;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.view.IntegerRange;
 import org.solovyev.android.view.Picker;
 
-import java.io.Serializable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * User: Solovyev_S
@@ -91,11 +88,11 @@ public class CalculatorMatrixEditFragment extends CalculatorFragment implements
 		final Picker<Integer> matrixColsCountPicker = (Picker<Integer>) root.findViewById(R.id.matrix_cols_count_picker);
 		initPicker(matrixColsCountPicker);
 
-		Matrix matrix = null;
+		MatrixUi matrix = null;
 		if (in != null) {
 			final Object matrixObject = in.getSerializable(MATRIX);
-			if (matrixObject instanceof Matrix) {
+			if (matrixObject instanceof MatrixUi) {
-				matrix = (Matrix) matrixObject;
+				matrix = (MatrixUi) matrixObject;
 			}
 		}
 
@@ -103,7 +100,7 @@ public class CalculatorMatrixEditFragment extends CalculatorFragment implements
 		if (matrix == null) {
 			matrixView.setMatrixDimensions(DEFAULT_ROWS, DEFAULT_COLS);
 		} else {
-			matrixView.setMatrix(matrix.bakingArray);
+			matrixView.setMatrix(matrix.getBakingArray());
 		}
 		matrixRowsCountPicker.setCurrent(matrixView.getRows());
 		matrixColsCountPicker.setCurrent(matrixView.getCols());
@@ -113,7 +110,7 @@ public class CalculatorMatrixEditFragment extends CalculatorFragment implements
 	public void onSaveInstanceState(@Nonnull Bundle out) {
 		super.onSaveInstanceState(out);
 
-		out.putSerializable(MATRIX, new Matrix(getMatrixView(getView()).toMatrix()));
+		out.putSerializable(MATRIX, new MatrixUi(getMatrixView(getView()).toMatrix()));
 	}
 
 	@Nonnull
@@ -146,16 +143,4 @@ public class CalculatorMatrixEditFragment extends CalculatorFragment implements
 		getMatrixView(getView()).setMatrixRows(newRows);
 	}
 
-	public static class Matrix implements Serializable {
-
-		@Nonnull
-		private String[][] bakingArray;
-
-		public Matrix() {
-		}
-
-		public Matrix(@Nonnull String[][] bakingArray) {
-			this.bakingArray = bakingArray;
-		}
-	}
 }

android-app/src/main/java/org/solovyev/android/calculator/matrix/MatrixUi.java

@@ -0,0 +1,27 @@
+package org.solovyev.android.calculator.matrix;
+
+import javax.annotation.Nonnull;
+import java.io.Serializable;
+
+/**
+* User: serso
+* Date: 7/11/13
+* Time: 4:54 PM
+*/
+class MatrixUi implements Serializable {
+
+	@Nonnull
+	private String[][] bakingArray;
+
+	public MatrixUi() {
+	}
+
+	public MatrixUi(@Nonnull String[][] bakingArray) {
+		this.bakingArray = bakingArray;
+	}
+
+	@Nonnull
+	String[][] getBakingArray() {
+		return bakingArray;
+	}
+}

android-app/src/main/java/org/solovyev/android/calculator/matrix/MatrixView.java

@@ -118,8 +118,8 @@ public class MatrixView extends TableLayout {
 			throw new IllegalArgumentException("Number of columns must be more than 1: " + newCols);
 		}
 
-		boolean rowsChanged = this.rows != newRows;
+		final boolean rowsChanged = this.rows != newRows;
-		boolean colsChanged = this.cols != newCols;
+		final boolean colsChanged = this.cols != newCols;
 
 		if (rowsChanged || colsChanged) {
 			if (!initialized) {

android-app/src/main/java/org/solovyev/android/calculator/preferences/CalculatorPreferencesActivity.java

@@ -31,29 +31,27 @@ import android.preference.Preference;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
-
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
-
 import net.robotmedia.billing.BillingController;
 import net.robotmedia.billing.IBillingObserver;
 import net.robotmedia.billing.ResponseCode;
 import net.robotmedia.billing.helper.AbstractBillingObserver;
 import net.robotmedia.billing.model.Transaction;
-
-import javax.annotation.Nonnull;
-
 import org.solovyev.android.Activities;
 import org.solovyev.android.App;
 import org.solovyev.android.ads.AdsController;
 import org.solovyev.android.calculator.*;
 import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
-import org.solovyev.android.calculator.wizard.CalculatorWizardActivity;
-import org.solovyev.android.calculator.wizard.Wizards;
 import org.solovyev.android.msg.AndroidMessage;
 import org.solovyev.android.view.VibratorContainer;
 import org.solovyev.common.msg.Message;
 import org.solovyev.common.msg.MessageType;
 
+import javax.annotation.Nonnull;
+
+import static org.solovyev.android.calculator.wizard.CalculatorWizardActivity.startWizard;
+import static org.solovyev.android.calculator.wizard.Wizards.DEFAULT_WIZARD_FLOW;
+
 /**
  * User: serso
  * Date: 7/16/11
@@ -81,7 +79,7 @@ public class CalculatorPreferencesActivity extends SherlockPreferenceActivity im
 		restartWizardPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
 			@Override
 			public boolean onPreferenceClick(Preference preference) {
-				CalculatorWizardActivity.startWizard(Wizards.DEFAULT_WIZARD_FLOW, CalculatorPreferencesActivity.this);
+				startWizard(DEFAULT_WIZARD_FLOW, CalculatorPreferencesActivity.this);
 				return true;
 			}
 		});

android-app/src/main/java/org/solovyev/android/calculator/wizard/AppWizardFlow.java

@@ -1,102 +0,0 @@
-/*
- * Copyright 2013 serso aka se.solovyev
- *
- * 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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * Contact details
- *
- * Email: se.solovyev@gmail.com
- * Site:  http://se.solovyev.org
- */
-
-package org.solovyev.android.calculator.wizard;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.solovyev.android.calculator.wizard.WizardStep.last;
-import static org.solovyev.android.calculator.wizard.Wizards.DEFAULT_WIZARD_FLOW;
-import static org.solovyev.android.calculator.wizard.Wizards.FIRST_TIME_WIZARD;
-import static org.solovyev.android.calculator.wizard.WizardStep.welcome;
-
-/**
- * User: serso
- * Date: 6/16/13
- * Time: 9:25 PM
- */
-final class AppWizardFlow implements WizardFlow {
-
-	@Nonnull
-	private final ListWizardFlow listWizardFlow;
-
-	private AppWizardFlow(@Nonnull String name, @Nonnull List<WizardStep> wizardSteps) {
-		this.listWizardFlow = new ListWizardFlow(name, wizardSteps);
-	}
-
-	@Nonnull
-	static AppWizardFlow newDefaultWizardFlow() {
-		final List<WizardStep> wizardSteps = new ArrayList<WizardStep>();
-		for (WizardStep wizardStep : WizardStep.values()) {
-			if (wizardStep != welcome && wizardStep != last && wizardStep.isVisible()) {
-				wizardSteps.add(wizardStep);
-			}
-		}
-		return new AppWizardFlow(DEFAULT_WIZARD_FLOW, wizardSteps);
-	}
-
-	@Nonnull
-	static AppWizardFlow newFirstTimeWizardFlow() {
-		final List<WizardStep> wizardSteps = new ArrayList<WizardStep>();
-		for (WizardStep wizardStep : WizardStep.values()) {
-			if (wizardStep.isVisible()) {
-				wizardSteps.add(wizardStep);
-			}
-		}
-		return new AppWizardFlow(FIRST_TIME_WIZARD, wizardSteps);
-	}
-
-
-	@Nonnull
-	@Override
-	public String getName() {
-		return listWizardFlow.getName();
-	}
-
-	@Nullable
-	@Override
-	public WizardStep getStep(@Nonnull String name) {
-		return listWizardFlow.getStep(name);
-	}
-
-	@Nullable
-	@Override
-	public WizardStep getNextStep(@Nonnull WizardStep step) {
-		return listWizardFlow.getNextStep(step);
-	}
-
-	@Nullable
-	@Override
-	public WizardStep getPrevStep(@Nonnull WizardStep step) {
-		return listWizardFlow.getPrevStep(step);
-	}
-
-	@Nonnull
-	@Override
-	public WizardStep getFirstStep() {
-		return listWizardFlow.getFirstStep();
-	}
-}

android-app/src/main/java/org/solovyev/android/calculator/wizard/DragButtonWizardStep.java

@@ -29,7 +29,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.view.drag.DirectionDragButton;
 import org.solovyev.android.view.drag.DragButton;
@@ -39,9 +38,10 @@ import org.solovyev.common.math.Point2d;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.util.Arrays;
 
+import static android.view.View.GONE;
+
 public class DragButtonWizardStep extends Fragment {
 
 	/*
@@ -68,15 +68,14 @@ public class DragButtonWizardStep extends Fragment {
 	@Nullable
 	private TextView actionTextView;
 
+	@Nonnull
+	private TextView descriptionTextView;
+
 	private DragButtonAction action = DragButtonAction.center;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-
-		if (savedInstanceState != null) {
-			action = (DragButtonAction) savedInstanceState.getSerializable(ACTION);
-		}
 	}
 
 	@Override
@@ -92,8 +91,11 @@ public class DragButtonWizardStep extends Fragment {
 		dragButton.setOnClickListener(new DragButtonOnClickListener());
 		dragButton.setOnDragListener(new SimpleOnDragListener(new DragButtonProcessor(), SimpleOnDragListener.getDefaultPreferences(getActivity())));
 		actionTextView = (TextView) root.findViewById(R.id.wizard_dragbutton_action_textview);
+		descriptionTextView = (TextView) root.findViewById(R.id.wizard_dragbutton_description_textview);
 
-		actionTextView.setText(action.actionTextResId);
+		if (savedInstanceState != null) {
+			setAction((DragButtonAction) savedInstanceState.getSerializable(ACTION));
+		}
 	}
 
 	@Override
@@ -173,6 +175,14 @@ public class DragButtonWizardStep extends Fragment {
 			if (actionTextView != null) {
 				actionTextView.setText(this.action.actionTextResId);
 			}
+
+			boolean firstChange = false;
+			if (action != DragButtonAction.center) {
+				firstChange = true;
+			}
+			if (firstChange) {
+				descriptionTextView.setVisibility(GONE);
+			}
 		}
 	}
 }