Commit Graph

33 Commits

Author SHA1 Message Date
Sergey Solovyev
3c0483fc01 translations 2013-10-10 22:03:06 +04:00
Sergey Solovyev
379f27db78 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
2013-09-20 22:14:08 +04:00
Sergey Solovyev
9c31ecb39d translations 2013-09-20 22:01:40 +04:00
Sergey Solovyev
0795f56326 release notes 2013-07-18 18:09:48 +04:00
Sergey Solovyev
fc9708c25e release notes 2013-07-18 18:07:00 +04:00
Sergey Solovyev
53e23570a0 russian translation fixed 2013-07-18 10:59:26 +04:00
Sergey Solovyev
73fee3cf56 translations added 2013-07-16 17:13:37 +04:00
Sergey Solovyev
b475b06504 translations updated 2013-07-08 11:56:56 +04:00
Sergey Solovyev
c772a4e429 Merge remote-tracking branch 'origin/master'
Conflicts:
	android-app-core/res/values-ru/text_about.xml
	android-app-core/res/values-ru/text_wizard.xml
	android-app-core/res/values/text_about.xml
	android-app-core/res/values/text_wizard.xml
	pom.xml
2013-07-03 00:08:50 +04:00
Solovyev_S
33acdd68e6 translations 2013-07-02 16:43:48 +04:00
Solovyev_S
16385653d9 facebook button substituted with operators in the widget 2013-07-02 16:29:49 +04:00
Sergey Solovyev
f40740d531 translations 2013-07-01 23:45:12 +04:00
Sergey Solovyev
6977b4c6b8 Merge branch 'dev-number-format-in-editor' into dev
Conflicts:
	android-app-core/res/values-ru/text_strings.xml
	android-app-core/res/values-ru/text_wizard.xml
	android-app-core/res/values/text_strings.xml
	android-app-core/res/values/text_wizard.xml
2013-07-01 23:39:23 +04:00
Sergey Solovyev
6f15e03543 translations 2013-07-01 23:37:35 +04:00
Solovyev_S
ac43c9b25a translations 2013-07-01 13:23:25 +04:00
Solovyev_S
cba364f036 wizard finished 2013-07-01 13:00:02 +04:00
Solovyev_S
5518a38f16 fixable message removed 2013-07-01 11:31:06 +04:00
Sergey Solovyev
6ffef636e0 release notes moved to separate file 2013-06-26 21:29:53 +04:00
Sergey Solovyev
6870232f26 help removed 2013-06-26 13:40:08 +04:00
Sergey Solovyev
99e7471ebd copyright + code reformat 2013-06-26 12:22:26 +04:00
Sergey Solovyev
cffee5a761 wizard changes 2013-06-24 14:26:59 +04:00
Sergey Solovyev
e57ce8cf2c code reformat 2013-06-15 00:31:52 +04:00
Sergey Solovyev
fa7727d666 plot changes 2013-01-21 01:26:54 +04:00
Sergey Solovyev
2e5d35afa7 Release notes + fix for graph and angle units 2013-01-20 18:12:43 +04:00
Sergey Solovyev
974fbc4ec7 Purchase dialog 2013-01-20 16:54:10 +04:00
Sergey Solovyev
bd2dde0c1d new plotter 2013-01-20 12:58:00 +04:00
Sergey Solovyev
aabeaa82f4 new plotter 2013-01-20 12:41:19 +04:00
Sergey Solovyev
cbfdf237f0 text updates 2013-01-12 21:22:10 +04:00
Sergey Solovyev
c4d49c421c release notes 2012-12-05 16:20:10 +04:00
Sergey Solovyev
45bf0467bc change 2012-12-05 14:50:32 +04:00
Sergey Solovyev
555f6d9a61 change 2012-12-05 13:43:40 +04:00
Sergey Solovyev
af69271f89 onscreen calculator improvement 2012-12-02 22:04:07 +04:00
Sergey Solovyev
c2662e7537 changes 2012-12-01 17:46:16 +04:00