379f27db78
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 |
||
---|---|---|
.. | ||
text_about.xml | ||
text_functions.xml | ||
text_operators.xml | ||
text_preferences.xml | ||
text_release_notes.xml | ||
text_strings.xml | ||
text_vars.xml | ||
text_wizard.xml |