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
This commit is contained in:
Sergey Solovyev
2013-09-20 22:14:08 +04:00
118 changed files with 1880 additions and 1016 deletions

View File

@@ -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>

0
android-app-core/res/values/text_about.xml Executable file → Normal file
View File

0
android-app-core/res/values/text_functions.xml Executable file → Normal file
View File

0
android-app-core/res/values/text_operators.xml Executable file → Normal file
View File

0
android-app-core/res/values/text_preferences.xml Executable file → Normal file
View File

View File

@@ -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>

0
android-app-core/res/values/text_strings.xml Executable file → Normal file
View File

0
android-app-core/res/values/text_vars.xml Executable file → Normal file
View File

0
android-app-core/res/values/text_wizard.xml Executable file → Normal file
View File