From c91d57a92c5db37ed7d249c7a6ae000a04aa8816 Mon Sep 17 00:00:00 2001 From: Sergey Solovyev Date: Thu, 27 Jun 2013 11:23:12 +0400 Subject: [PATCH] messages update --- android-app-core/res/values/text_about.xml | 12 ++--- .../res/values/text_functions.xml | 52 +++++++++---------- .../res/values/text_operators.xml | 16 +++--- .../res/values/text_preferences.xml | 13 ++--- android-app-core/res/values/text_strings.xml | 2 +- android-app-core/res/values/text_wizard.xml | 10 ++-- 6 files changed, 49 insertions(+), 56 deletions(-) diff --git a/android-app-core/res/values/text_about.xml b/android-app-core/res/values/text_about.xml index ab9fbbfb..af617a64 100644 --- a/android-app-core/res/values/text_about.xml +++ b/android-app-core/res/values/text_about.xml @@ -24,20 +24,16 @@ About - Copyright (c) 2009-2011\n\nCreated by serso aka se.solovyev\n\n - Application web site:http://facebook.com/calculatorpp\n\n - This program is open source:\nall source code can be found on\n + Copyright © 2009–2013\n\nCreated by serso aka se.solovyev\n\n + We are on Facebook:http://facebook.com/calculatorpp\n\n + This program is distributed under Apache 2.0 License:\nsource code can be found on\n http://github.com\n\n For more information please\ncontact the author by email\n se.solovyev@gmail.com \nor visit\nhttp://se.solovyev.org\n\n If you want to support the project\n\nyou can buy a special option from application preferences\n\n - If you like the application\nrank it with 5 stars in\n + If you like the application\nrate it with 5 stars on\n Google Play\n\n - Thanks to people who translate Calculator++ in different languages:\n - Italian - Gabriele Ravanetti\n - Spanish - Jordi Luna\n - Ukrainian - Андрій Бандура\n\n This application uses next open source libraries:\n Simple (XML serialization)\n JSCL diff --git a/android-app-core/res/values/text_functions.xml b/android-app-core/res/values/text_functions.xml index 0f36328a..907246f9 100644 --- a/android-app-core/res/values/text_functions.xml +++ b/android-app-core/res/values/text_functions.xml @@ -24,45 +24,45 @@ Functions - Trigonometric sine function. - Trigonometric cosine function. - Trigonometric tangent function. - Trigonometric cotangent function. - Arcsine - the inverse of sine function. - Arccosine - the inverse of cosine function. - Arctangent - the inverse of tangent function. - Arccotangent - the inverse of cotangent function. - Natural logarithm - logarithm the base e. - Decadic logarithm - logarithm the base 10. - Logarithm - logarithm the specified base. - Exponential function. - Square root function. - Cubic root function. - Function that gives absolute value of an argument. - Function that gives the sign of an argument: -1 if argument is less than 0, 0 - if equals to 0, 1 if more than 0. + Trigonometric sine function + Trigonometric cosine function + Trigonometric tangent function + Trigonometric cotangent function + Arcsine - inverse sine function + Arccosine - inverse cosine function + Arctangent - inverse tangent function + Arccotangent - inverse cotangent function + Natural logarithm - logarithm to base e + Decadic logarithm - logarithm to base 10 + Logarithm - logarithm the specified base + Exponential function + Square root function + Cubic root function + Gives absolute value of an argument + Gives the sign of an argument: -1 if argument is less than 0, 0 + if equals to 0, 1 if more than 0 - Equals function - gives 1 if two arguments are equals, 0 otherwise. + Equals function - gives 1 if two arguments are equals, 0 otherwise Lesser-or-equals function - gives 1 if two arguments are equals or first is less - than second, 0 otherwise. + than second, 0 otherwise Greater-or-equals function - gives 1 if two arguments are equals or first is - greater than second, 0 otherwise. + greater than second, 0 otherwise - Not-equals function - gives 1 if two arguments are not equals, 0 otherwise. + Not-equals function - gives 1 if two arguments are not equals, 0 otherwise - Lesser function - gives 1 if first argument is less than second, 0 otherwise. + Lesser function - gives 1 if first argument is less than second, 0 otherwise Greater function - gives 1 if first argument is greater than second, 0 - otherwise. + otherwise Converts degrees into radians: d - degrees, m - minutes (default = 0), s - - seconds (default = 0). + seconds (default = 0) Converts degrees from DMS notation to decimal notation: d - degrees, m - - minutes (default = 0), s - seconds (default = 0). + minutes (default = 0), s - seconds (default = 0) - Converts radians into degrees. + Converts radians into degrees Trigonometric Hyperbolic trigonometric diff --git a/android-app-core/res/values/text_operators.xml b/android-app-core/res/values/text_operators.xml index a3c6d968..3ce7638e 100644 --- a/android-app-core/res/values/text_operators.xml +++ b/android-app-core/res/values/text_operators.xml @@ -24,21 +24,21 @@ Operators - Modulo operation finds the remainder of division of \'x\' by \'y\'. - Sums functions \'f(i)\', iterating through \'i\' from \'from\' to \'to\'. + Modulo operation finds the remainder of division of \'x\' by \'y\' + Sums functions \'f(i)\', iterating through \'i\' from \'from\' to \'to\' Gives product of functions \'f(i)\', iterating through \'i\' from \'from\' - to \'to\'. + to \'to\' Gives derivative of order \'order\' (default = 1) of functions \'f(x)\' - by \'x\' variable and calculates at point \'x_point\' (default = same as \'x\'). + by \'x\' variable and calculates at point \'x_point\' (default = same as \'x\') - Gives integral of function \'f(x)\' by \'x\' variable. - Integrates function \'f(x)\' by \'x\' variable from \'a\' to \'b\'. + Gives integral of function \'f(x)\' by \'x\' variable + Integrates function \'f(x)\' by \'x\' variable from \'a\' to \'b\' - Gives the factorial of the expression before. - Gives the double factorial of the expression before. + Gives the factorial of the expression before + Gives the double factorial of the expression before Gives the percent value of the expression before.\nExamples:\n 100 + 50% = 150\n diff --git a/android-app-core/res/values/text_preferences.xml b/android-app-core/res/values/text_preferences.xml index ce5c34da..22e8f85a 100644 --- a/android-app-core/res/values/text_preferences.xml +++ b/android-app-core/res/values/text_preferences.xml @@ -21,9 +21,8 @@ --> - Toggle screen orientation change - If turned on calculator will change screen orientation automatically - + Auto-rotate screen + If turned on app will rotate screen with device Show equals button If turned on equals button is shown @@ -34,14 +33,12 @@ Show intermediate calculations in history - If turned on all calculations will be shown on + If turned on all calculations will be shown in the history screen - Result is calculated while typing expression - If turned on calculations are done automatically while typing - expression - + Result is calculated while typing + If turned on calculations are done automatically while typing Prevent screen from fading If turned on screen will not fade while using the app diff --git a/android-app-core/res/values/text_strings.xml b/android-app-core/res/values/text_strings.xml index 8e2be8f6..8e4ea348 100644 --- a/android-app-core/res/values/text_strings.xml +++ b/android-app-core/res/values/text_strings.xml @@ -29,7 +29,7 @@ Calc++ Settings Error - Result copied to clipboard! + Result has been copied to the clipboard! Settings Help Variables And Constants diff --git a/android-app-core/res/values/text_wizard.xml b/android-app-core/res/values/text_wizard.xml index e2f3e486..227ce38d 100644 --- a/android-app-core/res/values/text_wizard.xml +++ b/android-app-core/res/values/text_wizard.xml @@ -28,24 +28,24 @@ Simple In simple mode only basic functionality will be available from the main screen. - Result is rounded up to 5 digits. + Result is rounded up to 5 digits, degrees are used as the default angle units. Engineer In engineer mode special functions will be used on the main screen. - Result is is not rounded and is presented in engineer notation. + Result is is not rounded and is presented in engineer notation, radians are used as the default angle units. Start wizard - Excellent! Tap button one more time to try again - Tap button once to use 9 + Excellent! Tap the button one more time to try again + Tap the button below once to use 9 Drag from the center of the button up to use % Drag from the center of the button to the left to use sin Drag from the center of the button down to use ^2 Welcome Choose layout Choose mode - Calculator in separate window + Calculator in a separate window Drag button basics \ No newline at end of file