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